From 86c84ddbb34c44f127a0f1d4a6031d02e1b76779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 13 Sep 2013 10:03:26 +0200
Subject: remove unnecessary boolean from SignatureResult

---
 .../org/openintents/openpgp/OpenPgpSignatureResult.java   | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'OpenPGP-Keychain/src/org/openintents/openpgp')

diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpSignatureResult.java b/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpSignatureResult.java
index d8642664f..d0712df1c 100644
--- a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpSignatureResult.java
+++ b/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpSignatureResult.java
@@ -20,9 +20,8 @@ import android.os.Parcel;
 import android.os.Parcelable;
 
 public class OpenPgpSignatureResult implements Parcelable {
-    String signatureUserId;
 
-    boolean signature;
+    String signatureUserId;
     boolean signatureSuccess;
     boolean signatureUnknown;
 
@@ -30,19 +29,15 @@ public class OpenPgpSignatureResult implements Parcelable {
 
     }
 
-    public OpenPgpSignatureResult(String signatureUserId, boolean signature,
-            boolean signatureSuccess, boolean signatureUnknown) {
+    public OpenPgpSignatureResult(String signatureUserId, boolean signatureSuccess,
+            boolean signatureUnknown) {
         this.signatureUserId = signatureUserId;
-
-        this.signature = signature;
         this.signatureSuccess = signatureSuccess;
         this.signatureUnknown = signatureUnknown;
     }
 
     public OpenPgpSignatureResult(OpenPgpSignatureResult b) {
         this.signatureUserId = b.signatureUserId;
-
-        this.signature = b.signature;
         this.signatureSuccess = b.signatureSuccess;
         this.signatureUnknown = b.signatureUnknown;
     }
@@ -54,7 +49,6 @@ public class OpenPgpSignatureResult implements Parcelable {
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(signatureUserId);
 
-        dest.writeByte((byte) (signature ? 1 : 0));
         dest.writeByte((byte) (signatureSuccess ? 1 : 0));
         dest.writeByte((byte) (signatureUnknown ? 1 : 0));
     }
@@ -63,7 +57,6 @@ public class OpenPgpSignatureResult implements Parcelable {
         public OpenPgpSignatureResult createFromParcel(final Parcel source) {
             OpenPgpSignatureResult vr = new OpenPgpSignatureResult();
             vr.signatureUserId = source.readString();
-            vr.signature = source.readByte() == 1;
             vr.signatureSuccess = source.readByte() == 1;
             vr.signatureUnknown = source.readByte() == 1;
             return vr;
@@ -77,7 +70,7 @@ public class OpenPgpSignatureResult implements Parcelable {
     @Override
     public String toString() {
         String out = new String();
-        out += "signature: " + signature;
+        out += "signatureUserId: " + signatureUserId;
         out += "\nsignatureSuccess: " + signatureSuccess;
         out += "\nsignatureUnknown: " + signatureUnknown;
         return out;
-- 
cgit v1.2.3