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

android: Update managed certificates if config changes

Browse Source
This commit is contained in:
Markus Pfeiffer
2024-02-21 12:24:53 +01:00
committed by Tobias Brunner
parent b0ba845e27
commit 8c6b3019a7
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/app/src/main/java/org/strongswan/android/logic/StrongSwanApplication.java
+16 -5
View File
@@ -56,6 +56,8 @@ public class StrongSwanApplication extends Application implements DefaultLifecyc
private final Handler mMainHandler = HandlerCompat.createAsync(Looper.getMainLooper()); private final Handler mMainHandler = HandlerCompat.createAsync(Looper.getMainLooper());
private ManagedConfigurationService mManagedConfigurationService; private ManagedConfigurationService mManagedConfigurationService;
private ManagedTrustedCertificateManager mTrustedCertificateManager;
private ManagedUserCertificateManager mUserCertificateManager;
private DatabaseHelper mDatabaseHelper; private DatabaseHelper mDatabaseHelper;
@@ -84,6 +86,12 @@ public class StrongSwanApplication extends Application implements DefaultLifecyc
mDatabaseHelper = new DatabaseHelper(mContext); mDatabaseHelper = new DatabaseHelper(mContext);
mManagedConfigurationService = new ManagedConfigurationService(mContext); mManagedConfigurationService = new ManagedConfigurationService(mContext);
mTrustedCertificateManager = new ManagedTrustedCertificateManager(mContext, mExecutorService, mMainHandler,
mManagedConfigurationService, mDatabaseHelper);
mUserCertificateManager = new ManagedUserCertificateManager(mContext, mManagedConfigurationService, mDatabaseHelper);
ProcessLifecycleOwner.get().getLifecycle().addObserver(this); ProcessLifecycleOwner.get().getLifecycle().addObserver(this);
} }
@@ -109,12 +117,15 @@ public class StrongSwanApplication extends Application implements DefaultLifecyc
mManagedConfigurationService.loadConfiguration(); mManagedConfigurationService.loadConfiguration();
mManagedConfigurationService.updateSettings(); mManagedConfigurationService.updateSettings();
uuids.addAll(mManagedConfigurationService.getManagedProfiles().keySet()); mUserCertificateManager.update();
mTrustedCertificateManager.update(() -> {
uuids.addAll(mManagedConfigurationService.getManagedProfiles().keySet());
Log.d(TAG, "Send profiles changed broadcast"); Log.d(TAG, "Send profiles changed broadcast");
Intent profilesChanged = new Intent(Constants.VPN_PROFILES_CHANGED); Intent profilesChanged = new Intent(Constants.VPN_PROFILES_CHANGED);
profilesChanged.putExtra(Constants.VPN_PROFILES_MULTIPLE, uuids.toArray(new String[0])); profilesChanged.putExtra(Constants.VPN_PROFILES_MULTIPLE, uuids.toArray(new String[0]));
LocalBroadcastManager.getInstance(mContext).sendBroadcast(profilesChanged); LocalBroadcastManager.getInstance(mContext).sendBroadcast(profilesChanged);
});
} }
/** /**