diff options
author | mar-v-in <github@rvin.mooo.com> | 2014-06-05 23:56:29 +0200 |
---|---|---|
committer | mar-v-in <github@rvin.mooo.com> | 2014-06-05 23:56:29 +0200 |
commit | e2164f571ed80928527cfdebaf3e2655350e9471 (patch) | |
tree | 4d74a1726a6281fc582e215804499900bda8cbf4 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java | |
parent | 36312b950aa2e3150ec9381c91850c63ed1c604b (diff) | |
parent | 255462def4830fa6ad3f7ab164d207501dbed36c (diff) | |
download | open-keychain-e2164f571ed80928527cfdebaf3e2655350e9471.tar.gz open-keychain-e2164f571ed80928527cfdebaf3e2655350e9471.tar.bz2 open-keychain-e2164f571ed80928527cfdebaf3e2655350e9471.zip |
Merge branch 'master' into automatic-contact-discovery
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java index ea80317eb..9781dd213 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java @@ -36,7 +36,7 @@ import com.beardedhen.androidbootstrap.BootstrapButton; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.helper.ContactHelper; -import org.sufficientlysecure.keychain.pgp.PgpKeyHelper; +import org.sufficientlysecure.keychain.pgp.KeyRing; import java.util.regex.Matcher; @@ -164,7 +164,7 @@ public class UserIdEditor extends LinearLayout implements Editor, OnClickListene mIsNewId = isNewId; mOriginalID = userId; - String[] result = PgpKeyHelper.splitUserId(userId); + String[] result = KeyRing.splitUserId(userId); if (result[0] != null) { mName.setText(result[0]); mOriginalName = result[0]; |