For #11901: Use safe call for collection item info.

mozilla-mobile · Jun 24, 2020 · f5ff9e4 · f5ff9e4
1 parent 673507d
commit f5ff9e4
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayViewHolder.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayViewHolder.kt
@@ -186,14 +186,16 @@ class TabTrayViewHolder(
                 super.onInitializeAccessibilityNodeInfo(host, info)
                 info?.let {
                     val initialInfo = info.collectionItemInfo
-                    info.collectionItemInfo = AccessibilityNodeInfo.CollectionItemInfo.obtain(
-                        newIndex,
-                        initialInfo.rowSpan,
-                        initialInfo.columnIndex,
-                        initialInfo.columnSpan,
-                        false,
-                        initialInfo.isSelected
-                    )
+                    info.collectionItemInfo = initialInfo?.let {
+                        AccessibilityNodeInfo.CollectionItemInfo.obtain(
+                            newIndex,
+                            it.rowSpan,
+                            it.columnIndex,
+                            it.columnSpan,
+                            false,
+                            it.isSelected
+                        )
+                    }
                 }
             }
         })