diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-16 13:54:01 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-16 13:54:01 +0100 |
commit | a655664c0bd177278826720dbac6b22f4e9e1cd2 (patch) | |
tree | 63e3ea1fd351232f2c0978b78a6681d999914cde /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui | |
parent | 0e71fcd638195003af36f4cf8f3192a381794516 (diff) | |
download | open-keychain-a655664c0bd177278826720dbac6b22f4e9e1cd2.tar.gz open-keychain-a655664c0bd177278826720dbac6b22f4e9e1cd2.tar.bz2 open-keychain-a655664c0bd177278826720dbac6b22f4e9e1cd2.zip |
object oriented split user id
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui')
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java index 4bb64bcaa..81181d61d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java @@ -92,11 +92,11 @@ public class AccountSettingsFragment extends Fragment { } private void createKey() { - String[] userId = KeyRing.splitUserId(mAccSettings.getAccountName()); + KeyRing.UserId userId = KeyRing.splitUserId(mAccSettings.getAccountName()); Intent intent = new Intent(getActivity(), CreateKeyActivity.class); - intent.putExtra(CreateKeyActivity.EXTRA_NAME, userId[0]); - intent.putExtra(CreateKeyActivity.EXTRA_EMAIL, userId[1]); + intent.putExtra(CreateKeyActivity.EXTRA_NAME, userId.name); + intent.putExtra(CreateKeyActivity.EXTRA_EMAIL, userId.email); startActivityForResult(intent, REQUEST_CODE_CREATE_KEY); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/SelectSignKeyIdActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/SelectSignKeyIdActivity.java index b3096ef99..98a44466d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/SelectSignKeyIdActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/SelectSignKeyIdActivity.java @@ -96,11 +96,11 @@ public class SelectSignKeyIdActivity extends BaseActivity { } private void createKey(String userId) { - String[] userIdSplit = KeyRing.splitUserId(userId); + KeyRing.UserId userIdSplit = KeyRing.splitUserId(userId); Intent intent = new Intent(this, CreateKeyActivity.class); - intent.putExtra(CreateKeyActivity.EXTRA_NAME, userIdSplit[0]); - intent.putExtra(CreateKeyActivity.EXTRA_EMAIL, userIdSplit[1]); + intent.putExtra(CreateKeyActivity.EXTRA_NAME, userIdSplit.name); + intent.putExtra(CreateKeyActivity.EXTRA_EMAIL, userIdSplit.email); startActivityForResult(intent, REQUEST_CODE_CREATE_KEY); } |