android: Replace option to reload CA certificates with CA certificate view

The reload option will be added there.

diff --git a/src/frontends/android/res/menu/main.xml b/src/frontends/android/res/menu/main.xml
index 4063110dac7049cc95466b10aaaaf8ec562ff5c1..3dde5227e77825d18d1d6525bb14a3c783a58e1c 100644 (file)
--- a/src/frontends/android/res/menu/main.xml
+++ b/src/frontends/android/res/menu/main.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (C) 2012 Tobias Brunner
+    Copyright (C) 2012-2014 Tobias Brunner
     Hochschule fuer Technik Rapperswil
 
     This program is free software; you can redistribute it and/or modify it
@@ -16,8 +16,8 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <item
-        android:id="@+id/menu_reload_certs"
-        android:title="@string/reload_trusted_certs"
+        android:id="@+id/menu_manage_certs"
+        android:title="@string/trusted_certs_title"
         android:showAsAction="withText" />
 
     <item

diff --git a/src/frontends/android/src/org/strongswan/android/ui/MainActivity.java b/src/frontends/android/src/org/strongswan/android/ui/MainActivity.java
index 3cf39505403700e5c20e625109abe24a8d979971..a2ad80e82903db1399270edd3b13aa9271d1c1b5 100644 (file)
--- a/src/frontends/android/src/org/strongswan/android/ui/MainActivity.java
+++ b/src/frontends/android/src/org/strongswan/android/ui/MainActivity.java
@@ -101,7 +101,7 @@ public class MainActivity extends Activity implements OnVpnProfileSelectedListen
                bar.setDisplayShowTitleEnabled(false);
 
                /* load CA certificates in a background task */
-               new CertificateLoadTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, false);
+               new LoadCertificatesTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
        }
 
        @Override
@@ -140,8 +140,9 @@ public class MainActivity extends Activity implements OnVpnProfileSelectedListen
        {
                switch (item.getItemId())
                {
-                       case R.id.menu_reload_certs:
-                               new CertificateLoadTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, true);
+                       case R.id.menu_manage_certs:
+                               Intent certIntent = new Intent(this, TrustedCertificatesActivity.class);
+                               startActivity(certIntent);
                                return true;
                        case R.id.menu_show_log:
                                Intent logIntent = new Intent(this, LogActivity.class);
@@ -280,9 +281,9 @@ public class MainActivity extends Activity implements OnVpnProfileSelectedListen
        }
 
        /**
-        * Class that loads or reloads the cached CA certificates.
+        * Class that loads the cached CA certificates.
         */
-       private class CertificateLoadTask extends AsyncTask<Boolean, Void, TrustedCertificateManager>
+       private class LoadCertificatesTask extends AsyncTask<Void, Void, TrustedCertificateManager>
        {
                @Override
                protected void onPreExecute()
@@ -290,12 +291,8 @@ public class MainActivity extends Activity implements OnVpnProfileSelectedListen
                        setProgressBarIndeterminateVisibility(true);
                }
                @Override
-               protected TrustedCertificateManager doInBackground(Boolean... params)
+               protected TrustedCertificateManager doInBackground(Void... params)
                {
-                       if (params.length > 0 && params[0])
-                       {       /* force a reload of the certificates */
-                               return TrustedCertificateManager.getInstance().reload();
-                       }
                        return TrustedCertificateManager.getInstance().load();
                }
                @Override