From a56f8a82e5911fd7d67f7e51b680b2dc9d9d8901 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Sun, 7 Dec 2014 16:53:53 +0100 Subject: Report strange error, remove DisconnectVPN from recents list --HG-- extra : rebase_source : 4483741e05af5b667b181e77533a45301fd8e6e6 --- main/src/main/AndroidManifest.xml | 45 +++++++++++----------- .../de/blinkt/openvpn/core/OpenVPNService.java | 5 +++ 2 files changed, 28 insertions(+), 22 deletions(-) (limited to 'main') diff --git a/main/src/main/AndroidManifest.xml b/main/src/main/AndroidManifest.xml index dbc9c243..c6876fe5 100644 --- a/main/src/main/AndroidManifest.xml +++ b/main/src/main/AndroidManifest.xml @@ -18,21 +18,23 @@ + android:exported="false" + android:windowSoftInputMode="stateHidden" /> + android:autoRemoveFromRecents="true" + android:excludeFromRecents="true" + android:name=".activities.DisconnectVPN" + android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" /> + tools:ignore="ExportedActivity"> @@ -53,35 +55,34 @@ + android:permission="android.permission.BIND_VPN_SERVICE"> + + - + - + - + @@ -92,8 +93,8 @@ android:name=".activities.ConfigConverter" android:label="Convert Config File" android:uiOptions="splitActionBarWhenNarrow" - tools:ignore="ExportedActivity" > - + tools:ignore="ExportedActivity"> + @@ -101,7 +102,7 @@ - + @@ -109,7 +110,7 @@ - + @@ -130,10 +131,10 @@ + tools:ignore="ExportedActivity"> @@ -144,9 +145,9 @@ + android:label="@string/vpn_shortcut" + android:theme="@android:style/Theme.DeviceDefault.Light.DialogWhenLarge"> diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java index 8352c33c..0569a4f4 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java +++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java @@ -654,6 +654,11 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac intf.startsWith("tun") || intf.startsWith("rmnet")) continue; + if (ipAddr==null || netMask == null) { + VpnStatus.logError("Local routes are broken?! (Report to author) " + TextUtils.join("|", localRoutes)); + continue; + } + if (ipAddr.equals(mLocalIP.mIp)) continue; -- cgit v1.2.3