diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-12-10 13:16:28 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-12-10 13:16:28 +0100 |
commit | 1b141c61e15526d8a979c917b632bba91b77b859 (patch) | |
tree | f7085ba8e0143e3c023c2ba3412fea8333f99ebc /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java | |
parent | a5d7a8ddf2c0fd03b386284bf0cdde9aba8dcee3 (diff) | |
parent | f29280bbb268d112426c6662e1227118819fb904 (diff) | |
download | open-keychain-1b141c61e15526d8a979c917b632bba91b77b859.tar.gz open-keychain-1b141c61e15526d8a979c917b632bba91b77b859.tar.bz2 open-keychain-1b141c61e15526d8a979c917b632bba91b77b859.zip |
Merge pull request #1610 from open-keychain/facebook
Basic Facebook Support
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java index bb86d272f..b3cf70c9f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java @@ -49,7 +49,8 @@ public class ImportKeysListEntry implements Serializable, Parcelable { private String mAlgorithm; private boolean mSecretKey; private String mPrimaryUserId; - private String mExtraData; + private String mKeybaseName; + private String mFbUsername; private String mQuery; private ArrayList<String> mOrigins; private Integer mHashCode = null; @@ -81,7 +82,8 @@ public class ImportKeysListEntry implements Serializable, Parcelable { dest.writeString(mAlgorithm); dest.writeByte((byte) (mSecretKey ? 1 : 0)); dest.writeByte((byte) (mSelected ? 1 : 0)); - dest.writeString(mExtraData); + dest.writeString(mKeybaseName); + dest.writeString(mFbUsername); dest.writeStringList(mOrigins); } @@ -102,7 +104,8 @@ public class ImportKeysListEntry implements Serializable, Parcelable { vr.mAlgorithm = source.readString(); vr.mSecretKey = source.readByte() == 1; vr.mSelected = source.readByte() == 1; - vr.mExtraData = source.readString(); + vr.mKeybaseName = source.readString(); + vr.mFbUsername = source.readString(); vr.mOrigins = new ArrayList<>(); source.readStringList(vr.mOrigins); @@ -229,12 +232,20 @@ public class ImportKeysListEntry implements Serializable, Parcelable { mPrimaryUserId = uid; } - public String getExtraData() { - return mExtraData; + public String getKeybaseName() { + return mKeybaseName; } - public void setExtraData(String extraData) { - mExtraData = extraData; + public String getFbUsername() { + return mFbUsername; + } + + public void setKeybaseName(String keybaseName) { + mKeybaseName = keybaseName; + } + + public void setFbUsername(String fbUsername) { + mFbUsername = fbUsername; } public String getQuery() { |