android: Change how CA certificate reloads are initiated

diff --git a/src/frontends/android/src/org/strongswan/android/logic/TrustedCertificateManager.java b/src/frontends/android/src/org/strongswan/android/logic/TrustedCertificateManager.java
index 6e0c9f7a7eda7e3ac1d0df9d187b77a7f304ace0..82a7cbe4ea68d9e8922be458c537aa8115c6dd91 100644 (file)
--- a/src/frontends/android/src/org/strongswan/android/logic/TrustedCertificateManager.java
+++ b/src/frontends/android/src/org/strongswan/android/logic/TrustedCertificateManager.java
@@ -33,6 +33,7 @@ public class TrustedCertificateManager
        private static final String TAG = TrustedCertificateManager.class.getSimpleName();
        private final ReentrantReadWriteLock mLock = new ReentrantReadWriteLock();
        private Hashtable<String, X509Certificate> mCACerts = new Hashtable<String, X509Certificate>();
+       private volatile boolean mReload;
        private boolean mLoaded;
        private final ArrayList<KeyStore> mKeyStores = new ArrayList<KeyStore>();
 
@@ -94,16 +95,14 @@ public class TrustedCertificateManager
        }
 
        /**
-        * Forces a load/reload of the cached CA certificates.
-        * As this takes a while it should be called asynchronously.
+        * Invalidates the current load state so that the next call to load()
+        * will force a reload of the cached CA certificates.
         * @return reference to itself
         */
-       public TrustedCertificateManager reload()
+       public TrustedCertificateManager reset()
        {
-               Log.d(TAG, "Force reload of cached CA certificates");
-               this.mLock.writeLock().lock();
-               loadCertificates();
-               this.mLock.writeLock().unlock();
+               Log.d(TAG, "Force reload of cached CA certificates on next load");
+               this.mReload = true;
                return this;
        }
 
@@ -117,8 +116,9 @@ public class TrustedCertificateManager
        {
                Log.d(TAG, "Ensure cached CA certificates are loaded");
                this.mLock.writeLock().lock();
-               if (!this.mLoaded)
+               if (!this.mLoaded || this.mReload)
                {
+                       this.mReload = false;
                        loadCertificates();
                }
                this.mLock.writeLock().unlock();

diff --git a/src/frontends/android/src/org/strongswan/android/ui/TrustedCertificatesActivity.java b/src/frontends/android/src/org/strongswan/android/ui/TrustedCertificatesActivity.java
index 03cf84375b3e4239ae88ea773cb6289f9189b394..fbdd9af965d22d1f506d124d69f14d1f4729239d 100644 (file)
--- a/src/frontends/android/src/org/strongswan/android/ui/TrustedCertificatesActivity.java
+++ b/src/frontends/android/src/org/strongswan/android/ui/TrustedCertificatesActivity.java
@@ -179,7 +179,7 @@ public class TrustedCertificatesActivity extends Activity implements TrustedCert
                @Override
                protected TrustedCertificateManager doInBackground(Void... params)
                {
-                       return TrustedCertificateManager.getInstance().reload();
+                       return TrustedCertificateManager.getInstance().reset().load();
                }
                @Override
                protected void onPostExecute(TrustedCertificateManager result)