Fix #3314 (Compare does not work as it should)

AndBible · Sep 5, 2024 · 5209744 · 5209744
1 parent 7480217
commit 5209744
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/app/src/main/java/net/bible/android/control/page/CurrentPageBase.kt b/app/src/main/java/net/bible/android/control/page/CurrentPageBase.kt
@@ -28,6 +28,7 @@ import net.bible.android.view.activity.base.Dialogs
 import net.bible.service.common.CommonUtils
 import net.bible.service.download.FakeBookFactory
 import net.bible.service.download.doesNotExist
+import net.bible.service.download.isPseudoBook
 import net.bible.service.download.isRemoved
 import net.bible.service.history.AddHistoryItem
 import net.bible.service.sword.DocumentNotFound
@@ -191,7 +192,9 @@ abstract class CurrentPageBase protected constructor(
                     _currentDocument = real
                 }
             }
-            if (_currentDocument?.isRemoved == true) return CommonUtils.defaultBible
+            if (_currentDocument?.isRemoved == true) {
+                _currentDocument = getDefaultBook()
+            }
             return _currentDocument
         }
 

diff --git a/app/src/main/java/net/bible/service/download/FakeBookFactory.kt b/app/src/main/java/net/bible/service/download/FakeBookFactory.kt
@@ -131,6 +131,7 @@ Encoding=UTF-8
 Category=Generic Books
 LCSH=Bible--Commentaries.
 AndBibleIsStudyPad=1
+AndBibleSpecial=1
 Versification=KJVA"""
 
     private val COMPARE_DUMMY_CONF get() = """[Compare]
@@ -140,6 +141,7 @@ Category=Commentaries
 Feature=StrongsNumbers
 Encoding=UTF-8
 LCSH=Bible--Commentaries.
+AndBibleSpecial=1
 Versification=KJVA"""
 
 
@@ -149,6 +151,7 @@ Abbreviation=${application.getString(R.string.multi_abbreviation)}
 Category=Generic Books
 Encoding=UTF-8
 LCSH=Bible--Commentaries.
+AndBibleSpecial=1
 Versification=KJVA"""
 
     private val MY_NOTE_DUMMY_CONF get() = """[MyNote]
@@ -158,6 +161,7 @@ Category=Commentaries
 Feature=StrongsNumbers
 Encoding=UTF-8
 LCSH=Bible--Commentaries.
+AndBibleSpecial=1
 Versification=KJVA"""
 
     private fun doesNotExistConf(id: String, type: BookCategory) = """[$id]
@@ -188,6 +192,7 @@ Versification=KJVA"""
 }
 
 val Book.isPseudoBook get() = bookMetaData.getProperty("AndBiblePseudoBook") != null
+val Book.isSpecial get() = bookMetaData.getProperty("AndBibleSpecial") != null
 val Book.isStudyPad get() = bookMetaData.getProperty("AndBibleIsStudyPad") != null
 val Book.doesNotExist get() = bookMetaData.getProperty("AndBibleDoesNotExist") != null
-val Book.isRemoved get() = Books.installed().getBook(initials) == null
+val Book.isRemoved get() = !isSpecial && Books.installed().getBook(initials) == null