sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-03 00:00:24 -04:00
Code Issues Projects Releases Wiki Activity

android: Add data source to VpnProfile

Browse Source
This commit is contained in:
Markus Pfeiffer 2023-11-21 15:37:21 +01:00 committed by Tobias Brunner
parent 5f9f279a33
commit a5167a69e0
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfile.java
View File

@ -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()
{

4
src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfileSource.java
View File

@ -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

3
src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfileSqlDataSource.java
View File

@ -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();
}