Add an Activity that shows the log fragment
[strongswan.git] / src / frontends / android / src / org / strongswan / android / ui / MainActivity.java
index 65131fa..f9d6c17 100644 (file)
@@ -26,13 +26,22 @@ import org.strongswan.android.ui.VpnProfileListFragment.OnVpnProfileSelectedList
 
 import android.app.ActionBar;
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.AlertDialog.Builder;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.VpnService;
+import android.os.AsyncTask;
 import android.os.Bundle;
+import android.view.LayoutInflater;
 import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.View;
 import android.view.Window;
+import android.widget.EditText;
 
 public class MainActivity extends Activity implements OnVpnProfileSelectedListener
 {
@@ -49,29 +58,14 @@ public class MainActivity extends Activity implements OnVpnProfileSelectedListen
                ActionBar bar = getActionBar();
                bar.setDisplayShowTitleEnabled(false);
 
-               /* load CA certificates in a background thread */
-               setProgressBarIndeterminateVisibility(true);
-               new Thread(new Runnable() {
-                       @Override
-                       public void run()
-                       {
-                               TrustedCertificateManager.getInstance().load();
-                               runOnUiThread(new Runnable() {
-                                       @Override
-                                       public void run()
-                                       {
-                                               setProgressBarIndeterminateVisibility(false);
-                                       }
-                               });
-                       }
-               }).start();
+               /* load CA certificates in a background task */
+               new CertificateLoadTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, false);
        }
 
        @Override
        public boolean onCreateOptionsMenu(Menu menu)
        {
-               MenuInflater inflater = getMenuInflater();
-               inflater.inflate(R.menu.main, menu);
+               getMenuInflater().inflate(R.menu.main, menu);
                return true;
        }
 
@@ -81,21 +75,11 @@ public class MainActivity extends Activity implements OnVpnProfileSelectedListen
                switch (item.getItemId())
                {
                        case R.id.menu_reload_certs:
-                               setProgressBarIndeterminateVisibility(true);
-                               new Thread(new Runnable() {
-                                       @Override
-                                       public void run()
-                                       {
-                                               TrustedCertificateManager.getInstance().reload();
-                                               runOnUiThread(new Runnable() {
-                                                       @Override
-                                                       public void run()
-                                                       {
-                                                               setProgressBarIndeterminateVisibility(false);
-                                                       }
-                                               });
-                                       }
-                               }).start();
+                               new CertificateLoadTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, true);
+                               return true;
+                       case R.id.menu_show_log:
+                               Intent logIntent = new Intent(this, LogActivity.class);
+                               startActivity(logIntent);
                                return true;
                        default:
                                return super.onOptionsItemSelected(item);
@@ -129,6 +113,8 @@ public class MainActivity extends Activity implements OnVpnProfileSelectedListen
                                {
                                        Intent intent = new Intent(this, CharonVpnService.class);
                                        intent.putExtra(VpnProfileDataSource.KEY_ID, activeProfile.getId());
+                                       /* submit the password as the profile might not store one */
+                                       intent.putExtra(VpnProfileDataSource.KEY_PASSWORD, activeProfile.getPassword());
                                        this.startService(intent);
                                }
                                break;
@@ -141,6 +127,74 @@ public class MainActivity extends Activity implements OnVpnProfileSelectedListen
        public void onVpnProfileSelected(VpnProfile profile)
        {
                activeProfile = profile;
-               prepareVpnService();
+               if (activeProfile.getPassword() == null)
+               {
+                       new LoginDialog().show(getFragmentManager(), "LoginDialog");
+               }
+               else
+               {
+                       prepareVpnService();
+               }
+       }
+
+       /**
+        * Class that loads or reloads the cached CA certificates.
+        */
+       private class CertificateLoadTask extends AsyncTask<Boolean, Void, TrustedCertificateManager>
+       {
+               @Override
+               protected void onPreExecute()
+               {
+                       setProgressBarIndeterminateVisibility(true);
+               }
+               @Override
+               protected TrustedCertificateManager doInBackground(Boolean... params)
+               {
+                       if (params.length > 0 && params[0])
+                       {       /* force a reload of the certificates */
+                               return TrustedCertificateManager.getInstance().reload();
+                       }
+                       return TrustedCertificateManager.getInstance().load();
+               }
+               @Override
+               protected void onPostExecute(TrustedCertificateManager result)
+               {
+                       setProgressBarIndeterminateVisibility(false);
+               }
+       }
+
+       private class LoginDialog extends DialogFragment
+       {
+               @Override
+               public Dialog onCreateDialog(Bundle savedInstanceState)
+               {
+                       LayoutInflater inflater = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+                       View view = inflater.inflate(R.layout.login_dialog, null);
+                       EditText username = (EditText)view.findViewById(R.id.username);
+                       username.setText(activeProfile.getUsername());
+                       final EditText password = (EditText)view.findViewById(R.id.password);
+
+                       Builder adb = new AlertDialog.Builder(MainActivity.this);
+                       adb.setView(view);
+                       adb.setTitle(getString(R.string.login_title));
+                       adb.setPositiveButton(R.string.login_confirm, new DialogInterface.OnClickListener() {
+                               @Override
+                               public void onClick(DialogInterface dialog, int whichButton)
+                               {
+                                       /* let's work on a clone of the profile when updating the password */
+                                       activeProfile = activeProfile.clone();
+                                       activeProfile.setPassword(password.getText().toString().trim());
+                                       prepareVpnService();
+                               }
+                       });
+                       adb.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
+                               @Override
+                               public void onClick(DialogInterface dialog, int which)
+                               {
+                                       dismiss();
+                               }
+                       });
+                       return adb.create();
+               }
        }
 }