diff options
| author | Vincent <valodim@mugenguild.com> | 2016-05-17 20:31:40 +0200 |
|---|---|---|
| committer | Vincent <valodim@mugenguild.com> | 2016-05-17 20:31:40 +0200 |
| commit | 60c277b96f5de786b85e44a650f989a717d63a73 (patch) | |
| tree | 60ad4b34c2686a5fc4ae45b838a99c391d5d65dc /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util | |
| parent | 047b6b34b880fbb207b83eff0a65b4e371093049 (diff) | |
| parent | 7b02161ce73ca2e7554098a9250d284e8c274caf (diff) | |
| download | open-keychain-60c277b96f5de786b85e44a650f989a717d63a73.tar.gz open-keychain-60c277b96f5de786b85e44a650f989a717d63a73.tar.bz2 open-keychain-60c277b96f5de786b85e44a650f989a717d63a73.zip | |
Merge pull request #1870 from AlexFJW/RemovedDuplicateCode
Shifted duplicate method implementations from KeyRing to openpgp-api …
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java index 29e6f4e41..3d82b9b82 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java @@ -34,6 +34,7 @@ import android.provider.ContactsContract; import android.support.v4.content.ContextCompat; import android.util.Patterns; +import org.openintents.openpgp.util.OpenPgpUtils; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.KeyRing; @@ -503,7 +504,7 @@ public class ContactHelper { if (cursor != null) { while (cursor.moveToNext()) { long masterKeyId = cursor.getLong(INDEX_MASTER_KEY_ID); - KeyRing.UserId userIdSplit = KeyRing.splitUserId(cursor.getString(INDEX_USER_ID)); + OpenPgpUtils.UserId userIdSplit = KeyRing.splitUserId(cursor.getString(INDEX_USER_ID)); boolean isExpired = cursor.getInt(INDEX_IS_EXPIRED) != 0; boolean isRevoked = cursor.getInt(INDEX_IS_REVOKED) > 0; boolean isVerified = cursor.getInt(INDEX_VERIFIED) > 0; @@ -578,7 +579,7 @@ public class ContactHelper { long masterKeyId = cursor.getLong(INDEX_MASTER_KEY_ID); boolean isExpired = cursor.getInt(INDEX_IS_EXPIRED) != 0; boolean isRevoked = cursor.getInt(INDEX_IS_REVOKED) > 0; - KeyRing.UserId userIdSplit = KeyRing.splitUserId(cursor.getString(INDEX_USER_ID)); + OpenPgpUtils.UserId userIdSplit = KeyRing.splitUserId(cursor.getString(INDEX_USER_ID)); if (!isExpired && !isRevoked && userIdSplit.name != null) { // if expired or revoked will not be removed from keysToDelete or inserted @@ -840,7 +841,7 @@ public class ContactHelper { null, null); if (ids != null) { while (ids.moveToNext()) { - KeyRing.UserId userId = KeyRing.splitUserId(ids.getString(0)); + OpenPgpUtils.UserId userId = KeyRing.splitUserId(ids.getString(0)); if (userId.email != null) { ops.add(referenceRawContact( ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI), |