From 4bd28930c3a27797249f5a855e73d7254a4bb032 Mon Sep 17 00:00:00 2001
From: qnga <32197639+qnga@users.noreply.github.com>
Date: Fri, 12 Jan 2024 16:47:54 +0100
Subject: [PATCH] Fix import through intent (#438)

---
 test-app/src/main/AndroidManifest.xml         |  2 +-
 .../org/readium/r2/testapp/MainActivity.kt    |  4 ----
 .../org/readium/r2/testapp/MainViewModel.kt   |  6 -----
 ...ispatcherActivity.kt => ImportActivity.kt} | 22 ++++++++++++-------
 4 files changed, 15 insertions(+), 19 deletions(-)
 rename test-app/src/main/java/org/readium/r2/testapp/utils/{R2DispatcherActivity.kt => ImportActivity.kt} (85%)

diff --git a/test-app/src/main/AndroidManifest.xml b/test-app/src/main/AndroidManifest.xml
index 389acd0491..aca4c69a11 100644
--- a/test-app/src/main/AndroidManifest.xml
+++ b/test-app/src/main/AndroidManifest.xml
@@ -43,7 +43,7 @@
         </activity>
 
         <activity
-            android:name=".utils.R2DispatcherActivity"
+            android:name=".utils.ImportActivity"
             android:launchMode="singleInstance"
             android:noHistory="true"
             android:theme="@android:style/Theme.NoDisplay"
diff --git a/test-app/src/main/java/org/readium/r2/testapp/MainActivity.kt b/test-app/src/main/java/org/readium/r2/testapp/MainActivity.kt
index eab4b57c6c..44eed6d87c 100644
--- a/test-app/src/main/java/org/readium/r2/testapp/MainActivity.kt
+++ b/test-app/src/main/java/org/readium/r2/testapp/MainActivity.kt
@@ -28,10 +28,6 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        intent.data?.let {
-            viewModel.importPublicationFromStorage(it)
-        }
-
         val navView: BottomNavigationView = findViewById(R.id.nav_view)
         val navHostFragment =
             supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment
diff --git a/test-app/src/main/java/org/readium/r2/testapp/MainViewModel.kt b/test-app/src/main/java/org/readium/r2/testapp/MainViewModel.kt
index f6e4d319a0..199879229c 100644
--- a/test-app/src/main/java/org/readium/r2/testapp/MainViewModel.kt
+++ b/test-app/src/main/java/org/readium/r2/testapp/MainViewModel.kt
@@ -7,14 +7,12 @@
 package org.readium.r2.testapp
 
 import android.app.Application
-import android.net.Uri
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.receiveAsFlow
-import kotlinx.coroutines.launch
 import org.readium.r2.testapp.domain.Bookshelf
 import org.readium.r2.testapp.domain.ImportError
 import org.readium.r2.testapp.utils.EventChannel
@@ -34,10 +32,6 @@ class MainViewModel(
             .onEach { sendImportFeedback(it) }
             .launchIn(viewModelScope)
     }
-    fun importPublicationFromStorage(uri: Uri) =
-        viewModelScope.launch {
-            app.bookshelf.importPublicationFromStorage(uri)
-        }
 
     private fun sendImportFeedback(event: Bookshelf.Event) {
         when (event) {
diff --git a/test-app/src/main/java/org/readium/r2/testapp/utils/R2DispatcherActivity.kt b/test-app/src/main/java/org/readium/r2/testapp/utils/ImportActivity.kt
similarity index 85%
rename from test-app/src/main/java/org/readium/r2/testapp/utils/R2DispatcherActivity.kt
rename to test-app/src/main/java/org/readium/r2/testapp/utils/ImportActivity.kt
index df9bcc3e60..6b327930eb 100644
--- a/test-app/src/main/java/org/readium/r2/testapp/utils/R2DispatcherActivity.kt
+++ b/test-app/src/main/java/org/readium/r2/testapp/utils/ImportActivity.kt
@@ -15,28 +15,34 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import androidx.core.content.IntentCompat
+import org.readium.r2.testapp.Application
 import org.readium.r2.testapp.MainActivity
 import timber.log.Timber
 
-class R2DispatcherActivity : Activity() {
+class ImportActivity : Activity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        dispatchIntent(intent)
+
+        importPublication(intent)
+
+        val newIntent = Intent(this, MainActivity::class.java).apply {
+            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+        }
+        startActivity(newIntent)
+
         finish()
     }
 
-    private fun dispatchIntent(intent: Intent) {
+    private fun importPublication(intent: Intent) {
         val uri = uriFromIntent(intent)
             ?: run {
                 Timber.d("Got an empty intent.")
                 return
             }
-        val newIntent = Intent(this, MainActivity::class.java).apply {
-            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-            data = uri
-        }
-        startActivity(newIntent)
+
+        val app = application as Application
+        app.bookshelf.importPublicationFromStorage(uri)
     }
 
     private fun uriFromIntent(intent: Intent): Uri? =