added Facebook links support, reworked Preferences

1 files changed, 22 insertions, 5 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ParcelableKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ParcelableKeyRing.java
index 6f6c816ea..a94ce0dce 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ParcelableKeyRing.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ParcelableKeyRing.java
@@ -32,24 +32,39 @@ public class ParcelableKeyRing implements Parcelable {
     public final String mExpectedFingerprint;
     public final String mKeyIdHex;
     public final String mKeybaseName;
+    public final String mFbUsername;
 
     public ParcelableKeyRing(byte[] bytes) {
+        this(null, bytes, false);
+    }
+
+    /**
+     * @param disAmbiguator useless parameter intended to distinguish this overloaded constructor
+     *                      for when null is passed as first two arguments
+     */
+    public ParcelableKeyRing(String expectedFingerprint, byte[] bytes, boolean disAmbiguator) {
         mBytes = bytes;
-        mExpectedFingerprint = null;
+        mExpectedFingerprint = expectedFingerprint;
         mKeyIdHex = null;
         mKeybaseName = null;
+        mFbUsername = null;
     }
-    public ParcelableKeyRing(String expectedFingerprint, byte[] bytes) {
-        mBytes = bytes;
+
+    public ParcelableKeyRing(String expectedFingerprint, String keyIdHex) {
+        mBytes = null;
         mExpectedFingerprint = expectedFingerprint;
-        mKeyIdHex = null;
+        mKeyIdHex = keyIdHex;
         mKeybaseName = null;
+        mFbUsername = null;
     }
-    public ParcelableKeyRing(String expectedFingerprint, String keyIdHex, String keybaseName) {
+
+    public ParcelableKeyRing(String expectedFingerprint, String keyIdHex, String keybaseName,
+                             String fbUsername) {
         mBytes = null;
         mExpectedFingerprint = expectedFingerprint;
         mKeyIdHex = keyIdHex;
         mKeybaseName = keybaseName;
+        mFbUsername = fbUsername;
     }
 
     private ParcelableKeyRing(Parcel source) {
@@ -58,6 +73,7 @@ public class ParcelableKeyRing implements Parcelable {
         mExpectedFingerprint = source.readString();
         mKeyIdHex = source.readString();
         mKeybaseName = source.readString();
+        mFbUsername = source.readString();
     }
 
     public void writeToParcel(Parcel dest, int flags) {
@@ -65,6 +81,7 @@ public class ParcelableKeyRing implements Parcelable {
         dest.writeString(mExpectedFingerprint);
         dest.writeString(mKeyIdHex);
         dest.writeString(mKeybaseName);
+        dest.writeString(mFbUsername);
     }
 
     public static final Creator<ParcelableKeyRing> CREATOR = new Creator<ParcelableKeyRing>() {