diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 2ac323a353f9..830d03058859 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -194,7 +194,7 @@ dependencies {
 }
 
 android {
-    compileSdk = 30
+    compileSdk = 31
 
     testBuildType = obtainTestBuildType()
 
diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/productlist/ProductListActivity.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/productlist/ProductListActivity.kt
index 06007191583d..c7fcf4c8ff4e 100644
--- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/productlist/ProductListActivity.kt
+++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/productlist/ProductListActivity.kt
@@ -343,7 +343,7 @@ class ProductListActivity : BaseActivity(), SwipeController.Actions {
 
     @RequiresApi(Build.VERSION_CODES.KITKAT)
     val fileWriterLauncher = registerForActivityResult(CreateCSVContract())
-    { writeListToFile(this, productList, it) }
+    { uri -> uri?.let { writeListToFile(this, productList, it) } }
 
     private fun exportAsCSV() {
         Toast.makeText(this, R.string.txt_exporting_your_listed_products, Toast.LENGTH_LONG).show()
diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/simplescan/SimpleScanActivityContract.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/simplescan/SimpleScanActivityContract.kt
index 5f2bc0bc93cf..f335ad4d0bbe 100644
--- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/simplescan/SimpleScanActivityContract.kt
+++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/simplescan/SimpleScanActivityContract.kt
@@ -5,22 +5,24 @@ import android.content.Context
 import android.content.Intent
 import androidx.activity.result.contract.ActivityResultContract
 
+/**
+ * Returns a string containing the product barcode.
+ */
 class SimpleScanActivityContract : ActivityResultContract<Unit, String?>() {
 
     companion object {
         const val KEY_SCANNED_BARCODE = "scanned_barcode"
     }
 
-    override fun createIntent(context: Context, input: Unit?): Intent {
+    override fun createIntent(context: Context, input: Unit): Intent {
         return Intent(context, SimpleScanActivity::class.java)
     }
 
     override fun parseResult(resultCode: Int, intent: Intent?): String? {
         val bundle = intent?.extras ?: return null
-        return if (resultCode == Activity.RESULT_OK && bundle.containsKey(KEY_SCANNED_BARCODE)) {
-            bundle.getString(KEY_SCANNED_BARCODE, null)
-        } else {
-            null
+        if (resultCode == Activity.RESULT_OK && bundle.containsKey(KEY_SCANNED_BARCODE)) {
+            return bundle.getString(KEY_SCANNED_BARCODE, null)
         }
+        return null
     }
 }