diff options
author | Alex Fong <alexfongg@gmail.com> | 2016-05-15 23:22:08 +0800 |
---|---|---|
committer | Alex Fong <alexfongg@gmail.com> | 2016-05-15 23:26:09 +0800 |
commit | 614f46a630e5ce29926ad000edadf7e158c0d4b2 (patch) | |
tree | debcf009104ee1a8fc7dc0252f96f794e363003a /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java | |
parent | 664386afece0cfb4d6db214e786406b5ad632da7 (diff) | |
download | open-keychain-614f46a630e5ce29926ad000edadf7e158c0d4b2.tar.gz open-keychain-614f46a630e5ce29926ad000edadf7e158c0d4b2.tar.bz2 open-keychain-614f46a630e5ce29926ad000edadf7e158c0d4b2.zip |
Shifted duplicate method implementations from KeyRing to openpgp-api submodule
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 { |