summaryrefslogtreecommitdiff
path: root/main/src
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2016-02-29 09:55:09 +0100
committerArne Schwabe <arne@rfc2549.org>2016-02-29 09:59:29 +0100
commitb3e20603bb687da8a348f1c73d9645f86d159483 (patch)
tree081cbd07dd7bac608f327eb0fb8a6c8f8a691300 /main/src
parentca1493138f98e2781b90fd14093d6b5788181bb1 (diff)
Fix crash on Android 6.0
Diffstat (limited to 'main/src')
-rw-r--r--main/src/main/AndroidManifest.xml3
-rw-r--r--main/src/main/java/de/blinkt/openvpn/LaunchVPN.java7
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java2
3 files changed, 7 insertions, 5 deletions
diff --git a/main/src/main/AndroidManifest.xml b/main/src/main/AndroidManifest.xml
index f9c75da0..a6ec8b0a 100644
--- a/main/src/main/AndroidManifest.xml
+++ b/main/src/main/AndroidManifest.xml
@@ -27,6 +27,7 @@
<application
android:name=".core.ICSOpenVPNApplication"
android:allowBackup="true"
+ android:banner="@drawable/icon"
android:icon="@drawable/icon"
android:label="@string/app"
android:supportsRtl="true"
@@ -41,6 +42,7 @@
android:name=".activities.DisconnectVPN"
android:autoRemoveFromRecents="true"
android:excludeFromRecents="true"
+ android:noHistory="true"
android:taskAffinity=""
android:theme="@style/blinkt.dialog" />
@@ -141,6 +143,7 @@
android:name=".LaunchVPN"
android:autoRemoveFromRecents="true"
android:excludeFromRecents="true"
+ android:noHistory="true"
android:label="@string/vpn_launch_title"
android:taskAffinity=""
android:theme="@android:style/Theme.NoDisplay"
diff --git a/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java b/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java
index 152755a5..7ac5cc11 100644
--- a/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java
+++ b/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java
@@ -79,12 +79,11 @@ public class LaunchVPN extends Activity {
super.onCreate(icicle);
mPM =ProfileManager.getInstance(this);
-
+ startVpnFromIntent();
+ finish();
}
- @Override
- protected void onStart() {
- super.onStart();
+ protected void startVpnFromIntent() {
// Resolve the intent
final Intent intent = getIntent();
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 4eba8e64..168dd080 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
@@ -372,7 +372,7 @@ public class VpnStatus {
public boolean verify() {
if (mLevel == null)
return false;
-
+
if (mMessage == null && mRessourceId == 0)
return false;