From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 6 Jul 2017 13:16:24 +0000 (+0200)
Subject: android: Catch NullPointerException when calling VpnService.prepare()
X-Git-Tag: 5.6.1dr2~10^2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e59b78254a7b24be826b75bad0250ac4241bfaad;p=thirdparty%2Fstrongswan.git

android: Catch NullPointerException when calling VpnService.prepare()

According to the Play Console this occurs occasionally.
---

diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/MainActivity.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/MainActivity.java
index efdeddd484..a7006cd491 100644
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/MainActivity.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/MainActivity.java
@@ -218,6 +218,12 @@ public class MainActivity extends AppCompatActivity implements OnVpnProfileSelec
 			VpnNotSupportedError.showWithMessage(this, R.string.vpn_not_supported_during_lockdown);
 			return;
 		}
+		catch (NullPointerException ex)
+		{
+			/* not sure when this happens exactly, but apparently it does */
+			VpnNotSupportedError.showWithMessage(this, R.string.vpn_not_supported);
+			return;
+		}
 		/* store profile info until the user grants us permission */
 		mProfileInfo = profileInfo;
 		if (intent != null)