Merge pull request #1870 from AlexFJW/RemovedDuplicateCode

Shifted duplicate method implementations from KeyRing to openpgp-api …

1 files changed, 2 insertions, 1 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
index a0ebc691d..82695781a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -30,6 +30,7 @@ import android.os.RemoteException;
 import android.support.annotation.NonNull;
 import android.support.v4.util.LongSparseArray;
 
+import org.openintents.openpgp.util.OpenPgpUtils;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing;
@@ -454,7 +455,7 @@ public class ProviderHelper {
                 String userId = Utf8Util.fromUTF8ByteArrayReplaceBadEncoding(rawUserId);
                 UserPacketItem item = new UserPacketItem();
                 uids.add(item);
-                KeyRing.UserId splitUserId =  KeyRing.splitUserId(userId);
+                OpenPgpUtils.UserId splitUserId =  KeyRing.splitUserId(userId);
                 item.userId = userId;
                 item.name = splitUserId.name;
                 item.email = splitUserId.email;