diff options
| author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-06-24 07:06:54 +0530 |
|---|---|---|
| committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-06-27 01:21:52 +0530 |
| commit | 5f170e5819a5b20cd22675f8848b60707f41c387 (patch) | |
| tree | 0a1407d39be345a42ea8e99a4fa5c19c8d382f54 /OpenKeychain/src | |
| parent | 0012db1f6d5e7a80ea22b6f4577d70d13ec6fc96 (diff) | |
| download | open-keychain-5f170e5819a5b20cd22675f8848b60707f41c387.tar.gz open-keychain-5f170e5819a5b20cd22675f8848b60707f41c387.tar.bz2 open-keychain-5f170e5819a5b20cd22675f8848b60707f41c387.zip | |
fixed Certify op
Diffstat (limited to 'OpenKeychain/src')
3 files changed, 4 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainNewService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainNewService.java index ee1431276..5aa72fda2 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainNewService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainNewService.java @@ -75,7 +75,7 @@ public class KeychainNewService extends Service implements Progressable { @Override public int onStartCommand(final Intent intent, int flags, int startId) { - if (intent.getAction().equals(ACTION_CANCEL)) { + if (intent.getAction() != null && intent.getAction().equals(ACTION_CANCEL)) { mActionCanceled.set(true); return START_NOT_STICKY; } @@ -108,7 +108,7 @@ public class KeychainNewService extends Service implements Progressable { } else if (inputParcel instanceof SaveKeyringParcel) { op = new EditKeyOperation(outerThis, new ProviderHelper(outerThis), outerThis, mActionCanceled); - } else if (inputParcel instanceof CertifyAction) { + } else if (inputParcel instanceof CertifyActionsParcel) { op = new CertifyOperation(outerThis, new ProviderHelper(outerThis), outerThis, mActionCanceled); } else if (inputParcel instanceof DeleteKeyringParcel) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CachingCryptoOperationFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CachingCryptoOperationFragment.java index 87c6ee3ca..b451689b1 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CachingCryptoOperationFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CachingCryptoOperationFragment.java @@ -31,11 +31,12 @@ public abstract class CachingCryptoOperationFragment <T extends Parcelable, S ex } @Override - protected void onCryptoOperationResult(S result) { + protected void onCryptoOperationSuccess(S result) { super.onCryptoOperationResult(result); mCachedActionsParcel = null; } + @Override protected abstract T createOperationInput(); protected T getCachedActionsParcel() { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java index 3c837206d..b3828c428 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java @@ -25,7 +25,6 @@ import android.support.v4.app.Fragment; import org.sufficientlysecure.keychain.operations.results.OperationResult; import org.sufficientlysecure.keychain.service.input.CryptoInputParcel; - /** * All fragments executing crypto operations need to extend this class. */ |