cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unnecessary boolean from SignatureResult

Browse Source
This commit is contained in:
Dominik Schürmann
2013-09-13 10:03:26 +02:00
parent 473dd75f4f
commit 86c84ddbb3
3 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenPGP-Keychain-API-Demo/src/org/openintents/openpgp/OpenPgpSignatureResult.java
View File

@@ -20,9 +20,8 @@ import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
public class OpenPgpSignatureResult implements Parcelable { public class OpenPgpSignatureResult implements Parcelable {
String signatureUserId;
boolean signature; String signatureUserId;
boolean signatureSuccess; boolean signatureSuccess;
boolean signatureUnknown; boolean signatureUnknown;
@@ -30,19 +29,15 @@ public class OpenPgpSignatureResult implements Parcelable {
} }
public OpenPgpSignatureResult(String signatureUserId, boolean signature, public OpenPgpSignatureResult(String signatureUserId, boolean signatureSuccess,
boolean signatureSuccess, boolean signatureUnknown) { boolean signatureUnknown) {
this.signatureUserId = signatureUserId; this.signatureUserId = signatureUserId;
this.signature = signature;
this.signatureSuccess = signatureSuccess; this.signatureSuccess = signatureSuccess;
this.signatureUnknown = signatureUnknown; this.signatureUnknown = signatureUnknown;
} }
public OpenPgpSignatureResult(OpenPgpSignatureResult b) { public OpenPgpSignatureResult(OpenPgpSignatureResult b) {
this.signatureUserId = b.signatureUserId; this.signatureUserId = b.signatureUserId;
this.signature = b.signature;
this.signatureSuccess = b.signatureSuccess; this.signatureSuccess = b.signatureSuccess;
this.signatureUnknown = b.signatureUnknown; this.signatureUnknown = b.signatureUnknown;
} }
@@ -54,7 +49,6 @@ public class OpenPgpSignatureResult implements Parcelable {
public void writeToParcel(Parcel dest, int flags) { public void writeToParcel(Parcel dest, int flags) {
dest.writeString(signatureUserId); dest.writeString(signatureUserId);
dest.writeByte((byte) (signature ? 1 : 0));
dest.writeByte((byte) (signatureSuccess ? 1 : 0)); dest.writeByte((byte) (signatureSuccess ? 1 : 0));
dest.writeByte((byte) (signatureUnknown ? 1 : 0)); dest.writeByte((byte) (signatureUnknown ? 1 : 0));
} }
@@ -63,7 +57,6 @@ public class OpenPgpSignatureResult implements Parcelable {
public OpenPgpSignatureResult createFromParcel(final Parcel source) { public OpenPgpSignatureResult createFromParcel(final Parcel source) {
OpenPgpSignatureResult vr = new OpenPgpSignatureResult(); OpenPgpSignatureResult vr = new OpenPgpSignatureResult();
vr.signatureUserId = source.readString(); vr.signatureUserId = source.readString();
vr.signature = source.readByte() == 1;
vr.signatureSuccess = source.readByte() == 1; vr.signatureSuccess = source.readByte() == 1;
vr.signatureUnknown = source.readByte() == 1; vr.signatureUnknown = source.readByte() == 1;
return vr; return vr;
@@ -77,7 +70,7 @@ public class OpenPgpSignatureResult implements Parcelable {
@Override @Override
public String toString() { public String toString() {
String out = new String(); String out = new String();
out += "signature: " + signature; out += "signatureUserId: " + signatureUserId;
out += "\nsignatureSuccess: " + signatureSuccess; out += "\nsignatureSuccess: " + signatureSuccess;
out += "\nsignatureUnknown: " + signatureUnknown; out += "\nsignatureUnknown: " + signatureUnknown;
return out; return out;

15
OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpSignatureResult.java
View File

@@ -20,9 +20,8 @@ import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
public class OpenPgpSignatureResult implements Parcelable { public class OpenPgpSignatureResult implements Parcelable {
String signatureUserId;
boolean signature; String signatureUserId;
boolean signatureSuccess; boolean signatureSuccess;
boolean signatureUnknown; boolean signatureUnknown;
@@ -30,19 +29,15 @@ public class OpenPgpSignatureResult implements Parcelable {
} }
public OpenPgpSignatureResult(String signatureUserId, boolean signature, public OpenPgpSignatureResult(String signatureUserId, boolean signatureSuccess,
boolean signatureSuccess, boolean signatureUnknown) { boolean signatureUnknown) {
this.signatureUserId = signatureUserId; this.signatureUserId = signatureUserId;
this.signature = signature;
this.signatureSuccess = signatureSuccess; this.signatureSuccess = signatureSuccess;
this.signatureUnknown = signatureUnknown; this.signatureUnknown = signatureUnknown;
} }
public OpenPgpSignatureResult(OpenPgpSignatureResult b) { public OpenPgpSignatureResult(OpenPgpSignatureResult b) {
this.signatureUserId = b.signatureUserId; this.signatureUserId = b.signatureUserId;
this.signature = b.signature;
this.signatureSuccess = b.signatureSuccess; this.signatureSuccess = b.signatureSuccess;
this.signatureUnknown = b.signatureUnknown; this.signatureUnknown = b.signatureUnknown;
} }
@@ -54,7 +49,6 @@ public class OpenPgpSignatureResult implements Parcelable {
public void writeToParcel(Parcel dest, int flags) { public void writeToParcel(Parcel dest, int flags) {
dest.writeString(signatureUserId); dest.writeString(signatureUserId);
dest.writeByte((byte) (signature ? 1 : 0));
dest.writeByte((byte) (signatureSuccess ? 1 : 0)); dest.writeByte((byte) (signatureSuccess ? 1 : 0));
dest.writeByte((byte) (signatureUnknown ? 1 : 0)); dest.writeByte((byte) (signatureUnknown ? 1 : 0));
} }
@@ -63,7 +57,6 @@ public class OpenPgpSignatureResult implements Parcelable {
public OpenPgpSignatureResult createFromParcel(final Parcel source) { public OpenPgpSignatureResult createFromParcel(final Parcel source) {
OpenPgpSignatureResult vr = new OpenPgpSignatureResult(); OpenPgpSignatureResult vr = new OpenPgpSignatureResult();
vr.signatureUserId = source.readString(); vr.signatureUserId = source.readString();
vr.signature = source.readByte() == 1;
vr.signatureSuccess = source.readByte() == 1; vr.signatureSuccess = source.readByte() == 1;
vr.signatureUnknown = source.readByte() == 1; vr.signatureUnknown = source.readByte() == 1;
return vr; return vr;
@@ -77,7 +70,7 @@ public class OpenPgpSignatureResult implements Parcelable {
@Override @Override
public String toString() { public String toString() {
String out = new String(); String out = new String();
out += "signature: " + signature; out += "signatureUserId: " + signatureUserId;
out += "\nsignatureSuccess: " + signatureSuccess; out += "\nsignatureSuccess: " + signatureSuccess;
out += "\nsignatureUnknown: " + signatureUnknown; out += "\nsignatureUnknown: " + signatureUnknown;
return out; return out;

4
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/OpenPgpService.java
View File

@@ -472,8 +472,8 @@ public class OpenPgpService extends Service {
OpenPgpSignatureResult sigResult = null; OpenPgpSignatureResult sigResult = null;
if (signature) { if (signature) {
sigResult = new OpenPgpSignatureResult(signatureUserId, signature, sigResult = new OpenPgpSignatureResult(signatureUserId, signatureSuccess,
signatureSuccess, signatureUnknown); signatureUnknown);
} }
// return over handler on client side // return over handler on client side