moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-24 07:58:50 -05:00
Code Issues Releases Wiki Activity

minor Intent/Extra key renamings

Browse Source
This commit is contained in:
Thialfihar 2010-08-12 17:00:52 +00:00
parent 04b1d08d58
commit 0f226e40cb
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/org/thialfihar/android/apg/Apg.java
View File

@ -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 =

6
src/org/thialfihar/android/apg/BaseActivity.java
View File

@ -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;