mirror of
https://github.com/moparisthebest/Conversations
synced 2024-11-28 19:52:15 -05:00
Add userIds to OpenPgpSignatureResult
This commit is contained in:
parent
eda2470c4d
commit
575b9d2279
@ -21,6 +21,7 @@ import android.os.Parcelable;
|
|||||||
|
|
||||||
import org.openintents.openpgp.util.OpenPgpUtils;
|
import org.openintents.openpgp.util.OpenPgpUtils;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -33,7 +34,7 @@ public class OpenPgpSignatureResult implements Parcelable {
|
|||||||
* old versions of the protocol (and thus old versions of this class), we need a versioning
|
* old versions of the protocol (and thus old versions of this class), we need a versioning
|
||||||
* system for the parcels sent between the clients and the providers.
|
* system for the parcels sent between the clients and the providers.
|
||||||
*/
|
*/
|
||||||
public static final int PARCELABLE_VERSION = 1;
|
public static final int PARCELABLE_VERSION = 2;
|
||||||
|
|
||||||
// generic error on signature verification
|
// generic error on signature verification
|
||||||
public static final int SIGNATURE_ERROR = 0;
|
public static final int SIGNATURE_ERROR = 0;
|
||||||
@ -50,7 +51,8 @@ public class OpenPgpSignatureResult implements Parcelable {
|
|||||||
|
|
||||||
int status;
|
int status;
|
||||||
boolean signatureOnly;
|
boolean signatureOnly;
|
||||||
String userId;
|
String primaryUserId;
|
||||||
|
ArrayList<String> userIds;
|
||||||
long keyId;
|
long keyId;
|
||||||
|
|
||||||
public int getStatus() {
|
public int getStatus() {
|
||||||
@ -69,12 +71,20 @@ public class OpenPgpSignatureResult implements Parcelable {
|
|||||||
this.signatureOnly = signatureOnly;
|
this.signatureOnly = signatureOnly;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getUserId() {
|
public String getPrimaryUserId() {
|
||||||
return userId;
|
return primaryUserId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setUserId(String userId) {
|
public void setPrimaryUserId(String primaryUserId) {
|
||||||
this.userId = userId;
|
this.primaryUserId = primaryUserId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ArrayList<String> getUserIds() {
|
||||||
|
return userIds;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setUserIds(ArrayList<String> userIds) {
|
||||||
|
this.userIds = userIds;
|
||||||
}
|
}
|
||||||
|
|
||||||
public long getKeyId() {
|
public long getKeyId() {
|
||||||
@ -90,18 +100,20 @@ public class OpenPgpSignatureResult implements Parcelable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public OpenPgpSignatureResult(int signatureStatus, String signatureUserId,
|
public OpenPgpSignatureResult(int signatureStatus, String signatureUserId,
|
||||||
boolean signatureOnly, long keyId) {
|
boolean signatureOnly, long keyId, ArrayList<String> userIds) {
|
||||||
this.status = signatureStatus;
|
this.status = signatureStatus;
|
||||||
this.signatureOnly = signatureOnly;
|
this.signatureOnly = signatureOnly;
|
||||||
this.userId = signatureUserId;
|
this.primaryUserId = signatureUserId;
|
||||||
this.keyId = keyId;
|
this.keyId = keyId;
|
||||||
|
this.userIds = userIds;
|
||||||
}
|
}
|
||||||
|
|
||||||
public OpenPgpSignatureResult(OpenPgpSignatureResult b) {
|
public OpenPgpSignatureResult(OpenPgpSignatureResult b) {
|
||||||
this.status = b.status;
|
this.status = b.status;
|
||||||
this.userId = b.userId;
|
this.primaryUserId = b.primaryUserId;
|
||||||
this.signatureOnly = b.signatureOnly;
|
this.signatureOnly = b.signatureOnly;
|
||||||
this.keyId = b.keyId;
|
this.keyId = b.keyId;
|
||||||
|
this.userIds = b.userIds;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int describeContents() {
|
public int describeContents() {
|
||||||
@ -122,8 +134,10 @@ public class OpenPgpSignatureResult implements Parcelable {
|
|||||||
// version 1
|
// version 1
|
||||||
dest.writeInt(status);
|
dest.writeInt(status);
|
||||||
dest.writeByte((byte) (signatureOnly ? 1 : 0));
|
dest.writeByte((byte) (signatureOnly ? 1 : 0));
|
||||||
dest.writeString(userId);
|
dest.writeString(primaryUserId);
|
||||||
dest.writeLong(keyId);
|
dest.writeLong(keyId);
|
||||||
|
// version 2
|
||||||
|
dest.writeList(userIds);
|
||||||
// Go back and write the size
|
// Go back and write the size
|
||||||
int parcelableSize = dest.dataPosition() - startPosition;
|
int parcelableSize = dest.dataPosition() - startPosition;
|
||||||
dest.setDataPosition(sizePosition);
|
dest.setDataPosition(sizePosition);
|
||||||
@ -140,8 +154,9 @@ public class OpenPgpSignatureResult implements Parcelable {
|
|||||||
OpenPgpSignatureResult vr = new OpenPgpSignatureResult();
|
OpenPgpSignatureResult vr = new OpenPgpSignatureResult();
|
||||||
vr.status = source.readInt();
|
vr.status = source.readInt();
|
||||||
vr.signatureOnly = source.readByte() == 1;
|
vr.signatureOnly = source.readByte() == 1;
|
||||||
vr.userId = source.readString();
|
vr.primaryUserId = source.readString();
|
||||||
vr.keyId = source.readLong();
|
vr.keyId = source.readLong();
|
||||||
|
source.readStringList(vr.userIds);
|
||||||
|
|
||||||
// skip over all fields added in future versions of this parcel
|
// skip over all fields added in future versions of this parcel
|
||||||
source.setDataPosition(startPosition + parcelableSize);
|
source.setDataPosition(startPosition + parcelableSize);
|
||||||
@ -156,9 +171,9 @@ public class OpenPgpSignatureResult implements Parcelable {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
String out = new String();
|
String out = "\nstatus: " + status;
|
||||||
out += "\nstatus: " + status;
|
out += "\nprimaryUserId: " + primaryUserId;
|
||||||
out += "\nuserId: " + userId;
|
out += "\nuserIds: " + userIds;
|
||||||
out += "\nsignatureOnly: " + signatureOnly;
|
out += "\nsignatureOnly: " + signatureOnly;
|
||||||
out += "\nkeyId: " + OpenPgpUtils.convertKeyIdToHex(keyId);
|
out += "\nkeyId: " + OpenPgpUtils.convertKeyIdToHex(keyId);
|
||||||
return out;
|
return out;
|
||||||
|
Loading…
Reference in New Issue
Block a user