From: Markus Pfeiffer <markus.pfeiffer@relution.io>
Date: Tue, 21 Nov 2023 14:37:21 +0000 (+0100)
Subject: android: Add data source to VpnProfile
X-Git-Tag: android-2.5.0^2~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5167a69e05392d4bbe7c1ab3895fce1c0c5899c;p=thirdparty%2Fstrongswan.git

android: Add data source to VpnProfile
---

diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfile.java b/src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfile.java
index 9219b1001c..e3ce9d4b84 100644
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfile.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfile.java
@@ -49,6 +49,7 @@ public class VpnProfile implements Cloneable
 	private UUID mUUID;
 	private long mId = -1;
 	private boolean mReadOnly;
+	private VpnProfileDataSource mDataSource;
 
 	public enum SelectedAppsHandling
 	{
@@ -342,6 +343,16 @@ public class VpnProfile implements Cloneable
 		this.mReadOnly = readOnly;
 	}
 
+	public VpnProfileDataSource getDataSource()
+	{
+		return mDataSource;
+	}
+
+	public void setDataSource(VpnProfileDataSource mDataSource)
+	{
+		this.mDataSource = mDataSource;
+	}
+
 	@Override
 	public String toString()
 	{
diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfileSource.java b/src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfileSource.java
index 4a709989ac..2ae0872cc9 100644
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfileSource.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfileSource.java
@@ -62,13 +62,13 @@ public class VpnProfileSource implements VpnProfileDataSource
 	@Override
 	public boolean updateVpnProfile(VpnProfile profile)
 	{
-		return vpnProfileSqlDataSource.updateVpnProfile(profile);
+		return profile.getDataSource().updateVpnProfile(profile);
 	}
 
 	@Override
 	public boolean deleteVpnProfile(VpnProfile profile)
 	{
-		return vpnProfileSqlDataSource.deleteVpnProfile(profile);
+		return profile.getDataSource().deleteVpnProfile(profile);
 	}
 
 	@Override
diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfileSqlDataSource.java b/src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfileSqlDataSource.java
index 0934edc392..5b1f9ad269 100644
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfileSqlDataSource.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfileSqlDataSource.java
@@ -291,6 +291,7 @@ public class VpnProfileSqlDataSource implements VpnProfileDataSource
 		{
 			return null;
 		}
+		profile.setDataSource(this);
 		profile.setId(insertId);
 		return profile;
 	}
@@ -319,6 +320,7 @@ public class VpnProfileSqlDataSource implements VpnProfileDataSource
 		if (cursor.moveToFirst())
 		{
 			profile = VpnProfileFromCursor(cursor);
+			profile.setDataSource(this);
 		}
 		cursor.close();
 		return profile;
@@ -334,6 +336,7 @@ public class VpnProfileSqlDataSource implements VpnProfileDataSource
 		while (!cursor.isAfterLast())
 		{
 			VpnProfile vpnProfile = VpnProfileFromCursor(cursor);
+			vpnProfile.setDataSource(this);
 			vpnProfiles.add(vpnProfile);
 			cursor.moveToNext();
 		}