From 5b08ac8422b9a252ecf971470351cf40f5ca2a1a Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Fri, 1 Apr 2016 14:47:46 +0200
Subject: New version

---
 main/src/main/AndroidManifest.xml                    |   4 ++--
 .../java/de/blinkt/openvpn/core/LogFileHandler.java  |   7 +------
 .../main/java/de/blinkt/openvpn/core/VpnStatus.java  |   2 ++
 main/src/main/res/drawable-hdpi/icon.png             | Bin 2991 -> 0 bytes
 main/src/main/res/drawable-mdpi/icon.png             | Bin 1921 -> 0 bytes
 main/src/main/res/drawable-xhdpi/icon.png            | Bin 4303 -> 0 bytes
 main/src/main/res/drawable-xxhdpi/icon.png           | Bin 6864 -> 14248 bytes
 main/src/main/res/mipmap-hdpi/ic_launcher.png        | Bin 1686 -> 5284 bytes
 main/src/main/res/mipmap-mdpi/ic_launcher.png        | Bin 1098 -> 2994 bytes
 main/src/main/res/mipmap-xhdpi/banner_tv.png         | Bin 0 -> 21996 bytes
 main/src/main/res/mipmap-xhdpi/ic_launcher.png       | Bin 2494 -> 7520 bytes
 main/src/main/res/mipmap-xxhdpi/ic_launcher.png      | Bin 4429 -> 13017 bytes
 main/src/main/res/mipmap-xxxhdpi/ic_launcher.png     | Bin 6691 -> 18967 bytes
 13 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 100644 main/src/main/res/drawable-hdpi/icon.png
 delete mode 100644 main/src/main/res/drawable-mdpi/icon.png
 delete mode 100644 main/src/main/res/drawable-xhdpi/icon.png
 create mode 100644 main/src/main/res/mipmap-xhdpi/banner_tv.png

(limited to 'main/src')

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
Binary files a/main/src/main/res/drawable-hdpi/icon.png and /dev/null 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
Binary files a/main/src/main/res/drawable-mdpi/icon.png and /dev/null 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
Binary files a/main/src/main/res/drawable-xhdpi/icon.png and /dev/null 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
Binary files a/main/src/main/res/drawable-xxhdpi/icon.png and b/main/src/main/res/drawable-xxhdpi/icon.png 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
Binary files a/main/src/main/res/mipmap-hdpi/ic_launcher.png and b/main/src/main/res/mipmap-hdpi/ic_launcher.png 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
Binary files a/main/src/main/res/mipmap-mdpi/ic_launcher.png and b/main/src/main/res/mipmap-mdpi/ic_launcher.png 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
Binary files /dev/null and b/main/src/main/res/mipmap-xhdpi/banner_tv.png 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
Binary files a/main/src/main/res/mipmap-xhdpi/ic_launcher.png and b/main/src/main/res/mipmap-xhdpi/ic_launcher.png 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
Binary files a/main/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/main/src/main/res/mipmap-xxhdpi/ic_launcher.png 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
Binary files a/main/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/main/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
-- 
cgit v1.2.3