Improve #2789

AndBible · Sep 14, 2023 · 62b2d53 · 62b2d53
1 parent fd3473a
commit 62b2d53
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -139,7 +139,8 @@
             android:name="net.bible.android.view.activity.bookmark.ManageLabels"
             android:configChanges="keyboardHidden|orientation|screenSize|locale"
             android:label="@string/manage_labels"
-            android:parentActivityName="net.bible.android.view.activity.bookmark.Bookmarks" />
+            android:parentActivityName="net.bible.android.view.activity.bookmark.Bookmarks"
+            />
         <activity
             android:name="net.bible.android.view.activity.navigation.ChooseDictionaryWord"
             android:configChanges="keyboardHidden|orientation|screenSize|locale"
@@ -236,7 +237,8 @@
             android:name="net.bible.android.view.activity.download.DownloadActivity"
             android:configChanges="keyboardHidden|orientation|screenSize|locale"
             android:label="@string/download"
-            android:parentActivityName="net.bible.android.view.activity.page.MainBibleActivity" />
+            android:parentActivityName=".StartupActivity"
+            />
         <activity
             android:name="net.bible.android.view.activity.download.ProgressStatus"
             android:configChanges="keyboardHidden|orientation|screenSize|locale"

diff --git a/app/src/main/java/net/bible/android/view/activity/navigation/ChooseDocument.kt b/app/src/main/java/net/bible/android/view/activity/navigation/ChooseDocument.kt
@@ -145,11 +145,11 @@ class ChooseDocument : DocumentSelectionBase(R.menu.choose_document_menu, R.menu
                 try {
                     if (downloadControl.checkDownloadOkay()) {
                         val handlerIntent = Intent(this, DownloadActivity::class.java)
-                        val requestCode = IntentHelper.UPDATE_SUGGESTED_DOCUMENTS_ON_FINISH
-                        startActivityForResult(handlerIntent, requestCode)
-
-                        // do not return here after download
-                        finish()
+                        lifecycleScope.launch {
+                            awaitIntent(handlerIntent)
+                            ABEventBus.post(MainBibleActivity.UpdateMainBibleActivityDocuments())
+                            reloadDocuments()
+                        }
                     }
                 } catch (e: Exception) {
                     Log.e(TAG, "Error sorting bookmarks", e)
@@ -166,6 +166,7 @@ class ChooseDocument : DocumentSelectionBase(R.menu.choose_document_menu, R.menu
                 lifecycleScope.launch {
                     awaitIntent(intent)
                     ABEventBus.post(MainBibleActivity.UpdateMainBibleActivityDocuments())
+                    reloadDocuments()
                 }
             }
         }