added Facebook links support, reworked Preferences

2015-11-25 01:35:41 +05:30
parent a0b46b0d3b
commit f29280bbb2
26 changed files with 557 additions and 377 deletions
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeyserverSyncAdapterService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeyserverSyncAdapterService.java
@@ -440,7 +440,7 @@ public class KeyserverSyncAdapterService extends Service {
            String hexKeyId = KeyFormattingUtils
                    .convertKeyIdToHex(keyId);
            // we aren't updating from keybase as of now
-            keyList.add(new ParcelableKeyRing(fingerprint, hexKeyId, null));
+            keyList.add(new ParcelableKeyRing(fingerprint, hexKeyId));
        }
        keyCursor.close();