From e6801ec9513381ff81eb2584f020a717920e1934 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sun, 15 Sep 2013 15:26:41 +0200 Subject: [PATCH] add untrusted signature status --- .../src/org/openintents/openpgp/OpenPgpSignatureResult.java | 3 ++- .../src/org/openintents/openpgp/OpenPgpSignatureResult.java | 3 ++- .../keychain/service/remote/OpenPgpService.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/OpenPGP-Keychain-API-Demo/src/org/openintents/openpgp/OpenPgpSignatureResult.java b/OpenPGP-Keychain-API-Demo/src/org/openintents/openpgp/OpenPgpSignatureResult.java index a84d026bf..0d24e7bd4 100644 --- a/OpenPGP-Keychain-API-Demo/src/org/openintents/openpgp/OpenPgpSignatureResult.java +++ b/OpenPGP-Keychain-API-Demo/src/org/openintents/openpgp/OpenPgpSignatureResult.java @@ -21,8 +21,9 @@ import android.os.Parcelable; public class OpenPgpSignatureResult implements Parcelable { public static final int SIGNATURE_ERROR = 0; - public static final int SIGNATURE_SUCCESS = 1; + public static final int SIGNATURE_SUCCESS_TRUSTED = 1; public static final int SIGNATURE_UNKNOWN = 2; + public static final int SIGNATURE_SUCCESS_UNTRUSTED = 3; int signatureStatus; String signatureUserId; diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpSignatureResult.java b/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpSignatureResult.java index a84d026bf..0d24e7bd4 100644 --- a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpSignatureResult.java +++ b/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpSignatureResult.java @@ -21,8 +21,9 @@ import android.os.Parcelable; public class OpenPgpSignatureResult implements Parcelable { public static final int SIGNATURE_ERROR = 0; - public static final int SIGNATURE_SUCCESS = 1; + public static final int SIGNATURE_SUCCESS_TRUSTED = 1; public static final int SIGNATURE_UNKNOWN = 2; + public static final int SIGNATURE_SUCCESS_UNTRUSTED = 3; int signatureStatus; String signatureUserId; diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java index 3a8c6059e..862ac3536 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java @@ -433,7 +433,7 @@ public class OpenPgpService extends RemoteService { int signatureStatus = OpenPgpSignatureResult.SIGNATURE_ERROR; if (signatureSuccess) { - signatureStatus = OpenPgpSignatureResult.SIGNATURE_SUCCESS; + signatureStatus = OpenPgpSignatureResult.SIGNATURE_SUCCESS_TRUSTED; } else if (signatureUnknown) { signatureStatus = OpenPgpSignatureResult.SIGNATURE_UNKNOWN; }