diff options
author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-10 00:26:48 +0530 |
---|---|---|
committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-13 23:34:06 +0530 |
commit | d1409fd5c89bc10dd0c39a228049e4c2f669c65a (patch) | |
tree | 9f9d16b3a1b3149f7efd9e73a75cd656219fd2c8 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java | |
parent | fcd27d2600711ccd32c000c6d58da19cb816a9bf (diff) | |
download | open-keychain-d1409fd5c89bc10dd0c39a228049e4c2f669c65a.tar.gz open-keychain-d1409fd5c89bc10dd0c39a228049e4c2f669c65a.tar.bz2 open-keychain-d1409fd5c89bc10dd0c39a228049e4c2f669c65a.zip |
use only one DeleteDialogActivity
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java index c03c301a7..4cb3d5841 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java @@ -40,7 +40,6 @@ import org.sufficientlysecure.keychain.service.input.RequiredInputParcel; import org.sufficientlysecure.keychain.ui.NfcOperationActivity; import org.sufficientlysecure.keychain.ui.OrbotRequiredDialogActivity; import org.sufficientlysecure.keychain.ui.PassphraseDialogActivity; -import org.sufficientlysecure.keychain.ui.RevokeDeleteDialogActivity; import org.sufficientlysecure.keychain.ui.dialog.ProgressDialogFragment; import org.sufficientlysecure.keychain.util.Log; @@ -152,13 +151,11 @@ public class CryptoOperationHelper<T extends Parcelable, S extends OperationResu } protected void startActivityForResult(Intent intent, int requestCode) { - mRequestedCode = requestCode; if (mUseFragment) { - mFragment.startActivityForResult(intent, mRequestedCode); + mFragment.startActivityForResult(intent, mId + requestCode); } else { - mActivity.startActivityForResult(intent, mRequestedCode); + mActivity.startActivityForResult(intent, mId + requestCode); } - Log.e("PHILIP", "mRequestedCode: " + mRequestedCode); } /** @@ -167,13 +164,13 @@ public class CryptoOperationHelper<T extends Parcelable, S extends OperationResu * @return true if requestCode was recognized, false otherwise */ public boolean handleActivityResult(int requestCode, int resultCode, Intent data) { - Log.d(Constants.TAG, "received activity result in OperationHelper with code: " - + requestCode + " while waiting for: " + mRequestedCode); + Log.d(Constants.TAG, "received activity result in OperationHelper"); if ((requestCode & mId) != mId) { // this wasn't meant for us to handle return false; } + Log.d(Constants.TAG, "handling activity result in OperationHelper"); // filter out mId from requestCode requestCode ^= mId; |