diff options
| author | Thialfihar <thialfihar@gmail.com> | 2010-06-06 19:46:49 +0000 |
|---|---|---|
| committer | Thialfihar <thialfihar@gmail.com> | 2010-06-06 19:46:49 +0000 |
| commit | 6d2a1edd1783294cf030cc8bdd115fbf0120b0c8 (patch) | |
| tree | 8684c1cdad72a40122f3664ff234f31c2dab3b73 /src/org/thialfihar/android/apg/GeneralActivity.java | |
| parent | edd755bd0e5931a7f609ee477cb0eabe7b00ce8d (diff) | |
| download | open-keychain-6d2a1edd1783294cf030cc8bdd115fbf0120b0c8.tar.gz open-keychain-6d2a1edd1783294cf030cc8bdd115fbf0120b0c8.tar.bz2 open-keychain-6d2a1edd1783294cf030cc8bdd115fbf0120b0c8.zip | |
limit GeneralActivity to non-Uri Intents or file:// Uri Intents, now handling key imports as well
Diffstat (limited to 'src/org/thialfihar/android/apg/GeneralActivity.java')
| -rw-r--r-- | src/org/thialfihar/android/apg/GeneralActivity.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/org/thialfihar/android/apg/GeneralActivity.java b/src/org/thialfihar/android/apg/GeneralActivity.java index a66a7c1b4..686d6fd39 100644 --- a/src/org/thialfihar/android/apg/GeneralActivity.java +++ b/src/org/thialfihar/android/apg/GeneralActivity.java @@ -144,10 +144,24 @@ public class GeneralActivity extends BaseActivity { }
case Id.choice.action.import_public: {
+ intent.setClass(this, PublicKeyListActivity.class);
+ intent.setAction(Apg.Intent.IMPORT);
+ if (mDataString != null) {
+ intent.putExtra(Apg.EXTRA_TEXT, mDataString);
+ } else if (mDataUri != null) {
+ intent.setDataAndType(mDataUri, mIntent.getType());
+ }
break;
}
case Id.choice.action.import_secret: {
+ intent.setClass(this, SecretKeyListActivity.class);
+ intent.setAction(Apg.Intent.IMPORT);
+ if (mDataString != null) {
+ intent.putExtra(Apg.EXTRA_TEXT, mDataString);
+ } else if (mDataUri != null) {
+ intent.setDataAndType(mDataUri, mIntent.getType());
+ }
break;
}
|