From 9e379fd19c2b6caf4cfcba2c485a0380eb971e88 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Fri, 13 Mar 2015 14:37:52 +0100
Subject: improve error handling in LinkedIdViewFragment, disable unknown
 identity types (for now?)

---
 .../keychain/ui/adapter/LinkedIdsAdapter.java      |  4 ++-
 .../keychain/ui/linked/LinkedIdViewFragment.java   | 31 +++++++++++++++++-----
 2 files changed, 27 insertions(+), 8 deletions(-)

(limited to 'OpenKeychain/src/main/java')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/LinkedIdsAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/LinkedIdsAdapter.java
index 577fb1765..9eb919c85 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/LinkedIdsAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/LinkedIdsAdapter.java
@@ -61,14 +61,16 @@ public class LinkedIdsAdapter extends UserAttributesAdapter {
         mShowCertification = showCertification;
 
         if (expander != null) {
+            expander.setVisibility(View.GONE);
+            /* don't show an expander (maybe in some sort of advanced view?)
             mExpander = expander;
-            mExpander.setVisibility(View.GONE);
             mExpander.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View v) {
                     showUnfiltered();
                 }
             });
+            */
         }
     }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java
index 98adb5889..9501e454c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java
@@ -48,6 +48,8 @@ import org.sufficientlysecure.keychain.ui.adapter.UserIdsAdapter;
 import org.sufficientlysecure.keychain.ui.linked.LinkedIdViewFragment.ViewHolder.VerifyState;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils.State;
+import org.sufficientlysecure.keychain.ui.util.Notify;
+import org.sufficientlysecure.keychain.ui.util.Notify.Style;
 import org.sufficientlysecure.keychain.ui.widget.CertListWidget;
 import org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner;
 import org.sufficientlysecure.keychain.util.Log;
@@ -127,10 +129,10 @@ public class LinkedIdViewFragment extends Fragment implements
         switch (loader.getId()) {
             case LOADER_ID_LINKED_ID:
 
-                // TODO proper error reporting and null checks here!
-
                 if (!cursor.moveToFirst()) {
-                    Log.e(Constants.TAG, "error");
+                    Notify.createNotify(getActivity(), "Error loading identity!",
+                            Notify.LENGTH_LONG, Style.ERROR).show();
+                    finishFragment();
                     break;
                 }
 
@@ -148,14 +150,22 @@ public class LinkedIdViewFragment extends Fragment implements
                     }
 
                 } catch (IOException e) {
-                    e.printStackTrace();
-                    throw new AssertionError("reconstruction of user attribute must succeed!");
+                    Log.e(Constants.TAG, "error parsing identity", e);
+                    Notify.createNotify(getActivity(), "Error parsing identity!",
+                            Notify.LENGTH_LONG, Style.ERROR).show();
+                    finishFragment();
                 }
 
                 break;
         }
     }
 
+    public void finishFragment() {
+        FragmentManager manager = getFragmentManager();
+        manager.removeOnBackStackChangedListener(this);
+        manager.popBackStack("linked_id", FragmentManager.POP_BACK_STACK_INCLUSIVE);
+    }
+
     public interface OnIdentityLoadedListener {
         public void onIdentityLoaded();
     }
@@ -296,6 +306,13 @@ public class LinkedIdViewFragment extends Fragment implements
             }
         }
 
+        void showVerifyingContainer(boolean show) {
+            if (vVerifyingContainer.getDisplayedChild() == (show ? 1 : 0)) {
+                return;
+            }
+            vVerifyingContainer.setDisplayedChild(show ? 1 : 0);
+        }
+
         void showButton(int which) {
             if (vButtonSwitcher.getDisplayedChild() == which) {
                 return;
@@ -335,7 +352,7 @@ public class LinkedIdViewFragment extends Fragment implements
 
             mViewHolder.showButton(0);
             mViewHolder.vKeySpinner.setVisibility(View.GONE);
-            mViewHolder.vVerifyingContainer.setDisplayedChild(0);
+            mViewHolder.showVerifyingContainer(false);
             return;
         }
 
@@ -348,7 +365,7 @@ public class LinkedIdViewFragment extends Fragment implements
         manager.beginTransaction().addToBackStack("verification").commit();
         manager.executePendingTransactions();
         manager.addOnBackStackChangedListener(this);
-        mViewHolder.vVerifyingContainer.setDisplayedChild(1);
+        mViewHolder.showVerifyingContainer(true);
 
     }
 
-- 
cgit v1.2.3