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

fixed Certify op

Browse Source
This commit is contained in:
Adithya Abraham Philip
2015-06-24 07:06:54 +05:30
parent 0012db1f6d
commit 5f170e5819
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainNewService.java
View File

@@ -75,7 +75,7 @@ public class KeychainNewService extends Service implements Progressable {
@Override @Override
public int onStartCommand(final Intent intent, int flags, int startId) { 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); mActionCanceled.set(true);
return START_NOT_STICKY; return START_NOT_STICKY;
} }
@@ -108,7 +108,7 @@ public class KeychainNewService extends Service implements Progressable {
} else if (inputParcel instanceof SaveKeyringParcel) { } else if (inputParcel instanceof SaveKeyringParcel) {
op = new EditKeyOperation(outerThis, new ProviderHelper(outerThis), outerThis, op = new EditKeyOperation(outerThis, new ProviderHelper(outerThis), outerThis,
mActionCanceled); mActionCanceled);
} else if (inputParcel instanceof CertifyAction) { } else if (inputParcel instanceof CertifyActionsParcel) {
op = new CertifyOperation(outerThis, new ProviderHelper(outerThis), outerThis, op = new CertifyOperation(outerThis, new ProviderHelper(outerThis), outerThis,
mActionCanceled); mActionCanceled);
} else if (inputParcel instanceof DeleteKeyringParcel) { } else if (inputParcel instanceof DeleteKeyringParcel) {

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CachingCryptoOperationFragment.java
View File

@@ -31,11 +31,12 @@ public abstract class CachingCryptoOperationFragment <T extends Parcelable, S ex
} }
@Override @Override
protected void onCryptoOperationResult(S result) { protected void onCryptoOperationSuccess(S result) {
super.onCryptoOperationResult(result); super.onCryptoOperationResult(result);
mCachedActionsParcel = null; mCachedActionsParcel = null;
} }
@Override
protected abstract T createOperationInput(); protected abstract T createOperationInput();
protected T getCachedActionsParcel() { protected T getCachedActionsParcel() {

1
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java
View File

@@ -25,7 +25,6 @@ import android.support.v4.app.Fragment;
import org.sufficientlysecure.keychain.operations.results.OperationResult; import org.sufficientlysecure.keychain.operations.results.OperationResult;
import org.sufficientlysecure.keychain.service.input.CryptoInputParcel; import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
/** /**
* All fragments executing crypto operations need to extend this class. * All fragments executing crypto operations need to extend this class.
*/ */