diff options
author | Vincent <valodim@mugenguild.com> | 2016-05-17 20:31:40 +0200 |
---|---|---|
committer | Vincent <valodim@mugenguild.com> | 2016-05-17 20:31:40 +0200 |
commit | 60c277b96f5de786b85e44a650f989a717d63a73 (patch) | |
tree | 60ad4b34c2686a5fc4ae45b838a99c391d5d65dc /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DeleteKeyDialogActivity.java | |
parent | 047b6b34b880fbb207b83eff0a65b4e371093049 (diff) | |
parent | 7b02161ce73ca2e7554098a9250d284e8c274caf (diff) | |
download | open-keychain-60c277b96f5de786b85e44a650f989a717d63a73.tar.gz open-keychain-60c277b96f5de786b85e44a650f989a717d63a73.tar.bz2 open-keychain-60c277b96f5de786b85e44a650f989a717d63a73.zip |
Merge pull request #1870 from AlexFJW/RemovedDuplicateCode
Shifted duplicate method implementations from KeyRing to openpgp-api …
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DeleteKeyDialogActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DeleteKeyDialogActivity.java | 5 |
1 files changed, 3 insertions, 2 deletions
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 { |