added Facebook links support, reworked Preferences

1 files changed, 9 insertions, 3 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java
index 03439228b..75a219191 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java
@@ -77,9 +77,15 @@ public class ImportKeysList extends ArrayList<ImportKeysListEntry> {
         for (String origin : incoming.getOrigins()) {
             existing.addOrigin(origin);
 
-            // to work properly, Keybase-sourced entries need to pass along the extra
-            if (KeybaseKeyserver.ORIGIN.equals(origin)) {
-                existing.setExtraData(incoming.getExtraData());
+            // to work properly, Keybase-sourced/Facebook-sourced entries need to pass along the
+            // identifying name/id
+            if (incoming.getKeybaseName() != null) {
+                existing.setKeybaseName(incoming.getKeybaseName());
+                // one of the origins is not a HKP keyserver
+                incomingFromHkpServer = false;
+            }
+            if (incoming.getFbUsername() != null) {
+                existing.setFbUsername(incoming.getFbUsername());
                 // one of the origins is not a HKP keyserver
                 incomingFromHkpServer = false;
             }