Regex search

.github/workflows/build-apk.yml

@@ -17,14 +17,15 @@ jobs:
     environment: And Bible Builds
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 10 # so that recent tags can be found
+        submodules: true
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
         distribution: 'zulu'
-        java-version: '17'
+        java-version: '21'
 
     - name: Set up Node.js environment
       uses: actions/setup-node@v3

.github/workflows/jslint.yml

@@ -28,9 +28,10 @@ jobs:
   lint:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 10 # so that recent tags can be found
+          submodules: true
 
       - name: Set up Node.js environment
         uses: actions/setup-node@v3
@@ -52,9 +53,10 @@ jobs:
   unit-tests:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 10 # so that recent tags can be found
+          submodules: true
 
       - name: Set up Node.js environment
         uses: actions/setup-node@v3

.github/workflows/run-tests.yml

@@ -24,14 +24,15 @@ jobs:
   run-unit-tests:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 10 # so that recent tags can be found
+        submodules: true
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
         distribution: 'zulu'
-        java-version: '17'
+        java-version: '21'
 
     - name: Set up Node.js environment
       uses: actions/setup-node@v3
@@ -81,14 +82,15 @@ jobs:
   run-instrument-tests:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 10 # so that recent tags can be found
+        submodules: true
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
         distribution: 'zulu'
-        java-version: '17'
+        java-version: '21'
 
     - name: Set up Node.js environment
       uses: actions/setup-node@v3

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "jsword"]
+	path = jsword
+	url = [email protected]:AndBible/jsword.git

app/build.gradle.kts

@@ -38,7 +38,8 @@ val discreteFlavorName = "discrete"
 // This is the "standard" applicationId.
 // This value must remain the same as it has been since the original
 // release in 2010 for continuity of updates for existing users.
-val applicationIdStandard = "net.bible.android.activity"
+//val applicationIdStandard = "net.bible.android.activity"
+val applicationIdStandard = "net.bible.android.activity.next"
 // An alternative applicationId, to be used for the "discrete" flavor.
 val applicationIdDiscrete = "com.app.calculator"
 
@@ -142,7 +143,7 @@ android {
     /** these config values override those in AndroidManifest.xml.  Can also set versionCode and versionName */
     defaultConfig {
         applicationId = applicationIdStandard
-        minSdk = 23
+        minSdk = 26
         targetSdk = 34
         vectorDrawables.useSupportLibrary = true
         buildConfigField("String", "GitHash", "\"${getGitHash()}\"")
@@ -227,7 +228,6 @@ android {
 
         create("github") {
             dimension = dimDistributionChannelName
-            minSdk = 21
         }
     }
 
@@ -340,7 +340,6 @@ androidComponents {
 dependencies {
     val commonsTextVersion: String by rootProject.extra
     val jdomVersion: String by rootProject.extra
-    val jswordVersion: String by rootProject.extra
     val kotlinVersion: String by rootProject.extra
     val coroutinesVersion: String by rootProject.extra
     val kotlinxSerializationVersion: String by rootProject.extra
@@ -407,7 +406,7 @@ dependencies {
     implementation("org.apache.commons:commons-lang3:3.12.0") // make sure this is the same version that commons-text depends on
     implementation("org.apache.commons:commons-text:$commonsTextVersion")
 
-    implementation("com.github.AndBible:jsword:$jswordVersion") {
+    implementation(project(":jsword")) {
         exclude("org.apache.httpcomponents")
     }
 

app/src/main/java/net/bible/android/control/page/CurrentBiblePage.kt

@@ -202,12 +202,11 @@ class CurrentBiblePage(
         }
     }
 
-    //TODO allow japanese search - japanese bibles use smartcn which is not available
     /** can we enable the main menu search button
      */
     override val isSearchable: Boolean
-        get() = try { //TODO allow japanese search - japanese bibles use smartcn which is not available
-            !currentDocument!!.doesNotExist && "ja" != currentDocument!!.language.code
+        get() = try {
+            !currentDocument!!.doesNotExist
         } catch (e: Exception) {
             Log.w(TAG, "Missing language code", e)
             true

app/src/main/java/net/bible/android/view/activity/search/Search.kt

@@ -74,6 +74,7 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
                 R.id.allWords -> SearchType.ALL_WORDS
                 R.id.anyWord -> SearchType.ANY_WORDS
                 R.id.phrase -> SearchType.PHRASE
+                R.id.regex -> SearchType.REGEX
                 else -> {
                     Log.e(TAG, "Unexpected radio selection")
                     SearchType.ANY_WORDS

app/src/main/java/net/bible/android/view/activity/search/SearchItemAdapter.kt

@@ -55,12 +55,25 @@ val splitSearchTermsRegex = Regex("""\s+(?=(?:"(?:\\"|[^"])+"|[^"])+$)""")
 
 // Split the search terms on space characters that are not enclosed in double quotes
 // Eg: 'moses "burning bush"' -> "moses" and "burning bush"
-fun splitSearchTerms(searchTerms: String): List<String> = splitSearchTermsRegex.split(searchTerms)
+fun splitSearchTerms(searchTerms: String): List<String> {
+    if (isRegex(searchTerms)) {
+        return Arrays.asList(searchTerms)
+    }
+    return splitSearchTermsRegex.split(searchTerms)
+}
+
+fun isRegex(searchWord : String): Boolean {
+    return searchWord.startsWith('/') && searchWord.endsWith('/')
+}
 
 fun prepareSearchWord(searchWord_: String): String {
     // Need to clean up the search word itself before trying to find the searchWord in the text
     // Eg: '+"burning bush"' -> 'burning bush'
     var searchWord = searchWord_
+    if (isRegex(searchWord)) {
+        // It is a regex
+        return searchWord.substring(1, searchWord.length -1);
+    }
     searchWord =
         searchWord.replace("\"", "") // Remove quotes which indicate phrase searches
     searchWord = searchWord.replace("+", "") // Remove + which indicates AND searches
@@ -181,7 +194,9 @@ class SearchItemAdapter(
             val splitSearchTerms = splitSearchTerms(searchTerms)
             for (originalSearchWord in splitSearchTerms) {
                 var searchWord = prepareSearchWord(originalSearchWord)
-                searchWord = if (originalSearchWord.contains("*")) {
+                searchWord = if (isRegex(originalSearchWord)) {
+                    searchWord
+                } else if (originalSearchWord.contains("*")) {
                     "\\b$searchWord[\\w'\\-]*\\b" // Match whole words including with hyphons and apostrophes
                 } else {
                     "\\b$searchWord\\b"

app/src/main/java/net/bible/service/sword/SwordDocumentFacade.kt

@@ -164,10 +164,7 @@ object SwordDocumentFacade {
             return realDocument.epubBackend?.state?.isIndexed == true
         }
         val indexManager = IndexManagerFactory.getIndexManager()
-        if (indexManager.isIndexed(realDocument)) {
-            return true
-        }
-        return false
+        return indexManager.isIndexed(realDocument) && !indexManager.needsReindexing(realDocument)
     }
 
     /** this custom index creation has been optimised for slow, low memory devices

app/src/main/res/layout/search.xml

@@ -100,6 +100,10 @@
 					android:layout_width="wrap_content"
 					android:text="@string/search_phrase"
 					android:layout_height="wrap_content"/>
+				<RadioButton android:id="@+id/regex"
+					android:layout_width="wrap_content"
+					android:text="@string/search_regex"
+					android:layout_height="wrap_content"/>
 			</RadioGroup>
 		</LinearLayout>
 	</ScrollView>

app/src/main/res/values/strings.xml

@@ -80,6 +80,7 @@
     <string name="search_all_words">All words</string>
     <string name="search_any_word">Any word</string>
     <string name="search_phrase">Phrase</string>
+    <string name="search_regex">Regular Expression</string>
     <string name="search_fts_query">Raw query syntax</string>
     <string name="search_result_count">%d matches found</string>
     <string name="search_showing_first">Too many matches.  Showing first %d</string>

build.gradle.kts

@@ -28,13 +28,12 @@ buildscript {
     val jdomVersion by extra("2.0.6.1") // make sure this is same version as in jsword!
     val commonsTextVersion by extra("1.9") // 1.10.0 crashes on Android 5.1
     val kotlinxSerializationVersion by extra("1.6.3")
-    val sourceCompatibilityVersion by extra(JavaVersion.VERSION_17)
-    val targetCompatibilityVersion by extra(JavaVersion.VERSION_17)
-    val jvmTargetVersion by extra("17")
-    val jvmToolChainVersion by extra(17)
+    val sourceCompatibilityVersion by extra(JavaVersion.VERSION_21)
+    val targetCompatibilityVersion by extra(JavaVersion.VERSION_21)
+    val jvmTargetVersion by extra("21")
+    val jvmToolChainVersion by extra(21)
     val coreKtxVersion by extra("1.13.1")
     val sqliteAndroidVersion by extra("3.45.0")
-    val jswordVersion by extra("2.4.19")
 
 
     repositories {

settings.gradle.kts

@@ -15,4 +15,4 @@
  * If not, see http://www.gnu.org/licenses/.
  */
 
-include(":app")
+include(":app", ":jsword")