ref: deduplicate start scan activity method in ScanHistoryActivity.kt

openfoodfacts · Jul 19, 2021 · 3174809 · 3174809
1 parent 462397f
commit 3174809
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/...in/java/openfoodfacts/github/scrachx/openfood/features/scanhistory/ScanHistoryActivity.kt b/...in/java/openfoodfacts/github/scrachx/openfood/features/scanhistory/ScanHistoryActivity.kt
@@ -37,7 +37,6 @@ import openfoodfacts.github.scrachx.openfood.R
 import openfoodfacts.github.scrachx.openfood.analytics.SentryAnalytics
 import openfoodfacts.github.scrachx.openfood.databinding.ActivityHistoryScanBinding
 import openfoodfacts.github.scrachx.openfood.features.productlist.CreateCSVContract
-import openfoodfacts.github.scrachx.openfood.features.scan.ContinuousScanActivity
 import openfoodfacts.github.scrachx.openfood.features.shared.BaseActivity
 import openfoodfacts.github.scrachx.openfood.listeners.CommonBottomListenerInstaller.installBottomNavigation
 import openfoodfacts.github.scrachx.openfood.listeners.CommonBottomListenerInstaller.selectNavigationItem
@@ -95,7 +94,7 @@ class ScanHistoryActivity : BaseActivity() {
 
     private val cameraPermLauncher = registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
         if (isGranted) {
-            openContinuousScanActivity()
+            startScanActivity()
         }
     }
 
@@ -246,12 +245,6 @@ class ScanHistoryActivity : BaseActivity() {
     }
 
 
-    private fun openContinuousScanActivity() {
-        Intent(this, ContinuousScanActivity::class.java)
-            .apply { addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) }
-            .also { startActivity(it) }
-    }
-
     private fun exportAsCSV() {
         Toast.makeText(this, R.string.txt_exporting_history, Toast.LENGTH_LONG).show()
 
@@ -285,7 +278,7 @@ class ScanHistoryActivity : BaseActivity() {
                 cameraPermLauncher.launch(perm)
             }
         } else {
-            openContinuousScanActivity()
+            startScanActivity()
         }
     }
 

diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/shared/BaseActivity.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/shared/BaseActivity.kt
@@ -66,9 +66,9 @@ abstract class BaseActivity : AppCompatActivity() {
 
 
     protected open fun startScanActivity() {
-        startActivity(Intent(this, ContinuousScanActivity::class.java).apply {
-            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-        })
+        Intent(this, ContinuousScanActivity::class.java)
+            .apply { addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) }
+            .let { startActivity(it) }
     }
 }