aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-06-12 01:52:41 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-06-12 12:36:58 +0200
commitdea98a4a7e3143acfc01ce1567a9d17c25025b4d (patch)
treecc9eb2df29d71a3449d784acf07b0e7f6b59299c /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
parent47368f1d24cb3b4112133a6dddd2793e6787dfdd (diff)
downloadopen-keychain-dea98a4a7e3143acfc01ce1567a9d17c25025b4d.tar.gz
open-keychain-dea98a4a7e3143acfc01ce1567a9d17c25025b4d.tar.bz2
open-keychain-dea98a4a7e3143acfc01ce1567a9d17c25025b4d.zip
import-log: properly distinguish return states
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java4
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java6
2 files changed, 5 insertions, 5 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 473cf8244..67ff8318b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
@@ -44,8 +44,8 @@ public class OperationResultParcel implements Parcelable {
return mResult;
}
- public boolean isSuccessful() {
- return (mResult & 1) == 1;
+ public boolean success() {
+ return (mResult & 1) == 0;
}
public OperationLog getLog() {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java
index 342d07953..6c44b01f1 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java
@@ -25,13 +25,13 @@ public abstract class OperationResults {
== (RESULT_OK_NEWKEYS | RESULT_OK_UPDATED);
}
public boolean isOkNew() {
- return (mResult & RESULT_OK_NEWKEYS) > 0;
+ return (mResult & RESULT_OK_NEWKEYS) == RESULT_OK_NEWKEYS;
}
public boolean isOkUpdated() {
- return (mResult & RESULT_OK_UPDATED) > 0;
+ return (mResult & RESULT_OK_UPDATED) == RESULT_OK_UPDATED;
}
public boolean isFailNothing() {
- return (mResult & RESULT_FAIL_NOTHING) > 0;
+ return (mResult & RESULT_FAIL_NOTHING) == RESULT_FAIL_NOTHING;
}
public ImportResult(Parcel source) {