Small fixes

9 files changed, 13 insertions, 10 deletions

diff --git a/main/jni/Application.mk b/main/jni/Application.mk
index 9e866600..9495a77a 100644
--- a/main/jni/Application.mk
+++ b/main/jni/Application.mk
@@ -7,8 +7,8 @@ APP_STL:=stlport_static
 
 #APP_OPTIM := release
 
-#LOCAL_ARM_MODE := arm
-
 #NDK_TOOLCHAIN_VERSION=4.9
 APP_CPPFLAGS += -std=c++1y
 APP_CFLAGS += -funwind-tables
+
+
diff --git a/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java b/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java
index b716d2ca..dda1fe2c 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java
@@ -425,6 +425,7 @@ public class ConfigParser {
         Vector<String> tlscrypt = getOption("tls-crypt", 1, 1);
         if (tlscrypt!=null) {
             np.mUseTLSAuth = true;
+            np.mTLSAuthFilename = tlscrypt.get(1);
             np.mTLSAuthDirection = "tls-crypt";
         }
 
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 aec6b3c6..67bd105e 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/LogFileHandler.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/LogFileHandler.java
@@ -207,8 +207,10 @@ class LogFileHandler extends Handler {
             }
             VpnStatus.logDebug(R.string.reread_log, itemsRead);
         } finally {
-            VpnStatus.readFileLog = true;
-            VpnStatus.readFileLock.notifyAll();
+            synchronized (VpnStatus.readFileLock) {
+                VpnStatus.readFileLog = true;
+                VpnStatus.readFileLock.notifyAll();
+            }
         }
     }
 
diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java
index e34897a8..40d54519 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java
@@ -87,7 +87,6 @@ public class OpenVPNThread implements Runnable {
                         mArgv = noPieArgv;

                         VpnStatus.logInfo("PIE Version could not be executed. Trying no PIE version");

                         run();

-                        return;

                     }

 

                 }

diff --git a/main/src/main/java/de/blinkt/openvpn/core/StatusListener.java b/main/src/main/java/de/blinkt/openvpn/core/StatusListener.java
index 19a2668d..e79bdadd 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/StatusListener.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/StatusListener.java
@@ -39,7 +39,7 @@ public class StatusListener {
                     DataInputStream fd = new DataInputStream(new ParcelFileDescriptor.AutoCloseInputStream(pfd));
 
                     short len = fd.readShort();
-                    byte[] buf = new byte[4095];
+                    byte[] buf = new byte[65336];
                     while (len != 0x7fff) {
                         fd.readFully(buf, 0, len);
                         LogItem logitem = new LogItem(buf, len);
diff --git a/main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java b/main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java
index 564ee1a4..bc03db25 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java
@@ -43,7 +43,7 @@ public class VPNLaunchHelper {
 
         for (String abi: abis) {
 
-            File vpnExecutable = new File(context.getCacheDir(), getMiniVPNExecutableName() + "." + abi);
+            File vpnExecutable = new File(context.getCacheDir(), "c_" + getMiniVPNExecutableName() + "." + abi);
             if ((vpnExecutable.exists() && vpnExecutable.canExecute()) || writeMiniVPNBinary(context, abi, vpnExecutable)) {
                 return vpnExecutable.getPath();
             }
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java
index d704e61e..549e0a58 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java
@@ -667,7 +667,7 @@ public class LogFragment extends ListFragment implements StateListener, SeekBar.
                             mSpeedView.setText(cleanLogMessage);
                         }
                         if (mConnectStatus != null)
-                            mConnectStatus.setText(getString(resId));
+                            mConnectStatus.setText(cleanLogMessage);
                     }
                 }
             });
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_IP.java b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_IP.java
index 44f01296..fec849ca 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_IP.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_IP.java
@@ -71,7 +71,7 @@ public class Settings_IP extends OpenVpnPreferencesFragment implements OnPrefere
             if (mProfile.mAuthenticationType == VpnProfile.TYPE_STATICKEYS)
                 mUsePull.setChecked(false);
 
-			mUsePull.setEnabled(mProfile.mAuthenticationType == VpnProfile.TYPE_STATICKEYS);
+			mUsePull.setEnabled(mProfile.mAuthenticationType != VpnProfile.TYPE_STATICKEYS);
 
 			// Sets Summary
 			onPreferenceChange(mIPv4, mIPv4.getText());
diff --git a/main/src/main/res/layout/vpnstatus.xml b/main/src/main/res/layout/vpnstatus.xml
index b304ad10..3b464b62 100644
--- a/main/src/main/res/layout/vpnstatus.xml
+++ b/main/src/main/res/layout/vpnstatus.xml
@@ -43,8 +43,9 @@
             style="@style/logWindowStatusTitle"/>
 
     <TextView
+
             android:id="@+id/speedStatus"
-            tools:text="Connected"
+            tools:text="Connected to a very long ipv4 and 3483489348238824829482384928"
             style="@style/logWindowStatusText"/>