diff options
author | Arne Schwabe <arne@rfc2549.org> | 2016-04-01 14:47:46 +0200 |
---|---|---|
committer | Arne Schwabe <arne@rfc2549.org> | 2016-04-01 16:16:09 +0200 |
commit | 5b08ac8422b9a252ecf971470351cf40f5ca2a1a (patch) | |
tree | fbb2701965d750dd0f38536ce39b47db98731425 /main/src | |
parent | 237836932b2f3a66a08a7020332496c96916e662 (diff) |
New versionv0.6.51
Diffstat (limited to 'main/src')
-rw-r--r-- | main/src/main/AndroidManifest.xml | 4 | ||||
-rw-r--r-- | main/src/main/java/de/blinkt/openvpn/core/LogFileHandler.java | 7 | ||||
-rw-r--r-- | main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java | 2 | ||||
-rw-r--r-- | main/src/main/res/drawable-hdpi/icon.png | bin | 2991 -> 0 bytes | |||
-rw-r--r-- | main/src/main/res/drawable-mdpi/icon.png | bin | 1921 -> 0 bytes | |||
-rw-r--r-- | main/src/main/res/drawable-xhdpi/icon.png | bin | 4303 -> 0 bytes | |||
-rw-r--r-- | main/src/main/res/drawable-xxhdpi/icon.png | bin | 6864 -> 14248 bytes | |||
-rwxr-xr-x | main/src/main/res/mipmap-hdpi/ic_launcher.png | bin | 1686 -> 5284 bytes | |||
-rwxr-xr-x | main/src/main/res/mipmap-mdpi/ic_launcher.png | bin | 1098 -> 2994 bytes | |||
-rw-r--r-- | main/src/main/res/mipmap-xhdpi/banner_tv.png | bin | 0 -> 21996 bytes | |||
-rwxr-xr-x | main/src/main/res/mipmap-xhdpi/ic_launcher.png | bin | 2494 -> 7520 bytes | |||
-rwxr-xr-x | main/src/main/res/mipmap-xxhdpi/ic_launcher.png | bin | 4429 -> 13017 bytes | |||
-rwxr-xr-x | main/src/main/res/mipmap-xxxhdpi/ic_launcher.png | bin | 6691 -> 18967 bytes |
13 files changed, 5 insertions, 8 deletions
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 Binary files differdeleted file mode 100644 index d772f454..00000000 --- a/main/src/main/res/drawable-hdpi/icon.png +++ /dev/null diff --git a/main/src/main/res/drawable-mdpi/icon.png b/main/src/main/res/drawable-mdpi/icon.png Binary files differdeleted file mode 100644 index b72082d8..00000000 --- a/main/src/main/res/drawable-mdpi/icon.png +++ /dev/null diff --git a/main/src/main/res/drawable-xhdpi/icon.png b/main/src/main/res/drawable-xhdpi/icon.png Binary files differdeleted file mode 100644 index 7f861703..00000000 --- a/main/src/main/res/drawable-xhdpi/icon.png +++ /dev/null diff --git a/main/src/main/res/drawable-xxhdpi/icon.png b/main/src/main/res/drawable-xxhdpi/icon.png Binary files differindex 8e9e5845..16afb418 100644 --- a/main/src/main/res/drawable-xxhdpi/icon.png +++ b/main/src/main/res/drawable-xxhdpi/icon.png diff --git a/main/src/main/res/mipmap-hdpi/ic_launcher.png b/main/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differindex 4acd8429..52fc9219 100755 --- a/main/src/main/res/mipmap-hdpi/ic_launcher.png +++ b/main/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/main/src/main/res/mipmap-mdpi/ic_launcher.png b/main/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differindex fc35dfd0..d99f7d91 100755 --- a/main/src/main/res/mipmap-mdpi/ic_launcher.png +++ b/main/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/main/src/main/res/mipmap-xhdpi/banner_tv.png b/main/src/main/res/mipmap-xhdpi/banner_tv.png Binary files differnew file mode 100644 index 00000000..8ffb5f43 --- /dev/null +++ b/main/src/main/res/mipmap-xhdpi/banner_tv.png diff --git a/main/src/main/res/mipmap-xhdpi/ic_launcher.png b/main/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differindex 3a09bfe5..04ebb081 100755 --- a/main/src/main/res/mipmap-xhdpi/ic_launcher.png +++ b/main/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/main/src/main/res/mipmap-xxhdpi/ic_launcher.png b/main/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differindex 01bf65df..69bea5a6 100755 --- a/main/src/main/res/mipmap-xxhdpi/ic_launcher.png +++ b/main/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/main/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/main/src/main/res/mipmap-xxxhdpi/ic_launcher.png Binary files differindex 537d313a..b9b738b1 100755 --- a/main/src/main/res/mipmap-xxxhdpi/ic_launcher.png +++ b/main/src/main/res/mipmap-xxxhdpi/ic_launcher.png |