From 185b5599e4a33fb55d04dd5ab4a03c924fcad09a Mon Sep 17 00:00:00 2001
From: VaiTon <eyadlorenzo@gmail.com>
Date: Tue, 27 Jul 2021 18:31:43 +0200
Subject: [PATCH] fix: do not access binding if cancelled

Closes OPENFOODFACTS-ANDROID-3XY
---
 .../openfood/features/scan/ContinuousScanActivity.kt     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/scan/ContinuousScanActivity.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/scan/ContinuousScanActivity.kt
index 2315d76a78cd..f2e28d864911 100644
--- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/scan/ContinuousScanActivity.kt
+++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/scan/ContinuousScanActivity.kt
@@ -210,6 +210,7 @@ class ContinuousScanActivity : BaseActivity(), IProductView {
             val productState = try {
                 client.getProductStateFull(barcode, userAgent = Utils.HEADER_USER_AGENT_SCAN)
             } catch (err: Exception) {
+                if (!isActive) return@launch
                 // A network error happened
                 if (err is IOException) {
                     hideAllViews()
@@ -222,10 +223,10 @@ class ContinuousScanActivity : BaseActivity(), IProductView {
                     binding.quickViewProgress.visibility = View.GONE
                     binding.quickViewProgressText.visibility = View.GONE
 
-                    Toast.makeText(this@ContinuousScanActivity, R.string.txtConnectionError, Toast.LENGTH_LONG).run {
-                        setGravity(CENTER, 0, 0)
-                        show()
-                    }
+                    Toast.makeText(this@ContinuousScanActivity, R.string.txtConnectionError, Toast.LENGTH_LONG)
+                        .apply { setGravity(CENTER, 0, 0) }
+                        .show()
+
                     Log.w(LOG_TAG, err.message, err)
                 }
                 return@launch