Merge branch 'release/2.0.11' into 'master'

Release 2.0.11

See merge request mobile/android/AndroidDocumentScanner!41

Author: javiergm1983

app/src/main/java/com/example/documentscanner/MainActivity.kt

@@ -2,19 +2,17 @@ package com.example.documentscanner
 
 import android.content.Intent
 import android.os.Bundle
-import android.os.Handler
-import android.os.PersistableBundle
+import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
 import nz.mega.documentscanner.DocumentScannerActivity
 
 class MainActivity : AppCompatActivity() {
 
-    override fun onCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {
-        super.onCreate(savedInstanceState, persistentState)
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-
-        Handler().postDelayed({
+        findViewById<Button>(R.id.btnPick).setOnClickListener {
             startActivity(Intent(this, DocumentScannerActivity::class.java))
-        }, 2000L)
+        }
     }
 }

build.gradle

@@ -1,7 +1,7 @@
 buildscript {
     ext {
-        versionCode = 17
-        versionName = "2.0.10"
+        versionCode = 18
+        versionName = "2.0.11"
         compileSdkVersion = 29
         minSdkVersion = 21
         group = "com.github.meganz"

documentscanner/src/main/java/nz/mega/documentscanner/DocumentScannerViewModel.kt

@@ -157,8 +157,9 @@ class DocumentScannerViewModel : ViewModel() {
                     document.value?.pages?.add(page)
                 } else {
                     document.value?.pages?.add(retakePosition, page)
-                    retakePosition = NO_POSITION
                 }
+                // Reset retakePosition after the page is added to avoid retakePosition causes the add page is incorrect.
+                retakePosition = NO_POSITION
 
                 bitmap.recycle()
                 transformBitmap?.recycle()
@@ -242,13 +243,21 @@ class DocumentScannerViewModel : ViewModel() {
     }
 
     /**
-     * Retake scan page
+     * Retake scan page, only update the retakePage, don't delete the current page.
      *
      * @param position Page position to be retaken. Default value is the current position
      */
     fun retakePage(position: Int = currentPagePosition.value ?: 0) {
         retakePosition = position
-        deletePage(position)
+    }
+
+    /**
+     * Delete the previous page if retaking the page
+     */
+    fun deletePageForRetake() {
+        if (retakePosition != NO_POSITION){
+            deletePage(retakePosition)
+        }
     }
 
     /**
@@ -313,7 +322,7 @@ class DocumentScannerViewModel : ViewModel() {
     }
 
     private fun updateDocumentFileType() {
-        if (document.value?.pages?.size ?: 0 > 1) {
+        if ((document.value?.pages?.size ?: 0) > 1) {
             document.value?.fileType = FileType.PDF
         }
     }

documentscanner/src/main/java/nz/mega/documentscanner/camera/CameraFragment.kt

@@ -166,6 +166,7 @@ class CameraFragment : Fragment() {
     }
 
     private fun takePicture() {
+        viewModel.deletePageForRetake()
         showProgress(true)
         imageAnalyzer?.clearAnalyzer()
         imageCapture?.takePicture(cameraExecutor, buildImageCapturedCallback())