Prevent crash

bphd · Dec 24, 2019 · 3343d5a · 3343d5a
1 parent 7b10f68
commit 3343d5a
Showing 1 changed file with 40 additions and 39 deletions.
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -422,53 +422,54 @@ else if ("end".equals(subject_ellipsize))
                         tvSubject.setEllipsize(TextUtils.TruncateAt.MIDDLE);
             }
 
-            view.setAccessibilityDelegate(new View.AccessibilityDelegate() {
-                @Override
-                public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) {
-                    super.onInitializeAccessibilityNodeInfo(host, info);
+            if (view != null)
+                view.setAccessibilityDelegate(new View.AccessibilityDelegate() {
+                    @Override
+                    public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) {
+                        super.onInitializeAccessibilityNodeInfo(host, info);
 
-                    TupleMessageEx message = getMessage();
-                    if (message == null)
-                        return;
+                        TupleMessageEx message = getMessage();
+                        if (message == null)
+                            return;
 
-                    if (ibExpander.getVisibility() == View.VISIBLE) {
-                        boolean expanded = properties.getValue("expanded", message.id);
-                        info.addAction(new AccessibilityNodeInfo.AccessibilityAction(R.id.ibExpander,
-                                context.getString(expanded ? R.string.title_accessibility_collapse : R.string.title_accessibility_expand)));
-                    }
+                        if (ibExpander.getVisibility() == View.VISIBLE) {
+                            boolean expanded = properties.getValue("expanded", message.id);
+                            info.addAction(new AccessibilityNodeInfo.AccessibilityAction(R.id.ibExpander,
+                                    context.getString(expanded ? R.string.title_accessibility_collapse : R.string.title_accessibility_expand)));
+                        }
 
-                    if (ibAvatar.getVisibility() == View.VISIBLE && ibAvatar.isEnabled())
-                        info.addAction(new AccessibilityNodeInfo.AccessibilityAction(R.id.ibAvatar,
-                                context.getString(R.string.title_accessibility_view_contact)));
+                        if (ibAvatar.getVisibility() == View.VISIBLE && ibAvatar.isEnabled())
+                            info.addAction(new AccessibilityNodeInfo.AccessibilityAction(R.id.ibAvatar,
+                                    context.getString(R.string.title_accessibility_view_contact)));
 
-                    if (ibFlagged.getVisibility() == View.VISIBLE && ibFlagged.isEnabled()) {
-                        int flagged = (message.count - message.unflagged);
-                        info.addAction(new AccessibilityNodeInfo.AccessibilityAction(R.id.ibFlagged,
-                                context.getString(flagged > 0 ? R.string.title_unflag : R.string.title_flag)));
+                        if (ibFlagged.getVisibility() == View.VISIBLE && ibFlagged.isEnabled()) {
+                            int flagged = (message.count - message.unflagged);
+                            info.addAction(new AccessibilityNodeInfo.AccessibilityAction(R.id.ibFlagged,
+                                    context.getString(flagged > 0 ? R.string.title_unflag : R.string.title_flag)));
+                        }
                     }
-                }
 
-                @Override
-                public boolean performAccessibilityAction(View host, int action, Bundle args) {
-                    TupleMessageEx message = getMessage();
-                    if (message == null)
-                        return false;
+                    @Override
+                    public boolean performAccessibilityAction(View host, int action, Bundle args) {
+                        TupleMessageEx message = getMessage();
+                        if (message == null)
+                            return false;
 
-                    switch (action) {
-                        case R.id.ibExpander:
-                            onToggleMessage(message);
-                            return true;
-                        case R.id.ibAvatar:
-                            onViewContact(message);
-                            return true;
-                        case R.id.ibFlagged:
-                            onToggleFlag(message);
-                            return true;
-                        default:
-                            return super.performAccessibilityAction(host, action, args);
+                        switch (action) {
+                            case R.id.ibExpander:
+                                onToggleMessage(message);
+                                return true;
+                            case R.id.ibAvatar:
+                                onViewContact(message);
+                                return true;
+                            case R.id.ibFlagged:
+                                onToggleFlag(message);
+                                return true;
+                            default:
+                                return super.performAccessibilityAction(host, action, args);
+                        }
                     }
-                }
-            });
+                });
         }
 
         private void ensureExpanded() {