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

Merge pull request #1424 from open-keychain/import-proxy

Browse Source 
Shifted proxy logic to ImportKeysListCloudLoader
This commit is contained in:
Dominik Schürmann
2015-07-08 11:41:46 +02:00
parent 9eee9acba2 be6b7ff899
commit 7b35f9b07a
9 changed files with 126 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/GetKeyResult.java
View File

@@ -20,7 +20,9 @@ package org.sufficientlysecure.keychain.operations.results;
import android.os.Parcel;
public class GetKeyResult extends OperationResult {
import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
public class GetKeyResult extends InputPendingResult {
public int mNonPgpPartsCount;
@@ -36,6 +38,10 @@ public class GetKeyResult extends OperationResult {
super(result, log);
}
public GetKeyResult(OperationLog log, RequiredInputParcel requiredInput) {
super(log, requiredInput);
}
public static final int RESULT_ERROR_NO_VALID_KEYS = RESULT_ERROR + 8;
public static final int RESULT_ERROR_NO_PGP_PARTS = RESULT_ERROR + 16;
public static final int RESULT_ERROR_QUERY_TOO_SHORT = RESULT_ERROR + 32;