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

migrated consolidation

Browse Source
This commit is contained in:
Adithya Abraham Philip
2015-06-24 03:51:53 +05:30
parent 6f3be84c43
commit b33004a2f5
6 changed files with 141 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ConsolidateInputParcel.java Normal file
View File

@@ -0,0 +1,39 @@
package org.sufficientlysecure.keychain.service;
import android.os.Parcel;
import android.os.Parcelable;
public class ConsolidateInputParcel implements Parcelable {
public boolean mConsolidateRecovery;
public ConsolidateInputParcel(boolean consolidateRecovery) {
mConsolidateRecovery = consolidateRecovery;
}
protected ConsolidateInputParcel(Parcel in) {
mConsolidateRecovery = in.readByte() != 0x00;
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeByte((byte) (mConsolidateRecovery ? 0x01 : 0x00));
}
public static final Parcelable.Creator<ConsolidateInputParcel> CREATOR = new Parcelable.Creator<ConsolidateInputParcel>() {
@Override
public ConsolidateInputParcel createFromParcel(Parcel in) {
return new ConsolidateInputParcel(in);
}
@Override
public ConsolidateInputParcel[] newArray(int size) {
return new ConsolidateInputParcel[size];
}
};
}

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

@@ -113,6 +113,9 @@ public class KeychainNewService extends Service implements Progressable {
|| inputParcel instanceof ExportKeyringParcel){
op = new ImportExportOperation(outerThis, new ProviderHelper(outerThis),
outerThis, mActionCanceled);
} else if (inputParcel instanceof ConsolidateInputParcel) {
op = new ConsolidateOperation(outerThis, new ProviderHelper(outerThis),
outerThis);
} else {
return;
}

20
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java
View File

@@ -37,10 +37,7 @@ import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.keyimport.HkpKeyserver;
import org.sufficientlysecure.keychain.keyimport.Keyserver;
import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing;
import org.sufficientlysecure.keychain.operations.DeleteOperation;
import org.sufficientlysecure.keychain.operations.EditKeyOperation;
import org.sufficientlysecure.keychain.operations.ImportExportOperation;
import org.sufficientlysecure.keychain.operations.PromoteKeyOperation;
import org.sufficientlysecure.keychain.operations.*;
import org.sufficientlysecure.keychain.operations.results.ConsolidateResult;
import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult;
import org.sufficientlysecure.keychain.operations.results.DeleteResult;
@@ -157,21 +154,6 @@ public class KeychainService extends Service implements Progressable {
// executeServiceMethod action from extra bundle
switch (action) {
case ACTION_CONSOLIDATE: {
// Operation
ConsolidateResult result;
if (data.containsKey(CONSOLIDATE_RECOVERY) && data.getBoolean(CONSOLIDATE_RECOVERY)) {
result = providerHelper.consolidateDatabaseStep2(KeychainService.this);
} else {
result = providerHelper.consolidateDatabaseStep1(KeychainService.this);
}
// Result
sendMessageToHandler(MessageStatus.OKAY, result);
break;
}
case ACTION_VERIFY_KEYBASE_PROOF: {
try {