From 7b02161ce73ca2e7554098a9250d284e8c274caf Mon Sep 17 00:00:00 2001
From: Alex Fong <alexfongg@gmail.com>
Date: Mon, 16 May 2016 00:59:57 +0800
Subject: Slight changes for consistency

---
 .../src/main/java/org/sufficientlysecure/keychain/pgp/KeyRing.java    | 2 +-
 .../java/org/sufficientlysecure/keychain/remote/OpenPgpService.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/KeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/KeyRing.java
index 3e1aa718d..cdff98380 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/KeyRing.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/KeyRing.java
@@ -47,7 +47,7 @@ public abstract class KeyRing {
 
     abstract public String getPrimaryUserIdWithFallback() throws PgpKeyNotFoundException;
 
-    public OpenPgpUtils.UserId getSplitPrimaryUserIdWithFallback() throws PgpKeyNotFoundException {
+    public UserId getSplitPrimaryUserIdWithFallback() throws PgpKeyNotFoundException {
         return splitUserId(getPrimaryUserIdWithFallback());
     }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
index b2a9b50f0..45e4db622 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
@@ -53,7 +53,7 @@ import org.openintents.openpgp.OpenPgpError;
 import org.openintents.openpgp.OpenPgpMetadata;
 import org.openintents.openpgp.OpenPgpSignatureResult;
 import org.openintents.openpgp.util.OpenPgpApi;
-import org.openintents.openpgp.util.OpenPgpUtils.UserId;
+import org.openintents.openpgp.util.OpenPgpUtils;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.operations.BackupOperation;
 import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult;
@@ -135,7 +135,7 @@ public class OpenPgpService extends Service {
         ArrayList<String> duplicateEmails = new ArrayList<>();
         if (!noUserIdsCheck) {
             for (String rawUserId : encryptionUserIds) {
-                UserId userId = KeyRing.splitUserId(rawUserId);
+                OpenPgpUtils.UserId userId = KeyRing.splitUserId(rawUserId);
                 String email = userId.email != null ? userId.email : rawUserId;
                 // try to find the key for this specific email
                 Uri uri = KeyRings.buildUnifiedKeyRingsFindByEmailUri(email);
-- 
cgit v1.2.3