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

mcarare · Jun 24, 2020 · c4a9dc4 · c4a9dc4
1 parent 673507d
commit c4a9dc4
Showing 1 changed file with 10 additions and 9 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
@@ -185,15 +185,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 = info.collectionItemInfo?.let { initialInfo ->
+                        AccessibilityNodeInfo.CollectionItemInfo.obtain(
+                            newIndex,
+                            initialInfo.rowSpan,
+                            initialInfo.columnIndex,
+                            initialInfo.columnSpan,
+                            false,
+                            initialInfo.isSelected
+                        )
+                    }
                 }
             }
         })