fixed Certify op
This commit is contained in:
@@ -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) {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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.
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user