From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 21 Jun 2018 14:46:13 +0000 (+0200)
Subject: android: Pass UUID to VPN service to initiate profiles
X-Git-Tag: 5.7.0dr5~20^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f9b96acb45bca899b1d00626983bb529f540184;p=thirdparty%2Fstrongswan.git

android: Pass UUID to VPN service to initiate profiles
---

diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
index 803b205a78..ac22cf5ff2 100644
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
@@ -160,7 +160,7 @@ public class CharonVpnService extends VpnService implements Runnable, VpnStateSe
 				Bundle bundle = intent.getExtras();
 				if (bundle != null)
 				{
-					profile = mDataSource.getVpnProfile(bundle.getLong(VpnProfileDataSource.KEY_ID));
+					profile = mDataSource.getVpnProfile(bundle.getString(VpnProfileDataSource.KEY_UUID));
 					if (profile != null)
 					{
 						String password = bundle.getString(VpnProfileDataSource.KEY_PASSWORD);
diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/VpnStateService.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/VpnStateService.java
index 4be782640b..0dc3403468 100644
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/VpnStateService.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/VpnStateService.java
@@ -289,7 +289,7 @@ public class VpnStateService extends Service
 		if (profileInfo == null)
 		{
 			profileInfo = new Bundle();
-			profileInfo.putLong(VpnProfileDataSource.KEY_ID, mProfile.getId());
+			profileInfo.putString(VpnProfileDataSource.KEY_UUID, mProfile.getUUID().toString());
 			/* pass the previous password along */
 			profileInfo.putString(VpnProfileDataSource.KEY_PASSWORD, mProfile.getPassword());
 		}
diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileControlActivity.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileControlActivity.java
index a6cad4ecdb..09553bdff4 100644
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileControlActivity.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileControlActivity.java
@@ -217,7 +217,7 @@ public class VpnProfileControlActivity extends AppCompatActivity
 	public void startVpnProfile(VpnProfile profile)
 	{
 		Bundle profileInfo = new Bundle();
-		profileInfo.putLong(VpnProfileDataSource.KEY_ID, profile.getId());
+		profileInfo.putString(VpnProfileDataSource.KEY_UUID, profile.getUUID().toString());
 		profileInfo.putString(VpnProfileDataSource.KEY_USERNAME, profile.getUsername());
 		profileInfo.putString(VpnProfileDataSource.KEY_PASSWORD, profile.getPassword());
 		profileInfo.putBoolean(PROFILE_REQUIRES_PASSWORD, profile.getVpnType().has(VpnTypeFeature.USER_PASS));