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

mozilla-mobile · Jun 24, 2020 · df9c135 · df9c135
1 parent f5ff9e4
commit df9c135
Showing 1 changed file with 5 additions and 6 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,14 @@ class TabTrayViewHolder(
             ) {
                 super.onInitializeAccessibilityNodeInfo(host, info)
                 info?.let {
-                    val initialInfo = info.collectionItemInfo
-                    info.collectionItemInfo = initialInfo?.let {
+                    info.collectionItemInfo = info.collectionItemInfo?.let { initialInfo ->
                         AccessibilityNodeInfo.CollectionItemInfo.obtain(
                             newIndex,
-                            it.rowSpan,
-                            it.columnIndex,
-                            it.columnSpan,
+                            initialInfo.rowSpan,
+                            initialInfo.columnIndex,
+                            initialInfo.columnSpan,
                             false,
-                            it.isSelected
+                            initialInfo.isSelected
                         )
                     }
                 }