Merge branch 'main' of github.com:ThePalaceProject/android-core into …

…feature/update-libraries
ThePalaceProject · Oct 26, 2023 · 63364ff · 63364ff
2 parents cb090f6 + 9603061
commit 63364ff
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 20 deletions.
diff --git a/README-CHANGES.xml b/README-CHANGES.xml
@@ -337,7 +337,7 @@
         <c:change date="2023-10-16T00:00:00+00:00" summary="Fixed crash when creating a library card."/>
       </c:changes>
     </c:release>
-    <c:release date="2023-10-24T09:32:44+00:00" is-open="true" ticket-system="org.nypl.jira" version="1.7.0">
+    <c:release date="2023-10-25T17:53:40+00:00" is-open="true" ticket-system="org.nypl.jira" version="1.7.0">
       <c:changes>
         <c:change date="2023-10-19T00:00:00+00:00" summary="Adjusted feed tabs navigation to keep the Catalog on the top of the screen."/>
         <c:change date="2023-10-23T00:00:00+00:00" summary="Use a new Material 3 theme."/>
@@ -346,7 +346,8 @@
             <c:ticket id="PP-610"/>
           </c:tickets>
         </c:change>
-        <c:change date="2023-10-24T09:32:44+00:00" summary="Enabled push notifications by default."/>
+        <c:change date="2023-10-24T00:00:00+00:00" summary="Enabled push notifications by default."/>
+        <c:change date="2023-10-25T17:53:40+00:00" summary="Fixed crash on Reader screen due to more than one Fragment instance."/>
       </c:changes>
     </c:release>
   </c:releases>

diff --git a/...epub-readium2/src/main/java/org/librarysimplified/viewer/epub/readium2/Reader2Activity.kt b/...epub-readium2/src/main/java/org/librarysimplified/viewer/epub/readium2/Reader2Activity.kt
@@ -193,25 +193,27 @@ class Reader2Activity : AppCompatActivity(R.layout.reader2) {
       WebView.setWebContentsDebuggingEnabled(true)
     }
 
-    this.readerFragment =
-      this.supportFragmentManager.fragmentFactory.instantiate(
-        this.classLoader,
-        SR2ReaderFragment::class.java.name
-      )
-    this.searchFragment =
-      this.supportFragmentManager.fragmentFactory.instantiate(
-        this.classLoader,
-        SR2SearchFragment::class.java.name
-      )
-    this.tocFragment =
-      this.supportFragmentManager.fragmentFactory.instantiate(
-        this.classLoader,
-        SR2TOCFragment::class.java.name
-      )
+    if (savedInstanceState == null) {
+      this.readerFragment =
+        this.supportFragmentManager.fragmentFactory.instantiate(
+          this.classLoader,
+          SR2ReaderFragment::class.java.name
+        )
+      this.searchFragment =
+        this.supportFragmentManager.fragmentFactory.instantiate(
+          this.classLoader,
+          SR2SearchFragment::class.java.name
+        )
+      this.tocFragment =
+        this.supportFragmentManager.fragmentFactory.instantiate(
+          this.classLoader,
+          SR2TOCFragment::class.java.name
+        )
 
-    this.supportFragmentManager.beginTransaction()
-      .add(R.id.reader2FragmentHost, this.readerFragment)
-      .commit()
+      this.supportFragmentManager.beginTransaction()
+        .add(R.id.reader2FragmentHost, this.readerFragment)
+        .commit()
+    }
   }
 
   override fun onStart() {