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 --- .../org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java') 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); } -- cgit v1.2.3