...

app/src/main/AndroidManifest.xml

@@ -26,7 +26,7 @@
         android:label="@string/app_name"
         android:logo="@mipmap/logo"
         android:requestLegacyExternalStorage="true"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@mipmap/logo"
         android:supportsRtl="true"
         android:theme="@style/Theme.PdfReaderAllPdfReader"
         tools:targetApi="31">

app/src/main/java/com/base/pdfreaderallpdfreader/ui/main/MainActivity.kt

@@ -53,7 +53,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
         mainViewModel.initScannerLauncher(this)
         mainViewModel.handleActivityGmsScanResult = { imageUri, pdfUri ->
 
-            LogEx.logDebug(TAG, "pdfUri=$pdfUri")
+            LogEx.logDebug(TAG, "pdfUri=$pdfUri imageUri=$imageUri")
+
             val file = File(pdfUri.toString().replace("file://", ""))
             if (file.exists()) {
                 showDocumentRenameDialog(file.name,
@@ -136,8 +137,10 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
                 intent.flags = Intent.FLAG_GRANT_WRITE_URI_PERMISSION
 
                 launcher.launch(intent) {
-                    val uri = it.data?.data ?: Uri.EMPTY
-                    jumpUriPdf(uri)
+                    val uri = it.data?.data
+                    uri?.let {
+                        jumpUriPdf(uri)
+                    }
                 }
             } else {
                 showStoragePermission(launcher)

app/src/main/java/com/base/pdfreaderallpdfreader/ui/pdf/PdfMergeActivity.kt

@@ -55,12 +55,12 @@ class PdfMergeActivity : BaseActivity<ActivityPdfMergeBinding>() {
         }
         binding.tvBtnNext.setOnClickListener {
             verificationPasswordDialogs {
-
                 showDocumentRenameDialog(name = "Merge_${System.currentTimeMillis().toFormatTime2()}", okAction = { name ->
                     startActivity(Intent(this, PdfLoadingActivity::class.java).apply {
                         putExtra("doWhat", DO_MERGE_PDF)
                         putExtra("newPath", pdfViewModel.createNewPdfPath(this@PdfMergeActivity, name))
                     })
+                    finish()
                 })
 
             }
@@ -144,7 +144,6 @@ class PdfMergeActivity : BaseActivity<ActivityPdfMergeBinding>() {
                 LogEx.logDebug(TAG, "items ${it.path}")
             }
 
-//            adapter.items = mergePdfList
         }
 
         mergePdfList.let { adapter.submitList(it) }