denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: Pass UUID to VPN service to initiate profiles

Browse Source
This commit is contained in:
Tobias Brunner
2018-07-03 11:31:42 +02:00
parent 163f752022
commit 6f9b96acb4
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
+1 -1
View File
@@ -160,7 +160,7 @@ public class CharonVpnService extends VpnService implements Runnable, VpnStateSe
Bundle bundle = intent.getExtras(); Bundle bundle = intent.getExtras();
if (bundle != null) if (bundle != null)
{ {
profile = mDataSource.getVpnProfile(bundle.getLong(VpnProfileDataSource.KEY_ID)); profile = mDataSource.getVpnProfile(bundle.getString(VpnProfileDataSource.KEY_UUID));
if (profile != null) if (profile != null)
{ {
String password = bundle.getString(VpnProfileDataSource.KEY_PASSWORD); String password = bundle.getString(VpnProfileDataSource.KEY_PASSWORD);
src/frontends/android/app/src/main/java/org/strongswan/android/logic/VpnStateService.java
+1 -1
View File
@@ -289,7 +289,7 @@ public class VpnStateService extends Service
if (profileInfo == null) if (profileInfo == null)
{ {
profileInfo = new Bundle(); profileInfo = new Bundle();
profileInfo.putLong(VpnProfileDataSource.KEY_ID, mProfile.getId()); profileInfo.putString(VpnProfileDataSource.KEY_UUID, mProfile.getUUID().toString());
/* pass the previous password along */ /* pass the previous password along */
profileInfo.putString(VpnProfileDataSource.KEY_PASSWORD, mProfile.getPassword()); profileInfo.putString(VpnProfileDataSource.KEY_PASSWORD, mProfile.getPassword());
} }
src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileControlActivity.java
+1 -1
View File
@@ -217,7 +217,7 @@ public class VpnProfileControlActivity extends AppCompatActivity
public void startVpnProfile(VpnProfile profile) public void startVpnProfile(VpnProfile profile)
{ {
Bundle profileInfo = new Bundle(); 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_USERNAME, profile.getUsername());
profileInfo.putString(VpnProfileDataSource.KEY_PASSWORD, profile.getPassword()); profileInfo.putString(VpnProfileDataSource.KEY_PASSWORD, profile.getPassword());
profileInfo.putBoolean(PROFILE_REQUIRES_PASSWORD, profile.getVpnType().has(VpnTypeFeature.USER_PASS)); profileInfo.putBoolean(PROFILE_REQUIRES_PASSWORD, profile.getVpnType().has(VpnTypeFeature.USER_PASS));