diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-06-06 00:51:24 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-06-06 00:51:24 +0200 |
| commit | 9d02bc85e2c3fffbb18c4bbd8889db827ac2e8f0 (patch) | |
| tree | c3ebf46b9efd867f75b81e2dee0cf4a7125899dd /OpenKeychain | |
| parent | e2164f571ed80928527cfdebaf3e2655350e9471 (diff) | |
| download | open-keychain-9d02bc85e2c3fffbb18c4bbd8889db827ac2e8f0.tar.gz open-keychain-9d02bc85e2c3fffbb18c4bbd8889db827ac2e8f0.tar.bz2 open-keychain-9d02bc85e2c3fffbb18c4bbd8889db827ac2e8f0.zip | |
Fix compile error introduced during merge
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ContactHelper.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ContactHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ContactHelper.java index 4b85d7e80..f50ccf6f8 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ContactHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ContactHelper.java @@ -27,6 +27,7 @@ import android.provider.ContactsContract; import android.util.Patterns; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; +import org.sufficientlysecure.keychain.pgp.KeyRing; import org.sufficientlysecure.keychain.pgp.PgpKeyHelper; import org.sufficientlysecure.keychain.provider.KeychainContract; import org.sufficientlysecure.keychain.util.Log; @@ -93,7 +94,7 @@ public class ContactHelper { null, null, null); if (cursor != null) { while (cursor.moveToNext()) { - String[] userId = PgpKeyHelper.splitUserId(cursor.getString(0)); + String[] userId = KeyRing.splitUserId(cursor.getString(0)); String fingerprint = PgpKeyHelper.convertFingerprintToHex(cursor.getBlob(1)); String keyIdShort = PgpKeyHelper.convertKeyIdToHexShort(cursor.getLong(2)); long masterKeyId = cursor.getLong(3); |