From 614f46a630e5ce29926ad000edadf7e158c0d4b2 Mon Sep 17 00:00:00 2001 From: Alex Fong Date: Sun, 15 May 2016 23:22:08 +0800 Subject: Shifted duplicate method implementations from KeyRing to openpgp-api submodule --- .../keychain/keyimport/ImportKeysListEntry.java | 3 +- .../sufficientlysecure/keychain/pgp/KeyRing.java | 50 +++------------------- .../keychain/provider/ProviderHelper.java | 3 +- .../keychain/remote/OpenPgpService.java | 2 +- .../remote/ui/AccountSettingsFragment.java | 3 +- .../remote/ui/SelectSignKeyIdActivity.java | 3 +- .../keychain/ui/CreateKeyFinalFragment.java | 5 ++- .../keychain/ui/DecryptFragment.java | 5 ++- .../keychain/ui/DeleteKeyDialogActivity.java | 5 ++- .../keychain/ui/EncryptFilesFragment.java | 3 +- .../keychain/ui/EncryptTextFragment.java | 3 +- .../keychain/ui/MultiUserIdsFragment.java | 3 +- .../keychain/ui/PassphraseDialogActivity.java | 3 +- .../keychain/ui/ViewKeyActivity.java | 3 +- .../keychain/ui/ViewKeyAdvActivity.java | 3 +- .../keychain/ui/ViewKeyAdvCertsFragment.java | 3 +- .../keychain/ui/ViewKeyAdvShareFragment.java | 3 +- .../keychain/ui/adapter/ImportKeysAdapter.java | 3 +- .../keychain/ui/adapter/KeyAdapter.java | 5 ++- .../keychain/ui/adapter/MultiUserIdsAdapter.java | 5 ++- .../ui/adapter/SelectKeyCursorAdapter.java | 3 +- .../keychain/ui/adapter/UserIdsAdapter.java | 3 +- .../keychain/ui/adapter/UserIdsAddedAdapter.java | 3 +- .../ui/dialog/AddUserIdDialogFragment.java | 3 +- .../keychain/ui/util/KeyFormattingUtils.java | 3 +- .../keychain/util/ContactHelper.java | 7 +-- .../keychain/pgp/SplitUserIdTest.java | 15 ++++--- extern/openpgp-api-lib | 2 +- 28 files changed, 70 insertions(+), 85 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java index b3cf70c9f..c0cc9e2a3 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java @@ -21,6 +21,7 @@ import android.content.Context; import android.os.Parcel; import android.os.Parcelable; +import org.openintents.openpgp.util.OpenPgpUtils; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.KeyRing; import org.sufficientlysecure.keychain.pgp.UncachedKeyRing; @@ -318,7 +319,7 @@ public class ImportKeysListEntry implements Serializable, Parcelable { public void updateMergedUserIds() { mMergedUserIds = new HashMap<>(); for (String userId : mUserIds) { - KeyRing.UserId userIdSplit = KeyRing.splitUserId(userId); + OpenPgpUtils.UserId userIdSplit = KeyRing.splitUserId(userId); // TODO: comment field? 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 1ebab7847..3e1aa718d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/KeyRing.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/KeyRing.java @@ -20,6 +20,8 @@ package org.sufficientlysecure.keychain.pgp; import android.text.TextUtils; +import org.openintents.openpgp.util.OpenPgpUtils; +import org.openintents.openpgp.util.OpenPgpUtils.UserId; import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException; import java.io.Serializable; @@ -45,7 +47,7 @@ public abstract class KeyRing { abstract public String getPrimaryUserIdWithFallback() throws PgpKeyNotFoundException; - public UserId getSplitPrimaryUserIdWithFallback() throws PgpKeyNotFoundException { + public OpenPgpUtils.UserId getSplitPrimaryUserIdWithFallback() throws PgpKeyNotFoundException { return splitUserId(getPrimaryUserIdWithFallback()); } @@ -59,10 +61,6 @@ public abstract class KeyRing { abstract public int getVerified() throws PgpKeyNotFoundException; - private static final Pattern USER_ID_PATTERN = Pattern.compile("^(.*?)(?: \\((.*)\\))?(?: <(.*)>)?$"); - - private static final Pattern EMAIL_PATTERN = Pattern.compile("^.*@.*\\..*$"); - /** * Splits userId string into naming part, email part, and comment part *

@@ -70,53 +68,15 @@ public abstract class KeyRing { * http://fiddle.re/t4p6f */ public static UserId splitUserId(final String userId) { - if (!TextUtils.isEmpty(userId)) { - final Matcher matcher = USER_ID_PATTERN.matcher(userId); - if (matcher.matches()) { - String name = matcher.group(1).isEmpty() ? null : matcher.group(1); - String comment = matcher.group(2); - String email = matcher.group(3); - if (comment == null && email == null && name != null && EMAIL_PATTERN.matcher(name).matches()) { - email = name; - name = null; - } - return new UserId(name, email, comment); - } - } - return new UserId(null, null, null); + return OpenPgpUtils.splitUserId(userId); } /** * Returns a composed user id. Returns null if name, email and comment are empty. */ public static String createUserId(UserId userId) { - StringBuilder userIdBuilder = new StringBuilder(); - if (!TextUtils.isEmpty(userId.name)) { - userIdBuilder.append(userId.name); - } - if (!TextUtils.isEmpty(userId.comment)) { - userIdBuilder.append(" ("); - userIdBuilder.append(userId.comment); - userIdBuilder.append(")"); - } - if (!TextUtils.isEmpty(userId.email)) { - userIdBuilder.append(" <"); - userIdBuilder.append(userId.email); - userIdBuilder.append(">"); - } - return userIdBuilder.length() == 0 ? null : userIdBuilder.toString(); + return OpenPgpUtils.createUserId(userId); } - public static class UserId implements Serializable { - public final String name; - public final String email; - public final String comment; - - public UserId(String name, String email, String comment) { - this.name = name; - this.email = email; - this.comment = comment; - } - } } 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; 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 20baf3a62..b2a9b50f0 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java @@ -53,6 +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.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.operations.BackupOperation; import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult; @@ -61,7 +62,6 @@ import org.sufficientlysecure.keychain.operations.results.OperationResult.LogEnt import org.sufficientlysecure.keychain.operations.results.PgpSignEncryptResult; import org.sufficientlysecure.keychain.pgp.CanonicalizedPublicKeyRing; import org.sufficientlysecure.keychain.pgp.KeyRing; -import org.sufficientlysecure.keychain.pgp.KeyRing.UserId; import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyInputParcel; import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyOperation; import org.sufficientlysecure.keychain.pgp.PgpSecurityConstants; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java index 18afd2f23..bcfe54f93 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java @@ -26,6 +26,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import org.openintents.openpgp.util.OpenPgpUtils; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.operations.results.EditKeyResult; @@ -92,7 +93,7 @@ public class AccountSettingsFragment extends Fragment { } private void createKey() { - KeyRing.UserId userId = KeyRing.splitUserId(mAccSettings.getAccountName()); + OpenPgpUtils.UserId userId = KeyRing.splitUserId(mAccSettings.getAccountName()); Intent intent = new Intent(getActivity(), CreateKeyActivity.class); intent.putExtra(CreateKeyActivity.EXTRA_NAME, userId.name); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/SelectSignKeyIdActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/SelectSignKeyIdActivity.java index fd3f8f731..946c77ce8 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/SelectSignKeyIdActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/SelectSignKeyIdActivity.java @@ -25,6 +25,7 @@ import android.view.View; import android.widget.TextView; import org.openintents.openpgp.util.OpenPgpApi; +import org.openintents.openpgp.util.OpenPgpUtils; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.operations.results.OperationResult; @@ -90,7 +91,7 @@ public class SelectSignKeyIdActivity extends BaseActivity { } private void createKey(String userId) { - KeyRing.UserId userIdSplit = KeyRing.splitUserId(userId); + OpenPgpUtils.UserId userIdSplit = KeyRing.splitUserId(userId); Intent intent = new Intent(this, CreateKeyActivity.class); intent.putExtra(CreateKeyActivity.EXTRA_NAME, userIdSplit.name); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java index 227d6fce4..99a4b0201 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java @@ -34,6 +34,7 @@ import android.widget.CheckBox; import android.widget.TextView; import org.bouncycastle.bcpg.sig.KeyFlags; +import org.openintents.openpgp.util.OpenPgpUtils; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.operations.results.EditKeyResult; @@ -305,7 +306,7 @@ public class CreateKeyFinalFragment extends Fragment { } } String userId = KeyRing.createUserId( - new KeyRing.UserId(createKeyActivity.mName, createKeyActivity.mEmail, null) + new OpenPgpUtils.UserId(createKeyActivity.mName, createKeyActivity.mEmail, null) ); saveKeyringParcel.mAddUserIds.add(userId); saveKeyringParcel.mChangePrimaryUserId = userId; @@ -313,7 +314,7 @@ public class CreateKeyFinalFragment extends Fragment { && createKeyActivity.mAdditionalEmails.size() > 0) { for (String email : createKeyActivity.mAdditionalEmails) { String thisUserId = KeyRing.createUserId( - new KeyRing.UserId(createKeyActivity.mName, email, null) + new OpenPgpUtils.UserId(createKeyActivity.mName, email, null) ); saveKeyringParcel.mAddUserIds.add(thisUserId); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java index bc3470b0a..b15985fc7 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java @@ -39,6 +39,7 @@ import android.widget.ViewAnimator; import org.openintents.openpgp.OpenPgpDecryptionResult; import org.openintents.openpgp.OpenPgpSignatureResult; +import org.openintents.openpgp.util.OpenPgpUtils; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing; @@ -308,7 +309,7 @@ public abstract class DecryptFragment extends Fragment implements LoaderManager. long signatureKeyId = mSignatureResult.getKeyId(); String userId = data.getString(INDEX_USER_ID); - KeyRing.UserId userIdSplit = KeyRing.splitUserId(userId); + OpenPgpUtils.UserId userIdSplit = KeyRing.splitUserId(userId); if (userIdSplit.name != null) { mSignatureName.setText(userIdSplit.name); } else { @@ -418,7 +419,7 @@ public abstract class DecryptFragment extends Fragment implements LoaderManager. } String userId = mSignatureResult.getPrimaryUserId(); - KeyRing.UserId userIdSplit = KeyRing.splitUserId(userId); + OpenPgpUtils.UserId userIdSplit = KeyRing.splitUserId(userId); if (userIdSplit.name != null) { mSignatureName.setText(userIdSplit.name); } else { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DeleteKeyDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DeleteKeyDialogActivity.java index 478259133..a32dc175c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DeleteKeyDialogActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DeleteKeyDialogActivity.java @@ -35,6 +35,7 @@ import android.widget.AdapterView; import android.widget.Spinner; import android.widget.TextView; +import org.openintents.openpgp.util.OpenPgpUtils; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.operations.results.DeleteResult; @@ -100,7 +101,7 @@ public class DeleteKeyDialogActivity extends FragmentActivity { ); String name; - KeyRing.UserId mainUserId = KeyRing.splitUserId( + OpenPgpUtils.UserId mainUserId = KeyRing.splitUserId( (String) data.get(KeychainContract.KeyRings.USER_ID)); if (mainUserId.name != null) { name = mainUserId.name; @@ -280,7 +281,7 @@ public class DeleteKeyDialogActivity extends FragmentActivity { } ); String name; - KeyRing.UserId mainUserId = KeyRing.splitUserId((String) data.get(KeychainContract.KeyRings.USER_ID)); + OpenPgpUtils.UserId mainUserId = KeyRing.splitUserId((String) data.get(KeychainContract.KeyRings.USER_ID)); if (mainUserId.name != null) { name = mainUserId.name; } else { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java index 80bac18e3..258aebadf 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java @@ -58,6 +58,7 @@ import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; +import org.openintents.openpgp.util.OpenPgpUtils; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.operations.results.SignEncryptResult; @@ -704,7 +705,7 @@ public class EncryptFilesFragment Set users = new HashSet<>(); for (String user : encryptionUserIds) { - KeyRing.UserId userId = KeyRing.splitUserId(user); + OpenPgpUtils.UserId userId = KeyRing.splitUserId(user); if (userId.email != null) { users.add(userId.email); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java index f805c70c3..e02184873 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java @@ -33,6 +33,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import org.openintents.openpgp.util.OpenPgpUtils; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.operations.results.SignEncryptResult; @@ -326,7 +327,7 @@ public class EncryptTextFragment Set users = new HashSet<>(); for (String user : encryptionUserIds) { - KeyRing.UserId userId = KeyRing.splitUserId(user); + OpenPgpUtils.UserId userId = KeyRing.splitUserId(user); if (userId.email != null) { users.add(userId.email); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiUserIdsFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiUserIdsFragment.java index 8ba695cf7..5116073ae 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiUserIdsFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiUserIdsFragment.java @@ -15,6 +15,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ListView; +import org.openintents.openpgp.util.OpenPgpUtils; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.KeyRing; @@ -151,7 +152,7 @@ public class MultiUserIdsFragment extends Fragment implements LoaderManager.Load while (!data.isAfterLast()) { long masterKeyId = data.getLong(INDEX_MASTER_KEY_ID); String userId = data.getString(INDEX_USER_ID); - KeyRing.UserId pieces = KeyRing.splitUserId(userId); + OpenPgpUtils.UserId pieces = KeyRing.splitUserId(userId); // Two cases: diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java index 2c562c30e..5f4303b32 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java @@ -46,6 +46,7 @@ import android.widget.TextView; import android.widget.Toast; import android.widget.ViewAnimator; +import org.openintents.openpgp.util.OpenPgpUtils; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey; @@ -236,7 +237,7 @@ public class PassphraseDialogActivity extends FragmentActivity { // above can't be statically verified to have been set in all cases because // the catch clause doesn't return. String mainUserId = cachedPublicKeyRing.getPrimaryUserIdWithFallback(); - KeyRing.UserId mainUserIdSplit = KeyRing.splitUserId(mainUserId); + OpenPgpUtils.UserId mainUserIdSplit = KeyRing.splitUserId(mainUserId); if (mainUserIdSplit.name != null) { userId = mainUserIdSplit.name; } else { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java index ca4a33980..4dceb94f0 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java @@ -67,6 +67,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.Toast; +import org.openintents.openpgp.util.OpenPgpUtils; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing; @@ -877,7 +878,7 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements if (data.moveToFirst()) { // get name, email, and comment from USER_ID - KeyRing.UserId mainUserId = KeyRing.splitUserId(data.getString(INDEX_USER_ID)); + OpenPgpUtils.UserId mainUserId = KeyRing.splitUserId(data.getString(INDEX_USER_ID)); if (mainUserId.name != null) { mCollapsingToolbarLayout.setTitle(mainUserId.name); } else { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java index b9a8259c1..0be64629b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java @@ -41,6 +41,7 @@ import android.widget.Toast; import com.astuetz.PagerSlidingTabStrip; +import org.openintents.openpgp.util.OpenPgpUtils; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.operations.results.OperationResult; @@ -213,7 +214,7 @@ public class ViewKeyAdvActivity extends BaseActivity implements case LOADER_ID_UNIFIED: { if (data.moveToFirst()) { // get name, email, and comment from USER_ID - KeyRing.UserId mainUserId = KeyRing.splitUserId(data.getString(INDEX_USER_ID)); + OpenPgpUtils.UserId mainUserId = KeyRing.splitUserId(data.getString(INDEX_USER_ID)); if (mainUserId.name != null) { setTitle(mainUserId.name); } else { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvCertsFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvCertsFragment.java index f5c8a87b1..c39881e5b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvCertsFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvCertsFragment.java @@ -32,6 +32,7 @@ import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.TextView; +import org.openintents.openpgp.util.OpenPgpUtils; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.KeyRing; @@ -237,7 +238,7 @@ public class ViewKeyAdvCertsFragment extends LoaderFragment implements TextView wSignStatus = (TextView) view.findViewById(R.id.signStatus); String signerKeyId = KeyFormattingUtils.beautifyKeyIdWithPrefix(getActivity(), cursor.getLong(mIndexSignerKeyId)); - KeyRing.UserId userId = KeyRing.splitUserId(cursor.getString(mIndexSignerUserId)); + OpenPgpUtils.UserId userId = KeyRing.splitUserId(cursor.getString(mIndexSignerUserId)); if (userId.name != null) { wSignerName.setText(userId.name); } else { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java index 02eae1b2b..e2a91b0fd 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java @@ -51,6 +51,7 @@ import android.widget.ImageButton; import android.widget.ImageView; import android.widget.TextView; +import org.openintents.openpgp.util.OpenPgpUtils; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.KeyRing; @@ -247,7 +248,7 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements TemporaryFileProvider shareFileProv = new TemporaryFileProvider(); String filename = KeyFormattingUtils.convertFingerprintToHex(mFingerprint); - KeyRing.UserId mainUserId = KeyRing.splitUserId(mUserId); + OpenPgpUtils.UserId mainUserId = KeyRing.splitUserId(mUserId); if (mainUserId.name != null) { filename = mainUserId.name; } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java index 0be7e8f76..a6d311134 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java @@ -31,6 +31,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import org.openintents.openpgp.util.OpenPgpUtils; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry; import org.sufficientlysecure.keychain.operations.ImportOperation; @@ -141,7 +142,7 @@ public class ImportKeysAdapter extends ArrayAdapter { // main user id String userId = entry.getUserIds().get(0); - KeyRing.UserId userIdSplit = KeyRing.splitUserId(userId); + OpenPgpUtils.UserId userIdSplit = KeyRing.splitUserId(userId); // name if (userIdSplit.name != null) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java index 78aaecab3..56dd15a8f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java @@ -38,6 +38,7 @@ import android.widget.ImageButton; import android.widget.ImageView; import android.widget.TextView; +import org.openintents.openpgp.util.OpenPgpUtils; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.CanonicalizedPublicKey; import org.sufficientlysecure.keychain.pgp.CanonicalizedPublicKeyRing; @@ -125,7 +126,7 @@ public class KeyAdapter extends CursorAdapter { mDisplayedItem = item; { // set name and stuff, common to both key types - KeyRing.UserId userIdSplit = item.mUserId; + OpenPgpUtils.UserId userIdSplit = item.mUserId; if (userIdSplit.name != null) { mMainUserId.setText(highlighter.highlight(userIdSplit.name)); } else { @@ -288,7 +289,7 @@ public class KeyAdapter extends CursorAdapter { public static class KeyItem implements Serializable { public final String mUserIdFull; - public final KeyRing.UserId mUserId; + public final OpenPgpUtils.UserId mUserId; public final long mKeyId; public final boolean mHasDuplicate; public final boolean mHasEncrypt; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java index d247faddc..b6da1eddf 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java @@ -30,6 +30,7 @@ import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.TextView; +import org.openintents.openpgp.util.OpenPgpUtils; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.KeyRing; import org.sufficientlysecure.keychain.service.CertifyActionsParcel.CertifyAction; @@ -87,7 +88,7 @@ public class MultiUserIdsAdapter extends CursorAdapter { { // first one String userId = uids.get(0); - KeyRing.UserId splitUserId = KeyRing.splitUserId(userId); + OpenPgpUtils.UserId splitUserId = KeyRing.splitUserId(userId); if (splitUserId.name != null) { vName.setText(splitUserId.name); } else { @@ -112,7 +113,7 @@ public class MultiUserIdsAdapter extends CursorAdapter { StringBuilder lines = new StringBuilder(); for (String uid : uids) { - KeyRing.UserId splitUserId = KeyRing.splitUserId(uid); + OpenPgpUtils.UserId splitUserId = KeyRing.splitUserId(uid); if (splitUserId.email == null) { continue; } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java index f01f25200..3e94ac728 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java @@ -29,6 +29,7 @@ import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; +import org.openintents.openpgp.util.OpenPgpUtils; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.KeyRing; import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings; @@ -118,7 +119,7 @@ abstract public class SelectKeyCursorAdapter extends CursorAdapter { ViewHolderItem h = (ViewHolderItem) view.getTag(); String userId = cursor.getString(mIndexUserId); - KeyRing.UserId userIdSplit = KeyRing.splitUserId(userId); + OpenPgpUtils.UserId userIdSplit = KeyRing.splitUserId(userId); if (userIdSplit.name != null) { h.mainUserId.setText(highlighter.highlight(userIdSplit.name)); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java index e86a7812e..26a604ef4 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java @@ -32,6 +32,7 @@ import android.widget.ImageView; import android.widget.TextView; import android.widget.ViewAnimator; +import org.openintents.openpgp.util.OpenPgpUtils; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.KeyRing; import org.sufficientlysecure.keychain.provider.KeychainContract.Certs; @@ -70,7 +71,7 @@ public class UserIdsAdapter extends UserAttributesAdapter { vDeleteButton.setVisibility(View.GONE); // not used String userId = cursor.getString(INDEX_USER_ID); - KeyRing.UserId splitUserId = KeyRing.splitUserId(userId); + OpenPgpUtils.UserId splitUserId = KeyRing.splitUserId(userId); if (splitUserId.name != null) { vName.setText(splitUserId.name); } else { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java index b1892b27e..7186a0816 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java @@ -28,6 +28,7 @@ import android.widget.ImageButton; import android.widget.ImageView; import android.widget.TextView; +import org.openintents.openpgp.util.OpenPgpUtils; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.KeyRing; @@ -92,7 +93,7 @@ public class UserIdsAddedAdapter extends ArrayAdapter { // save reference to model item holder.mModel = getItem(position); - KeyRing.UserId splitUserId = KeyRing.splitUserId(holder.mModel); + OpenPgpUtils.UserId splitUserId = KeyRing.splitUserId(holder.mModel); if (splitUserId.name != null) { holder.vName.setText(splitUserId.name); } else { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java index 4500ccd24..2daece4ac 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java @@ -38,6 +38,7 @@ import android.widget.EditText; import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; +import org.openintents.openpgp.util.OpenPgpUtils; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.KeyRing; @@ -110,7 +111,7 @@ public class AddUserIdDialogFragment extends DialogFragment implements OnEditorA // return new user id back to activity Bundle data = new Bundle(); - String userId = KeyRing.createUserId(new KeyRing.UserId(mName.getText().toString(), + String userId = KeyRing.createUserId(new OpenPgpUtils.UserId(mName.getText().toString(), mEmail.getText().toString(), mComment.getText().toString())); data.putString(MESSAGE_DATA_USER_ID, userId); sendMessageToHandler(MESSAGE_OKAY, data); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java index 4dc0ebaa0..64a960d7b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java @@ -37,6 +37,7 @@ import org.bouncycastle.asn1.nist.NISTNamedCurves; import org.bouncycastle.asn1.teletrust.TeleTrusTNamedCurves; import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; import org.bouncycastle.util.encoders.Hex; +import org.openintents.openpgp.util.OpenPgpUtils; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult; @@ -593,7 +594,7 @@ public class KeyFormattingUtils { holder.getSignatureAction().setDisplayedChild(sigActionDisplayedChild); String userId = result.getSignatureResult().getPrimaryUserId(); - KeyRing.UserId userIdSplit = KeyRing.splitUserId(userId); + OpenPgpUtils.UserId userIdSplit = KeyRing.splitUserId(userId); if (userIdSplit.name != null) { holder.getSignatureUserName().setText(userIdSplit.name); } else { 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), diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/SplitUserIdTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/SplitUserIdTest.java index 97feeea7b..64579bbb3 100644 --- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/SplitUserIdTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/SplitUserIdTest.java @@ -20,6 +20,7 @@ package org.sufficientlysecure.keychain.pgp; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; +import org.openintents.openpgp.util.OpenPgpUtils; import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; @@ -32,7 +33,7 @@ public class SplitUserIdTest { @Test public void splitCompleteUserIdShouldReturnAll3Components() throws Exception { - KeyRing.UserId info = KeyRing.splitUserId("Max Mustermann (this is a comment) "); + OpenPgpUtils.UserId info = KeyRing.splitUserId("Max Mustermann (this is a comment) "); Assert.assertEquals("Max Mustermann", info.name); Assert.assertEquals("this is a comment", info.comment); Assert.assertEquals("max@example.com", info.email); @@ -40,7 +41,7 @@ public class SplitUserIdTest { @Test public void splitUserIdWithAllButCommentShouldReturnNameAndEmail() throws Exception { - KeyRing.UserId info = KeyRing.splitUserId("Max Mustermann "); + OpenPgpUtils.UserId info = KeyRing.splitUserId("Max Mustermann "); Assert.assertEquals("Max Mustermann", info.name); Assert.assertNull(info.comment); Assert.assertEquals("max@example.com", info.email); @@ -48,7 +49,7 @@ public class SplitUserIdTest { @Test public void splitUserIdWithAllButEmailShouldReturnNameAndComment() throws Exception { - KeyRing.UserId info = KeyRing.splitUserId("Max Mustermann (this is a comment)"); + OpenPgpUtils.UserId info = KeyRing.splitUserId("Max Mustermann (this is a comment)"); Assert.assertEquals("Max Mustermann", info.name); Assert.assertEquals("this is a comment", info.comment); Assert.assertNull(info.email); @@ -56,7 +57,7 @@ public class SplitUserIdTest { @Test public void splitUserIdWithCommentAndEmailShouldReturnCommentAndEmail() throws Exception { - KeyRing.UserId info = KeyRing.splitUserId(" (this is a comment) "); + OpenPgpUtils.UserId info = KeyRing.splitUserId(" (this is a comment) "); Assert.assertNull(info.name); Assert.assertEquals("this is a comment", info.comment); Assert.assertEquals("max@example.com", info.email); @@ -64,7 +65,7 @@ public class SplitUserIdTest { @Test public void splitUserIdWithEmailShouldReturnEmail() throws Exception { - KeyRing.UserId info = KeyRing.splitUserId("max@example.com"); + OpenPgpUtils.UserId info = KeyRing.splitUserId("max@example.com"); Assert.assertNull(info.name); Assert.assertNull(info.comment); Assert.assertEquals("max@example.com", info.email); @@ -72,7 +73,7 @@ public class SplitUserIdTest { @Test public void splitUserIdWithNameShouldReturnName() throws Exception { - KeyRing.UserId info = KeyRing.splitUserId("Max Mustermann"); + OpenPgpUtils.UserId info = KeyRing.splitUserId("Max Mustermann"); Assert.assertEquals("Max Mustermann", info.name); Assert.assertNull(info.comment); Assert.assertNull(info.email); @@ -80,7 +81,7 @@ public class SplitUserIdTest { @Test public void splitUserIdWithCommentShouldReturnComment() throws Exception { - KeyRing.UserId info = KeyRing.splitUserId(" (this is a comment)"); + OpenPgpUtils.UserId info = KeyRing.splitUserId(" (this is a comment)"); Assert.assertNull(info.name); Assert.assertEquals("this is a comment", info.comment); Assert.assertNull(info.email); diff --git a/extern/openpgp-api-lib b/extern/openpgp-api-lib index e61c349b9..32794ee94 160000 --- a/extern/openpgp-api-lib +++ b/extern/openpgp-api-lib @@ -1 +1 @@ -Subproject commit e61c349b9ed0dc911cc3ced1ba3ba24a4a9df5e3 +Subproject commit 32794ee94fcd3c8065163da1f6da41e7ceb87c05 -- cgit v1.2.3 From 7b02161ce73ca2e7554098a9250d284e8c274caf Mon Sep 17 00:00:00 2001 From: Alex Fong 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 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