diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-31 17:32:13 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-31 17:32:13 +0200 |
commit | 7da783228499ea9d5b0a98201e8ba5b17e30bb10 (patch) | |
tree | 610e3d5ef33d717eaa56d091ebe7d92c5b237bbb /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java | |
parent | 38c6cf045c6e451b3a150bf9b659056c2252d27c (diff) | |
download | open-keychain-7da783228499ea9d5b0a98201e8ba5b17e30bb10.tar.gz open-keychain-7da783228499ea9d5b0a98201e8ba5b17e30bb10.tar.bz2 open-keychain-7da783228499ea9d5b0a98201e8ba5b17e30bb10.zip |
Add cancelable mechanism and support in key import
Closes #323
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java index fe699224b..151c1761e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java @@ -55,13 +55,17 @@ public class OperationResultParcel implements Parcelable { public static final String EXTRA_RESULT = "operation_result"; - /** Holds the overall result, the number specifying varying degrees of success. The first bit - * is 0 on overall success, 1 on overall failure. All other bits may be used for more specific - * conditions. */ + /** Holds the overall result, the number specifying varying degrees of success: + * - The first bit is 0 on overall success, 1 on overall failure + * - The second bit indicates if the action was cancelled - may still be an error or success! + * - The third bit should be set if the operation succeeded with warnings + * All other bits may be used for more specific conditions. */ final int mResult; public static final int RESULT_OK = 0; public static final int RESULT_ERROR = 1; + public static final int RESULT_CANCELLED = 2; + public static final int RESULT_WARNINGS = 4; /// A list of log entries tied to the operation result. final OperationLog mLog; |