cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

limit GeneralActivity to non-Uri Intents or file:// Uri Intents, now handling key imports as well

Browse Source
This commit is contained in:
Thialfihar
2010-06-06 19:46:49 +00:00
parent edd755bd0e
commit 6d2a1edd17
4 changed files with 68 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/org/thialfihar/android/apg/GeneralActivity.java
View File

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