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