Merge pull request #6893 from seadowg/barcode-dismiss

Avoid crash when scanning barcode

Author: seadowg

androidshared/src/main/java/org/odk/collect/androidshared/ui/SnackbarUtils.kt

@@ -90,7 +90,7 @@ object SnackbarUtils {
 
             if (action != null) {
                 setAction(action.text) {
-                    action.listener.invoke()
+                    action.beforeDismiss.invoke()
                     dismiss()
                 }
             }
@@ -109,7 +109,7 @@ object SnackbarUtils {
         val action: Action? = null
     )
 
-    data class Action(val text: String, val listener: () -> Unit)
+    data class Action(val text: String, val beforeDismiss: () -> Unit = {})
 
     abstract class SnackbarPresenterObserver<T : Any?>(private val parentView: View) :
         Observer<Consumable<T>?> {

collect_app/src/main/java/org/odk/collect/android/fragments/BarCodeScannerFragment.kt

@@ -93,9 +93,7 @@ abstract class BarCodeScannerFragment : Fragment() {
                         duration = 2000,
                         action = SnackbarUtils.Action(
                             getString(org.odk.collect.strings.R.string.exit_scanning)
-                        ) {
-                            handleScanningResult(result)
-                        },
+                        ),
                         onDismiss = {
                             handleScanningResult(result)
                         }