From baa3c86e1246d486d80c963ddc6c64b58f2a5093 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Fri, 11 Apr 2014 03:29:00 +0200
Subject: split getMasterKeyId for the remaining use cases

Closes #549
---
 .../sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java')

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);
-- 
cgit v1.2.3