android: Add data source for managed VPN profiles

Include the managed VPN profile data source in the profile source,
to show profiles from both sources in the UI.

diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfileManagedDataSource.java b/src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfileManagedDataSource.java
new file mode 100644 (file)
index 0000000..414d5bc
--- /dev/null
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfileManagedDataSource.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2023 Relution GmbH
+ *
+ * Copyright (C) secunet Security Networks AG
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+package org.strongswan.android.data;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.database.SQLException;
+
+import org.strongswan.android.logic.StrongSwanApplication;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+public class VpnProfileManagedDataSource implements VpnProfileDataSource
+{
+       private static final String NAME_MANAGED_VPN_PROFILES = "org.strongswan.android.data.VpnProfileManagedDataSource.preferences";
+
+       private final ManagedConfigurationService mManagedConfigurationService;
+       private final SharedPreferences mSharedPreferences;
+
+       public VpnProfileManagedDataSource(final Context context)
+       {
+               this.mManagedConfigurationService = StrongSwanApplication.getInstance().getManagedConfigurationService();
+               this.mSharedPreferences = context.getSharedPreferences(NAME_MANAGED_VPN_PROFILES, Context.MODE_PRIVATE);
+       }
+
+       @Override
+       public VpnProfileDataSource open() throws SQLException
+       {
+               return this;
+       }
+
+       @Override
+       public void close()
+       {
+               /* remove passwords that are no longer referenced by a VPN profile */
+               final Set<String> actualKeys = mManagedConfigurationService.getManagedProfiles().keySet();
+
+               final Set<String> storedKeys = new HashSet<>(mSharedPreferences.getAll().keySet());
+               storedKeys.removeAll(actualKeys);
+
+               final SharedPreferences.Editor editor = mSharedPreferences.edit();
+               for (String key : storedKeys)
+               {
+                       editor.remove(key);
+               }
+
+               editor.apply();
+       }
+
+       @Override
+       public VpnProfile insertProfile(VpnProfile profile)
+       {
+               return null;
+       }
+
+       @Override
+       public boolean updateVpnProfile(VpnProfile profile)
+       {
+               final VpnProfile existingProfile = getVpnProfile(profile.getUUID());
+               if (existingProfile == null)
+               {
+                       return false;
+               }
+
+               final String password = profile.getPassword();
+               existingProfile.setPassword(password);
+
+               final SharedPreferences.Editor editor = mSharedPreferences.edit();
+               editor.putString(profile.getUUID().toString(), password);
+               return editor.commit();
+       }
+
+       @Override
+       public boolean deleteVpnProfile(VpnProfile profile)
+       {
+               return false;
+       }
+
+       @Override
+       public VpnProfile getVpnProfile(UUID uuid)
+       {
+               return mManagedConfigurationService.getManagedProfiles().get(uuid.toString());
+       }
+
+       @Override
+       public List<VpnProfile> getAllVpnProfiles()
+       {
+               final Map<String, ManagedVpnProfile> managedVpnProfiles = mManagedConfigurationService.getManagedProfiles();
+               final List<VpnProfile> vpnProfiles = new ArrayList<>();
+               for (final VpnProfile vpnProfile : managedVpnProfiles.values())
+               {
+                       final String password = mSharedPreferences.getString(vpnProfile.getUUID().toString(), vpnProfile.getPassword());
+                       vpnProfile.setPassword(password);
+                       vpnProfile.setDataSource(this);
+                       vpnProfiles.add(vpnProfile);
+               }
+               return vpnProfiles;
+       }
+}

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 2ae0872cc9798c06410141c9cb469b2546ba9e96..fd66308e64bb6a94aa7312393792fe580f4ae3ea 100644 (file)
--- 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
@@ -31,7 +31,9 @@ public class VpnProfileSource implements VpnProfileDataSource
        public VpnProfileSource(Context context)
        {
                vpnProfileSqlDataSource = new VpnProfileSqlDataSource(context);
+
                dataSources.add(vpnProfileSqlDataSource);
+               dataSources.add(new VpnProfileManagedDataSource(context));
        }
 
        @Override