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

android: Hide unmanaged profiles by default

Browse Source 
Such profiles could exist if a user already had strongSwan installed.
This commit is contained in:
Markus Pfeiffer
2024-02-21 12:24:53 +01:00
committed by Tobias Brunner
parent 0af501ef26
commit 42626c1dd8
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfileSource.java
+18 -2
View File
@@ -19,17 +19,22 @@ package org.strongswan.android.data;
import android.content.Context; import android.content.Context;
import android.database.SQLException; import android.database.SQLException;
import org.strongswan.android.logic.StrongSwanApplication;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
public class VpnProfileSource implements VpnProfileDataSource public class VpnProfileSource implements VpnProfileDataSource
{ {
private final ManagedConfigurationService mManagedConfigurationService;
private final List<VpnProfileDataSource> dataSources = new ArrayList<>(); private final List<VpnProfileDataSource> dataSources = new ArrayList<>();
private final VpnProfileSqlDataSource vpnProfileSqlDataSource; private final VpnProfileSqlDataSource vpnProfileSqlDataSource;
public VpnProfileSource(Context context) public VpnProfileSource(Context context)
{ {
mManagedConfigurationService = StrongSwanApplication.getInstance().getManagedConfigurationService();
vpnProfileSqlDataSource = new VpnProfileSqlDataSource(context); vpnProfileSqlDataSource = new VpnProfileSqlDataSource(context);
dataSources.add(vpnProfileSqlDataSource); dataSources.add(vpnProfileSqlDataSource);
@@ -73,10 +78,21 @@ public class VpnProfileSource implements VpnProfileDataSource
return profile.getDataSource().deleteVpnProfile(profile); return profile.getDataSource().deleteVpnProfile(profile);
} }
private List<VpnProfileDataSource> getAccessibleSources()
{
final ManagedConfiguration managedConfiguration = mManagedConfigurationService.getManagedConfiguration();
ArrayList<VpnProfileDataSource> sources = new ArrayList<>(dataSources);
if (!managedConfiguration.isAllowExistingProfiles())
{
sources.remove(vpnProfileSqlDataSource);
}
return sources;
}
@Override @Override
public VpnProfile getVpnProfile(UUID uuid) public VpnProfile getVpnProfile(UUID uuid)
{ {
for (final VpnProfileDataSource source : dataSources) for (final VpnProfileDataSource source : getAccessibleSources())
{ {
final VpnProfile profile = source.getVpnProfile(uuid); final VpnProfile profile = source.getVpnProfile(uuid);
if (profile != null) if (profile != null)
@@ -92,7 +108,7 @@ public class VpnProfileSource implements VpnProfileDataSource
{ {
final List<VpnProfile> profiles = new ArrayList<>(); final List<VpnProfile> profiles = new ArrayList<>();
for (final VpnProfileDataSource source : dataSources) for (final VpnProfileDataSource source : getAccessibleSources())
{ {
profiles.addAll(source.getAllVpnProfiles()); profiles.addAll(source.getAllVpnProfiles());
} }