diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-07-08 02:29:04 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-07-08 02:29:04 +0200 |
commit | 3af97bf0e6a711679343a86823b6639917787218 (patch) | |
tree | 605849f3bf7f97fbcf3b5330f7b896ff6d028893 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java | |
parent | 510999c3a2de2475f7828e283d4f01e46a4fe9f7 (diff) | |
download | open-keychain-3af97bf0e6a711679343a86823b6639917787218.tar.gz open-keychain-3af97bf0e6a711679343a86823b6639917787218.tar.bz2 open-keychain-3af97bf0e6a711679343a86823b6639917787218.zip |
some cleanup and fix for back button in ImportKeysActivity (fixes #1372)
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java index 2e8e6f6bd..076d6aed3 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java @@ -17,6 +17,7 @@ package org.sufficientlysecure.keychain.ui; +import android.app.Activity; import android.content.Intent; import android.net.Uri; import android.os.Bundle; @@ -95,6 +96,8 @@ public class ImportKeysActivity extends BaseNfcActivity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setFullScreenDialogClose(Activity.RESULT_CANCELED, true); + mProxyPrefs = Preferences.getPreferences(this).getProxyPrefs(); mImportButton = findViewById(R.id.import_import); |