major restructuring, moving dialog, message, menu, option menu, task, type IDs into Id in a similar structure as the generated R, also introducing a BaseActivity class that almost all activities derive from, which generates some common dialogs, handles the progress update, thread management, and thread communication

also adding first draft of encrypt file activity, not very functional yet

1 files changed, 2 insertions, 4 deletions

diff --git a/src/org/thialfihar/android/apg/AskForSecretKeyPassPhrase.java b/src/org/thialfihar/android/apg/AskForSecretKeyPassPhrase.java
index ed1c16833..06e9c6d0a 100644
--- a/src/org/thialfihar/android/apg/AskForSecretKeyPassPhrase.java
+++ b/src/org/thialfihar/android/apg/AskForSecretKeyPassPhrase.java
@@ -35,8 +35,6 @@ import android.widget.LinearLayout;
 import android.widget.Toast;

 

 public class AskForSecretKeyPassPhrase {

-    public static final int DIALOG_PASS_PHRASE = 12345;

-

     public static interface PassPhraseCallbackInterface {

         void passPhraseCallback(String passPhrase);

     }

@@ -91,7 +89,7 @@ public class AskForSecretKeyPassPhrase {
         alert.setPositiveButton(android.R.string.ok,

                                 new DialogInterface.OnClickListener() {

                                     public void onClick(DialogInterface dialog, int id) {

-                                        activity.removeDialog(DIALOG_PASS_PHRASE);

+                                        activity.removeDialog(Id.dialog.pass_phrase);

                                         String passPhrase = "" + input.getText();

                                         try {

                                             secretKey.extractPrivateKey(passPhrase.toCharArray(),

@@ -109,7 +107,7 @@ public class AskForSecretKeyPassPhrase {
         alert.setNegativeButton(android.R.string.cancel,

                                 new DialogInterface.OnClickListener() {

                                     public void onClick(DialogInterface dialog, int id) {

-                                        activity.removeDialog(DIALOG_PASS_PHRASE);

+                                        activity.removeDialog(Id.dialog.pass_phrase);

                                     }

                                 });