diff options
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations')
2 files changed, 14 insertions, 13 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/GetKeyResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/GetKeyResult.java index bdc4d9a47..76ffaff4a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/GetKeyResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/GetKeyResult.java @@ -44,12 +44,13 @@ public class GetKeyResult extends InputPendingResult { super(log, requiredInput, cryptoInputParcel); } - 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; - public static final int RESULT_ERROR_TOO_MANY_RESPONSES = RESULT_ERROR + 64; - public static final int RESULT_ERROR_TOO_SHORT_OR_TOO_MANY_RESPONSES = RESULT_ERROR + 128; - public static final int RESULT_ERROR_QUERY_FAILED = RESULT_ERROR + 256; + public static final int RESULT_ERROR_NO_VALID_KEYS = RESULT_ERROR + (1<<4); + public static final int RESULT_ERROR_NO_PGP_PARTS = RESULT_ERROR + (2<<4); + public static final int RESULT_ERROR_QUERY_TOO_SHORT = RESULT_ERROR + (3<<4); + public static final int RESULT_ERROR_TOO_MANY_RESPONSES = RESULT_ERROR + (4<<4); + public static final int RESULT_ERROR_TOO_SHORT_OR_TOO_MANY_RESPONSES = RESULT_ERROR + (5<<4); + public static final int RESULT_ERROR_QUERY_FAILED = RESULT_ERROR + (6<<4); + public static final int RESULT_ERROR_FILE_NOT_FOUND = RESULT_ERROR + (7<<4); public GetKeyResult(Parcel source) { super(source); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java index 1e90c2cc3..f9c2db8e8 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java @@ -810,13 +810,13 @@ public abstract class OperationResult implements Parcelable { MSG_NO_VALID_ENC (LogLevel.ERROR, R.string.error_invalid_data), // get key - MSG_GET_SUCCESS(LogLevel.OK, R.string.msg_download_success), - MSG_GET_NO_VALID_KEYS(LogLevel.ERROR, R.string.msg_download_no_valid_keys), - MSG_GET_NO_PGP_PARTS(LogLevel.ERROR, R.string.msg_download_no_pgp_parts), - MSG_GET_QUERY_TOO_SHORT(LogLevel.ERROR, R.string.msg_download_query_too_short), - MSG_GET_TOO_MANY_RESPONSES(LogLevel.ERROR, R.string.msg_download_too_many_responses), - MSG_GET_QUERY_TOO_SHORT_OR_TOO_MANY_RESPONSES(LogLevel.ERROR, R.string.msg_download_query_too_short_or_too_many_responses), - MSG_GET_QUERY_FAILED(LogLevel.ERROR, R.string.msg_download_query_failed), + MSG_GET_SUCCESS (LogLevel.OK, R.string.msg_get_success), + MSG_GET_NO_VALID_KEYS (LogLevel.ERROR, R.string.msg_get_no_valid_keys), + MSG_GET_QUERY_TOO_SHORT (LogLevel.ERROR, R.string.msg_get_query_too_short), + MSG_GET_TOO_MANY_RESPONSES (LogLevel.ERROR, R.string.msg_get_too_many_responses), + MSG_GET_QUERY_TOO_SHORT_OR_TOO_MANY_RESPONSES (LogLevel.ERROR, R.string.msg_get_query_too_short_or_too_many_responses), + MSG_GET_QUERY_FAILED (LogLevel.ERROR, R.string.msg_download_query_failed), + MSG_GET_FILE_NOT_FOUND (LogLevel.ERROR, R.string.msg_get_file_not_found), MSG_DEL_ERROR_EMPTY (LogLevel.ERROR, R.string.msg_del_error_empty), MSG_DEL_ERROR_MULTI_SECRET (LogLevel.ERROR, R.string.msg_del_error_multi_secret), |