summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2016-04-01 14:47:46 +0200
committerArne Schwabe <arne@rfc2549.org>2016-04-01 16:16:09 +0200
commit5b08ac8422b9a252ecf971470351cf40f5ca2a1a (patch)
treefbb2701965d750dd0f38536ce39b47db98731425 /main
parent237836932b2f3a66a08a7020332496c96916e662 (diff)
New versionv0.6.51
Diffstat (limited to 'main')
-rw-r--r--main/build.gradle4
-rw-r--r--main/src/main/AndroidManifest.xml4
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/LogFileHandler.java7
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java2
-rw-r--r--main/src/main/res/drawable-hdpi/icon.pngbin2991 -> 0 bytes
-rw-r--r--main/src/main/res/drawable-mdpi/icon.pngbin1921 -> 0 bytes
-rw-r--r--main/src/main/res/drawable-xhdpi/icon.pngbin4303 -> 0 bytes
-rw-r--r--main/src/main/res/drawable-xxhdpi/icon.pngbin6864 -> 14248 bytes
-rwxr-xr-xmain/src/main/res/mipmap-hdpi/ic_launcher.pngbin1686 -> 5284 bytes
-rwxr-xr-xmain/src/main/res/mipmap-mdpi/ic_launcher.pngbin1098 -> 2994 bytes
-rw-r--r--main/src/main/res/mipmap-xhdpi/banner_tv.pngbin0 -> 21996 bytes
-rwxr-xr-xmain/src/main/res/mipmap-xhdpi/ic_launcher.pngbin2494 -> 7520 bytes
-rwxr-xr-xmain/src/main/res/mipmap-xxhdpi/ic_launcher.pngbin4429 -> 13017 bytes
-rwxr-xr-xmain/src/main/res/mipmap-xxxhdpi/ic_launcher.pngbin6691 -> 18967 bytes
14 files changed, 7 insertions, 10 deletions
diff --git a/main/build.gradle b/main/build.gradle
index ecedb71e..53d31100 100644
--- a/main/build.gradle
+++ b/main/build.gradle
@@ -25,8 +25,8 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 23
- versionCode = 130
- versionName = "0.6.50"
+ versionCode = 131
+ versionName = "0.6.51"
}
sourceSets {
diff --git a/main/src/main/AndroidManifest.xml b/main/src/main/AndroidManifest.xml
index 2fb4629a..bf499648 100644
--- a/main/src/main/AndroidManifest.xml
+++ b/main/src/main/AndroidManifest.xml
@@ -28,8 +28,8 @@
<application
android:name=".core.ICSOpenVPNApplication"
android:allowBackup="true"
- android:banner="@drawable/icon"
- android:icon="@drawable/icon"
+ android:banner="@mipmap/banner_tv"
+ android:icon="@mipmap/ic_launcher"
android:label="@string/app"
android:supportsRtl="true"
android:theme="@style/blinkt"
diff --git a/main/src/main/java/de/blinkt/openvpn/core/LogFileHandler.java b/main/src/main/java/de/blinkt/openvpn/core/LogFileHandler.java
index a30cde5b..d69fdfb0 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/LogFileHandler.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/LogFileHandler.java
@@ -9,10 +9,8 @@ import android.os.Handler;
import android.os.Looper;
import android.os.Message;
import android.os.Parcel;
-import android.text.TextUtils;
import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -22,7 +20,6 @@ import java.nio.ByteBuffer;
import java.util.Locale;
import de.blinkt.openvpn.R;
-import de.blinkt.openvpn.fragments.Utils;
/**
* Created by arne on 23.01.16.
@@ -33,7 +30,6 @@ class LogFileHandler extends Handler {
static final int LOG_INIT = 102;
public static final int LOG_MESSAGE = 103;
private static FileOutputStream mLogFile;
- private static BufferedOutputStream mBufLogfile;
public static final String LOGFILE_NAME = "logcache.dat";
@@ -78,7 +74,7 @@ class LogFileHandler extends Handler {
private static void trimLogFile() {
try {
- mBufLogfile.flush();
+ mLogFile.flush();
mLogFile.getChannel().truncate(0);
} catch (IOException e) {
e.printStackTrace();
@@ -101,7 +97,6 @@ class LogFileHandler extends Handler {
private void openLogFile (File cacheDir) throws FileNotFoundException {
File logfile = new File(cacheDir, LOGFILE_NAME);
mLogFile = new FileOutputStream(logfile);
- mBufLogfile = new BufferedOutputStream(mLogFile);
}
private void readLogCache(File cacheDir) {
diff --git a/main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java b/main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
index 5f45feb8..29bef6de 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
@@ -20,7 +20,9 @@ import android.text.TextUtils;
import android.util.Log;
import java.io.ByteArrayInputStream;
+import java.io.DataOutputStream;
import java.io.File;
+import java.io.OutputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.security.MessageDigest;
diff --git a/main/src/main/res/drawable-hdpi/icon.png b/main/src/main/res/drawable-hdpi/icon.png
deleted file mode 100644
index d772f454..00000000
--- a/main/src/main/res/drawable-hdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/main/src/main/res/drawable-mdpi/icon.png b/main/src/main/res/drawable-mdpi/icon.png
deleted file mode 100644
index b72082d8..00000000
--- a/main/src/main/res/drawable-mdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/main/src/main/res/drawable-xhdpi/icon.png b/main/src/main/res/drawable-xhdpi/icon.png
deleted file mode 100644
index 7f861703..00000000
--- a/main/src/main/res/drawable-xhdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/main/src/main/res/drawable-xxhdpi/icon.png b/main/src/main/res/drawable-xxhdpi/icon.png
index 8e9e5845..16afb418 100644
--- a/main/src/main/res/drawable-xxhdpi/icon.png
+++ b/main/src/main/res/drawable-xxhdpi/icon.png
Binary files differ
diff --git a/main/src/main/res/mipmap-hdpi/ic_launcher.png b/main/src/main/res/mipmap-hdpi/ic_launcher.png
index 4acd8429..52fc9219 100755
--- a/main/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/main/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/main/src/main/res/mipmap-mdpi/ic_launcher.png b/main/src/main/res/mipmap-mdpi/ic_launcher.png
index fc35dfd0..d99f7d91 100755
--- a/main/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/main/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/main/src/main/res/mipmap-xhdpi/banner_tv.png b/main/src/main/res/mipmap-xhdpi/banner_tv.png
new file mode 100644
index 00000000..8ffb5f43
--- /dev/null
+++ b/main/src/main/res/mipmap-xhdpi/banner_tv.png
Binary files differ
diff --git a/main/src/main/res/mipmap-xhdpi/ic_launcher.png b/main/src/main/res/mipmap-xhdpi/ic_launcher.png
index 3a09bfe5..04ebb081 100755
--- a/main/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/main/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/main/src/main/res/mipmap-xxhdpi/ic_launcher.png b/main/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 01bf65df..69bea5a6 100755
--- a/main/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/main/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/main/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/main/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 537d313a..b9b738b1 100755
--- a/main/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/main/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ