Started using ActionBarSherlock

9 files changed, 113 insertions, 97 deletions

diff --git a/org_apg/src/org/apg/ui/BaseActivity.java b/org_apg/src/org/apg/ui/BaseActivity.java
index 9b5039a5d..2cb04effb 100644
--- a/org_apg/src/org/apg/ui/BaseActivity.java
+++ b/org_apg/src/org/apg/ui/BaseActivity.java
@@ -31,6 +31,10 @@ import org.apg.ProgressDialogUpdater;
 import org.apg.Service;
 import org.apg.R;
 
+import com.actionbarsherlock.app.SherlockActivity;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
+
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -44,13 +48,11 @@ import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;
 
-public class BaseActivity extends Activity implements Runnable, ProgressDialogUpdater,
+public class BaseActivity extends SherlockActivity implements Runnable, ProgressDialogUpdater,
         AskForSecretKeyPassPhrase.PassPhraseCallbackInterface {
 
     private ProgressDialog mProgressDialog = null;
diff --git a/org_apg/src/org/apg/ui/EditKeyActivity.java b/org_apg/src/org/apg/ui/EditKeyActivity.java
index c3945d4ed..8d0ed6589 100644
--- a/org_apg/src/org/apg/ui/EditKeyActivity.java
+++ b/org_apg/src/org/apg/ui/EditKeyActivity.java
@@ -28,6 +28,8 @@ import org.spongycastle.openpgp.PGPSecretKey;
 import org.spongycastle.openpgp.PGPSecretKeyRing;
 import org.apg.R;
 
+import com.actionbarsherlock.view.Menu;
+
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
@@ -36,7 +38,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Message;
 import android.view.LayoutInflater;
-import android.view.Menu;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
diff --git a/org_apg/src/org/apg/ui/KeyListActivity.java b/org_apg/src/org/apg/ui/KeyListActivity.java
index 6c76f02bc..74942a797 100644
--- a/org_apg/src/org/apg/ui/KeyListActivity.java
+++ b/org_apg/src/org/apg/ui/KeyListActivity.java
@@ -29,6 +29,8 @@ import org.spongycastle.openpgp.PGPPublicKeyRing;
 import org.spongycastle.openpgp.PGPSecretKeyRing;
 import org.apg.R;
 
+import com.actionbarsherlock.view.MenuItem;
+
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.SearchManager;
@@ -42,7 +44,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Message;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
@@ -163,7 +164,7 @@ public class KeyListActivity extends BaseActivity {
     }
 
     @Override
-    public boolean onContextItemSelected(MenuItem menuItem) {
+    public boolean onContextItemSelected(android.view.MenuItem menuItem) {
         ExpandableListContextMenuInfo info = (ExpandableListContextMenuInfo) menuItem.getMenuInfo();
         int type = ExpandableListView.getPackedPositionType(info.packedPosition);
         int groupPosition = ExpandableListView.getPackedPositionGroup(info.packedPosition);
diff --git a/org_apg/src/org/apg/ui/KeyServerPreferenceActivity.java b/org_apg/src/org/apg/ui/KeyServerPreferenceActivity.java
index 85d31779a..69f9772ef 100644
--- a/org_apg/src/org/apg/ui/KeyServerPreferenceActivity.java
+++ b/org_apg/src/org/apg/ui/KeyServerPreferenceActivity.java
@@ -24,19 +24,20 @@ import org.apg.ui.widget.KeyServerEditor;
 import org.apg.ui.widget.Editor.EditorListener;
 import org.apg.R;
 
+import com.actionbarsherlock.view.Menu;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
-import android.view.Menu;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
-public class KeyServerPreferenceActivity extends BaseActivity
-        implements OnClickListener, EditorListener {
+public class KeyServerPreferenceActivity extends BaseActivity implements OnClickListener,
+        EditorListener {
     private LayoutInflater mInflater;
     private ViewGroup mEditors;
     private View mAdd;
@@ -63,7 +64,8 @@ public class KeyServerPreferenceActivity extends BaseActivity
         String servers[] = intent.getStringArrayExtra(Apg.EXTRA_KEY_SERVERS);
         if (servers != null) {
             for (int i = 0; i < servers.length; ++i) {
-                KeyServerEditor view = (KeyServerEditor) mInflater.inflate(R.layout.key_server_editor, mEditors, false);
+                KeyServerEditor view = (KeyServerEditor) mInflater.inflate(
+                        R.layout.key_server_editor, mEditors, false);
                 view.setEditorListener(this);
                 view.setValue(servers[i]);
                 mEditors.addView(view);
@@ -90,7 +92,8 @@ public class KeyServerPreferenceActivity extends BaseActivity
     }
 
     public void onClick(View v) {
-        KeyServerEditor view = (KeyServerEditor) mInflater.inflate(R.layout.key_server_editor, mEditors, false);
+        KeyServerEditor view = (KeyServerEditor) mInflater.inflate(R.layout.key_server_editor,
+                mEditors, false);
         view.setEditorListener(this);
         mEditors.addView(view);
     }
diff --git a/org_apg/src/org/apg/ui/MainActivity.java b/org_apg/src/org/apg/ui/MainActivity.java
index b50a205fc..31088cb26 100644
--- a/org_apg/src/org/apg/ui/MainActivity.java
+++ b/org_apg/src/org/apg/ui/MainActivity.java
@@ -25,6 +25,10 @@ import org.apg.Id;
 import org.spongycastle.jce.provider.BouncyCastleProvider;
 import org.apg.R;
 
+import com.actionbarsherlock.app.SherlockActivity;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
+
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
@@ -36,8 +40,6 @@ import android.text.util.Linkify.TransformFilter;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
@@ -83,88 +85,88 @@ public class MainActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main);
 
-        if (!mPreferences.hasSeenHelp()) {
-            showDialog(Id.dialog.help);
-        }
-
-        if (Apg.isReleaseVersion(this) && !mPreferences.hasSeenChangeLog(Apg.getVersion(this))) {
-            showDialog(Id.dialog.change_log);
-        }
+//        if (!mPreferences.hasSeenHelp()) {
+//            showDialog(Id.dialog.help);
+//        }
+//
+//        if (Apg.isReleaseVersion(this) && !mPreferences.hasSeenChangeLog(Apg.getVersion(this))) {
+//            showDialog(Id.dialog.change_log);
+//        }
     }
 
     @Override
     protected Dialog onCreateDialog(int id) {
         switch (id) {
 
-        case Id.dialog.change_log: {
-            AlertDialog.Builder alert = new AlertDialog.Builder(this);
-
-            alert.setTitle("Changes " + Apg.getFullVersion(this));
-            LayoutInflater inflater = (LayoutInflater) this
-                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-            View layout = inflater.inflate(R.layout.info, null);
-            TextView message = (TextView) layout.findViewById(R.id.message);
-
-            message.setText("Changes:\n" + "* \n" + "\n"
-                    + "WARNING: be careful editing your existing keys, as they "
-                    + "WILL be stripped of certificates right now.\n" + "\n"
-                    + "Also: key cross-certification is NOT supported, so signing "
-                    + "with those keys will get a warning when the signature is " + "checked.\n"
-                    + "\n" + "I hope APG continues to be useful to you, please send "
-                    + "bug reports, feature wishes, feedback.");
-            alert.setView(layout);
-
-            alert.setCancelable(false);
-            alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                public void onClick(DialogInterface dialog, int id) {
-                    MainActivity.this.removeDialog(Id.dialog.change_log);
-                    mPreferences.setHasSeenChangeLog(Apg.getVersion(MainActivity.this), true);
-                }
-            });
-
-            return alert.create();
-        }
-
-        case Id.dialog.help: {
-            AlertDialog.Builder alert = new AlertDialog.Builder(this);
-
-            alert.setTitle(R.string.title_help);
-
-            LayoutInflater inflater = (LayoutInflater) this
-                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-            View layout = inflater.inflate(R.layout.info, null);
-            TextView message = (TextView) layout.findViewById(R.id.message);
-            message.setText(R.string.text_help);
-
-            TransformFilter packageNames = new TransformFilter() {
-                public final String transformUrl(final Matcher match, String url) {
-                    String name = match.group(1).toLowerCase();
-                    if (name.equals("astro")) {
-                        return "com.metago.astro";
-                    } else if (name.equals("k-9 mail")) {
-                        return "com.fsck.k9";
-                    } else {
-                        return "org.openintents.filemanager";
-                    }
-                }
-            };
-
-            Pattern pattern = Pattern.compile("(OI File Manager|ASTRO|K-9 Mail)");
-            String scheme = "market://search?q=pname:";
-            message.setAutoLinkMask(0);
-            Linkify.addLinks(message, pattern, scheme, null, packageNames);
-
-            alert.setView(layout);
-
-            alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                public void onClick(DialogInterface dialog, int id) {
-                    MainActivity.this.removeDialog(Id.dialog.help);
-                    mPreferences.setHasSeenHelp(true);
-                }
-            });
-
-            return alert.create();
-        }
+//        case Id.dialog.change_log: {
+//            AlertDialog.Builder alert = new AlertDialog.Builder(this);
+//
+//            alert.setTitle("Changes " + Apg.getFullVersion(this));
+//            LayoutInflater inflater = (LayoutInflater) this
+//                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+//            View layout = inflater.inflate(R.layout.info, null);
+//            TextView message = (TextView) layout.findViewById(R.id.message);
+//
+//            message.setText("Changes:\n" + "* \n" + "\n"
+//                    + "WARNING: be careful editing your existing keys, as they "
+//                    + "WILL be stripped of certificates right now.\n" + "\n"
+//                    + "Also: key cross-certification is NOT supported, so signing "
+//                    + "with those keys will get a warning when the signature is " + "checked.\n"
+//                    + "\n" + "I hope APG continues to be useful to you, please send "
+//                    + "bug reports, feature wishes, feedback.");
+//            alert.setView(layout);
+//
+//            alert.setCancelable(false);
+//            alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+//                public void onClick(DialogInterface dialog, int id) {
+//                    MainActivity.this.removeDialog(Id.dialog.change_log);
+//                    mPreferences.setHasSeenChangeLog(Apg.getVersion(MainActivity.this), true);
+//                }
+//            });
+//
+//            return alert.create();
+//        }
+
+//        case Id.dialog.help: {
+//            AlertDialog.Builder alert = new AlertDialog.Builder(this);
+//
+//            alert.setTitle(R.string.title_help);
+//
+//            LayoutInflater inflater = (LayoutInflater) this
+//                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+//            View layout = inflater.inflate(R.layout.info, null);
+//            TextView message = (TextView) layout.findViewById(R.id.message);
+//            message.setText(R.string.text_help);
+//
+//            TransformFilter packageNames = new TransformFilter() {
+//                public final String transformUrl(final Matcher match, String url) {
+//                    String name = match.group(1).toLowerCase();
+//                    if (name.equals("astro")) {
+//                        return "com.metago.astro";
+//                    } else if (name.equals("k-9 mail")) {
+//                        return "com.fsck.k9";
+//                    } else {
+//                        return "org.openintents.filemanager";
+//                    }
+//                }
+//            };
+//
+//            Pattern pattern = Pattern.compile("(OI File Manager|ASTRO|K-9 Mail)");
+//            String scheme = "market://search?q=pname:";
+//            message.setAutoLinkMask(0);
+//            Linkify.addLinks(message, pattern, scheme, null, packageNames);
+//
+//            alert.setView(layout);
+//
+//            alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+//                public void onClick(DialogInterface dialog, int id) {
+//                    MainActivity.this.removeDialog(Id.dialog.help);
+//                    mPreferences.setHasSeenHelp(true);
+//                }
+//            });
+//
+//            return alert.create();
+//        }
 
         default: {
             return super.onCreateDialog(id);
diff --git a/org_apg/src/org/apg/ui/PublicKeyListActivity.java b/org_apg/src/org/apg/ui/PublicKeyListActivity.java
index 81a79ce33..81d2d5e73 100644
--- a/org_apg/src/org/apg/ui/PublicKeyListActivity.java
+++ b/org_apg/src/org/apg/ui/PublicKeyListActivity.java
@@ -27,12 +27,13 @@ import org.apg.Id.menu.option;
 import org.spongycastle.openpgp.PGPPublicKeyRing;
 import org.apg.R;
 
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
+
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.ExpandableListView;
 import android.widget.ExpandableListView.ExpandableListContextMenuInfo;
@@ -79,7 +80,7 @@ public class PublicKeyListActivity extends KeyListActivity {
     }
 
     @Override
-    public boolean onContextItemSelected(MenuItem menuItem) {
+    public boolean onContextItemSelected(android.view.MenuItem menuItem) {
         ExpandableListContextMenuInfo info = (ExpandableListContextMenuInfo) menuItem.getMenuInfo();
         int type = ExpandableListView.getPackedPositionType(info.packedPosition);
         int groupPosition = ExpandableListView.getPackedPositionGroup(info.packedPosition);
diff --git a/org_apg/src/org/apg/ui/SecretKeyListActivity.java b/org_apg/src/org/apg/ui/SecretKeyListActivity.java
index a5d351bc6..be4da700a 100644
--- a/org_apg/src/org/apg/ui/SecretKeyListActivity.java
+++ b/org_apg/src/org/apg/ui/SecretKeyListActivity.java
@@ -28,13 +28,15 @@ import org.apg.Id.type;
 import org.apg.Id.menu.option;
 import org.apg.R;
 
+
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
+
 import android.app.Dialog;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.ExpandableListView;
 import android.widget.ExpandableListView.ExpandableListContextMenuInfo;
@@ -99,7 +101,7 @@ public class SecretKeyListActivity extends KeyListActivity implements OnChildCli
     }
 
     @Override
-    public boolean onContextItemSelected(MenuItem menuItem) {
+    public boolean onContextItemSelected(android.view.MenuItem menuItem) {
         ExpandableListContextMenuInfo info = (ExpandableListContextMenuInfo) menuItem.getMenuInfo();
         int type = ExpandableListView.getPackedPositionType(info.packedPosition);
         int groupPosition = ExpandableListView.getPackedPositionGroup(info.packedPosition);
diff --git a/org_apg/src/org/apg/ui/SelectPublicKeyListActivity.java b/org_apg/src/org/apg/ui/SelectPublicKeyListActivity.java
index 5216e7a3d..9fbf6586c 100644
--- a/org_apg/src/org/apg/ui/SelectPublicKeyListActivity.java
+++ b/org_apg/src/org/apg/ui/SelectPublicKeyListActivity.java
@@ -24,10 +24,12 @@ import org.apg.Id.menu;
 import org.apg.Id.menu.option;
 import org.apg.R;
 
+
+import com.actionbarsherlock.view.Menu;
+
 import android.app.SearchManager;
 import android.content.Intent;
 import android.os.Bundle;
-import android.view.Menu;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
diff --git a/org_apg/src/org/apg/ui/SelectSecretKeyListActivity.java b/org_apg/src/org/apg/ui/SelectSecretKeyListActivity.java
index 191a0ecc7..1f70f4b04 100644
--- a/org_apg/src/org/apg/ui/SelectSecretKeyListActivity.java
+++ b/org_apg/src/org/apg/ui/SelectSecretKeyListActivity.java
@@ -22,10 +22,12 @@ import org.apg.Id.menu;
 import org.apg.Id.menu.option;
 import org.apg.R;
 
+
+import com.actionbarsherlock.view.Menu;
+
 import android.app.SearchManager;
 import android.content.Intent;
 import android.os.Bundle;
-import android.view.Menu;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.AdapterView;