diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-31 17:32:13 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-31 17:32:13 +0200 |
commit | 7da783228499ea9d5b0a98201e8ba5b17e30bb10 (patch) | |
tree | 610e3d5ef33d717eaa56d091ebe7d92c5b237bbb /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java | |
parent | 38c6cf045c6e451b3a150bf9b659056c2252d27c (diff) | |
download | open-keychain-7da783228499ea9d5b0a98201e8ba5b17e30bb10.tar.gz open-keychain-7da783228499ea9d5b0a98201e8ba5b17e30bb10.tar.bz2 open-keychain-7da783228499ea9d5b0a98201e8ba5b17e30bb10.zip |
Add cancelable mechanism and support in key import
Closes #323
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 | 5 |
1 files changed, 4 insertions, 1 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 96fa11363..7ad7d1007 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java @@ -19,6 +19,8 @@ package org.sufficientlysecure.keychain.ui; import android.annotation.TargetApi; import android.app.ProgressDialog; +import android.content.DialogInterface; +import android.content.DialogInterface.OnCancelListener; import android.content.Intent; import android.net.Uri; import android.nfc.NdefMessage; @@ -447,7 +449,8 @@ public class ImportKeysActivity extends ActionBarActivity { KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler( this, getString(R.string.progress_importing), - ProgressDialog.STYLE_HORIZONTAL) { + ProgressDialog.STYLE_HORIZONTAL, + true) { public void handleMessage(Message message) { // handle messages by standard KeychainIntentServiceHandler first super.handleMessage(message); |