diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-11 14:39:35 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-11 14:39:35 +0200 |
| commit | 85bb3d9480ccc52908e7a43379c5e2eda9dbd7f1 (patch) | |
| tree | 4a20a9065d9411d35b720a0fd446ab4e2ff89b9f /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java | |
| parent | 0687f7f40e1aecf4fbc109c3ab3fa2c3613546b3 (diff) | |
| parent | baa3c86e1246d486d80c963ddc6c64b58f2a5093 (diff) | |
| download | open-keychain-85bb3d9480ccc52908e7a43379c5e2eda9dbd7f1.tar.gz open-keychain-85bb3d9480ccc52908e7a43379c5e2eda9dbd7f1.tar.bz2 open-keychain-85bb3d9480ccc52908e7a43379c5e2eda9dbd7f1.zip | |
Merge pull request #553 from Valodim/split-masterKeyId
Split master key & partial fix for uid order
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java | 3 |
1 files changed, 2 insertions, 1 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 321d2a83f..a13c7a953 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 @@ -180,7 +180,8 @@ public class AccountSettingsFragment extends Fragment implements if (resultCode == Activity.RESULT_OK) { // select newly created key try { - long masterKeyId = ProviderHelper.getMasterKeyId(getActivity(), data.getData()); + long masterKeyId = ProviderHelper.extractOrGetMasterKeyId( + getActivity(), data.getData()); mSelectKeyFragment.selectKey(masterKeyId); } catch (ProviderHelper.NotFoundException e) { Log.e(Constants.TAG, "key not found!", e); |