diff options
| author | Thialfihar <thialfihar@gmail.com> | 2010-08-12 17:00:52 +0000 |
|---|---|---|
| committer | Thialfihar <thialfihar@gmail.com> | 2010-08-12 17:00:52 +0000 |
| commit | 0f226e40cb72e50224fd4ce1ba612733abcfd8cb (patch) | |
| tree | 75658c6362348211c3c11b97a47795a754004194 | |
| parent | 04b1d08d58591d80ea73d7f3a12bac600a237560 (diff) | |
| download | open-keychain-0f226e40cb72e50224fd4ce1ba612733abcfd8cb.tar.gz open-keychain-0f226e40cb72e50224fd4ce1ba612733abcfd8cb.tar.bz2 open-keychain-0f226e40cb72e50224fd4ce1ba612733abcfd8cb.zip | |
minor Intent/Extra key renamings
| -rw-r--r-- | src/org/thialfihar/android/apg/Apg.java | 9 | ||||
| -rw-r--r-- | src/org/thialfihar/android/apg/BaseActivity.java | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/org/thialfihar/android/apg/Apg.java b/src/org/thialfihar/android/apg/Apg.java index fb6d50afd..b9c3ba935 100644 --- a/src/org/thialfihar/android/apg/Apg.java +++ b/src/org/thialfihar/android/apg/Apg.java @@ -117,7 +117,6 @@ public class Apg { public static final String EXTRA_TEXT = "text"; public static final String EXTRA_DATA = "data"; - public static final String EXTRA_STATUS = "status"; public static final String EXTRA_ERROR = "error"; public static final String EXTRA_DECRYPTED_MESSAGE = "decryptedMessage"; public static final String EXTRA_DECRYPTED_DATA = "decryptedData"; @@ -138,12 +137,14 @@ public class Apg { public static final String EXTRA_ENCRYPTION_KEY_IDS = "encryptionKeyIds"; public static final String EXTRA_SELECTION = "selection"; public static final String EXTRA_MESSAGE = "message"; - public static final String EXTRA_PROGRESS = "progress"; - public static final String EXTRA_MAX = "max"; - public static final String EXTRA_ACCOUNT = "account"; public static final String EXTRA_ASCII_ARMOUR = "asciiArmour"; public static final String EXTRA_BINARY = "binary"; + public static final String EXTRA_PROGRESS = "progress"; + public static final String EXTRA_PROGRESS_MAX = "max"; + public static final String EXTRA_ACCOUNT = "account"; + public static final String EXTRA_STATUS = "status"; + public static final String AUTHORITY = DataProvider.AUTHORITY; public static final Uri CONTENT_URI_SECRET_KEY_RINGS = diff --git a/src/org/thialfihar/android/apg/BaseActivity.java b/src/org/thialfihar/android/apg/BaseActivity.java index bea8f1caf..9c40efb4f 100644 --- a/src/org/thialfihar/android/apg/BaseActivity.java +++ b/src/org/thialfihar/android/apg/BaseActivity.java @@ -318,7 +318,7 @@ public class BaseActivity extends Activity Bundle data = new Bundle(); data.putInt(Apg.EXTRA_STATUS, Id.message.progress_update); data.putInt(Apg.EXTRA_PROGRESS, progress); - data.putInt(Apg.EXTRA_MAX, max); + data.putInt(Apg.EXTRA_PROGRESS_MAX, max); msg.setData(data); mHandler.sendMessage(msg); } @@ -329,7 +329,7 @@ public class BaseActivity extends Activity data.putInt(Apg.EXTRA_STATUS, Id.message.progress_update); data.putString(Apg.EXTRA_MESSAGE, message); data.putInt(Apg.EXTRA_PROGRESS, progress); - data.putInt(Apg.EXTRA_MAX, max); + data.putInt(Apg.EXTRA_PROGRESS_MAX, max); msg.setData(data); mHandler.sendMessage(msg); } @@ -348,7 +348,7 @@ public class BaseActivity extends Activity if (message != null) { mProgressDialog.setMessage(message); } - mProgressDialog.setMax(data.getInt(Apg.EXTRA_MAX)); + mProgressDialog.setMax(data.getInt(Apg.EXTRA_PROGRESS_MAX)); mProgressDialog.setProgress(data.getInt(Apg.EXTRA_PROGRESS)); } break; |