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