From 79f69f2fcee67e347d1b072ced74947393e144bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 1 Aug 2014 00:38:36 +0200
Subject: Start fixing CachedPublicKeyRing

---
 .../keychain/ui/EncryptAsymmetricFragment.java     | 30 ++++++++++++----------
 1 file changed, 17 insertions(+), 13 deletions(-)

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

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
index dc0510189..eb807792b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
@@ -31,11 +31,14 @@ import android.widget.Button;
 
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.pgp.KeyRing;
+import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
 import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
 import org.sufficientlysecure.keychain.provider.CachedPublicKeyRing;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.util.Notify;
 
 import java.util.Vector;
 
@@ -195,22 +198,23 @@ public class EncryptAsymmetricFragment extends Fragment {
             mMainUserIdRest.setText("");
         } else {
             // See if we can get a user_id from a unified query
-            String[] userId;
             try {
-                userId = mProviderHelper.getCachedPublicKeyRing(
+                String[] userIdSplit = mProviderHelper.getCachedPublicKeyRing(
                         KeyRings.buildUnifiedKeyRingUri(mSecretKeyId)).getSplitPrimaryUserIdWithFallback();
+
+                if (userIdSplit[0] != null) {
+                    mMainUserId.setText(userIdSplit[0]);
+                } else {
+                    mMainUserId.setText(R.string.user_id_no_name);
+                }
+                if (userIdSplit[1] != null) {
+                    mMainUserIdRest.setText(userIdSplit[1]);
+                } else {
+                    mMainUserIdRest.setText(getString(R.string.label_key_id) + ": "
+                            + PgpKeyHelper.convertKeyIdToHex(mSecretKeyId));
+                }
             } catch (PgpGeneralException e) {
-                userId = null;
-            }
-            if (userId != null && userId[0] != null) {
-                mMainUserId.setText(String.format("%#16x", Long.parseLong(userId[0])));
-            } else {
-                mMainUserId.setText(getResources().getString(R.string.user_id_no_name));
-            }
-            if (userId != null && userId[1] != null) {
-                mMainUserIdRest.setText(userId[1]);
-            } else {
-                mMainUserIdRest.setText("");
+                Notify.showNotify(getActivity(), "Key not found! This is a bug!", Notify.Style.ERROR);
             }
             mSign.setChecked(true);
         }
-- 
cgit v1.2.3