aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeyserverSyncAdapterService.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-12-10 13:16:28 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-12-10 13:16:28 +0100
commit1b141c61e15526d8a979c917b632bba91b77b859 (patch)
treef7085ba8e0143e3c023c2ba3412fea8333f99ebc /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeyserverSyncAdapterService.java
parenta5d7a8ddf2c0fd03b386284bf0cdde9aba8dcee3 (diff)
parentf29280bbb268d112426c6662e1227118819fb904 (diff)
downloadopen-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/service/KeyserverSyncAdapterService.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeyserverSyncAdapterService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeyserverSyncAdapterService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeyserverSyncAdapterService.java
index fc3224e39..35b4c2a7c 100644
--- 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();