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/ViewKeyActivity.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/ViewKeyActivity.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java index ca4a33980..4dceb94f0 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java @@ -67,6 +67,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.Toast; +import org.openintents.openpgp.util.OpenPgpUtils; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing; @@ -877,7 +878,7 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements if (data.moveToFirst()) { // get name, email, and comment from USER_ID - KeyRing.UserId mainUserId = KeyRing.splitUserId(data.getString(INDEX_USER_ID)); + OpenPgpUtils.UserId mainUserId = KeyRing.splitUserId(data.getString(INDEX_USER_ID)); if (mainUserId.name != null) { mCollapsingToolbarLayout.setTitle(mainUserId.name); } else { |