Adapt latest java-libkiwix wrapper

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     name: Automated tests
     strategy:
       matrix:
-        api-level: [ 21, 30, 33 ]
+        api-level: [ 24, 30, 33 ]
       fail-fast: false
     runs-on: macos-11
     steps:
@@ -79,16 +79,16 @@ jobs:
           path: screencap.png
 
       - name: create unit coverage
-        if: ${{ matrix.api-level==21 }}
+        if: ${{ matrix.api-level==24 }}
         run: ./gradlew testDebugUnitTest testCustomexampleDebugUnitTest
 
       - name: Upload coverage to Codecov
-        if: ${{ matrix.api-level==21 }}
+        if: ${{ matrix.api-level==24 }}
         uses: codecov/codecov-action@v3
 
       - name: Upload Coverage to GH-Actions
         uses: actions/upload-artifact@v3
-        if: ${{ matrix.api-level==21 }}
+        if: ${{ matrix.api-level==24 }}
         with:
           name: Tests Coverage Report
           path: |

README.md

@@ -13,7 +13,7 @@ is to make Wikipedia available offline. This is done by reading the
 content of a file in the ZIM format, a highly compressed open format
 with additional metadata.
 
-This is the version for Android, with support versions ranging from 5
+This is the version for Android, with support versions ranging from 7
 to 13 (like [mentioned
 here](https://github.com/kiwix/kiwix-android/blob/develop/buildSrc/src/main/kotlin/Config.kt)).
 
@@ -63,6 +63,7 @@ If you are interested in our custom apps they have their own repo [kiwix-android
 
 ## Libraries Used
 
+- [Libkiwix](https://github.com/kiwix/java-libkiwix) - Kotlin/Java binding for the core Kiwix library
 - [Dagger 2](https://github.com/google/dagger) - A fast dependency injector for Android and Java
 - [Retrofit](https://square.github.io/retrofit/) - Retrofit turns your REST API into a Java interface
 - [OkHttp](https://github.com/square/okhttp) - An HTTP+SPDY client for Android and Java applications

app/proguard-rules.pro

@@ -27,8 +27,11 @@
 
 -keepclassmembers class org.kiwix.videowebview.VideoEnabledWebView$JavascriptInterface { public *; }
 
-#keep everything in kiwixlib
--keep class org.kiwix.kiwixlib.** { *; }
+#keep everything in libkiwix
+-keep class org.kiwix.libkiwix.** { *; }
+
+#keep everything in libzim
+-keep class org.kiwix.libzim.** { *; }
 
 ## SimpleXml
 

app/src/androidTest/java/org/kiwix/kiwixmobile/BaseActivityTest.kt

@@ -21,7 +21,7 @@ package org.kiwix.kiwixmobile
 import android.Manifest.permission
 import android.content.Context
 import android.os.Build
-import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.core.app.ActivityScenario
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
 import androidx.test.rule.GrantPermissionRule
@@ -33,8 +33,7 @@ import org.kiwix.kiwixmobile.main.KiwixMainActivity
 
 @RunWith(AndroidJUnit4::class)
 abstract class BaseActivityTest {
-  @get:Rule
-  open var activityScenarioRule = ActivityScenarioRule(KiwixMainActivity::class.java)
+  open lateinit var activityScenario: ActivityScenario<KiwixMainActivity>
 
   private val permissions = if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
     arrayOf(

app/src/androidTest/java/org/kiwix/kiwixmobile/core/di/modules/TestJNIModule.kt

@@ -20,7 +20,7 @@ package org.kiwix.kiwixmobile.core.di.modules
 import dagger.Module
 import dagger.Provides
 import io.mockk.mockk
-import org.kiwix.kiwixlib.JNIKiwix
+import org.kiwix.libkiwix.JNIKiwix
 import javax.inject.Singleton
 
 /**

app/src/androidTest/java/org/kiwix/kiwixmobile/download/DownloadTest.kt

@@ -19,6 +19,7 @@ package org.kiwix.kiwixmobile.download
 
 import android.util.Log
 import androidx.core.content.edit
+import androidx.lifecycle.Lifecycle
 import androidx.preference.PreferenceManager
 import androidx.test.core.app.ActivityScenario
 import androidx.test.espresso.IdlingPolicies
@@ -73,11 +74,13 @@ class DownloadTest : BaseActivityTest() {
       putBoolean(SharedPreferenceUtil.IS_PLAY_STORE_BUILD, true)
       putBoolean(SharedPreferenceUtil.PREF_IS_TEST, true)
     }
+    activityScenario = ActivityScenario.launch(KiwixMainActivity::class.java).apply {
+      moveToState(Lifecycle.State.RESUMED)
+    }
   }
 
   @Test
   fun downloadTest() {
-    ActivityScenario.launch(KiwixMainActivity::class.java)
     BaristaSleepInteractions.sleep(TestUtils.TEST_PAUSE_MS.toLong())
     try {
       downloadRobot {

app/src/androidTest/java/org/kiwix/kiwixmobile/help/HelpFragmentTest.kt

@@ -17,6 +17,8 @@
  */
 package org.kiwix.kiwixmobile.help
 
+import androidx.lifecycle.Lifecycle
+import androidx.test.core.app.ActivityScenario
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.UiDevice
 import leakcanary.LeakAssertions
@@ -25,6 +27,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.kiwix.kiwixmobile.BaseActivityTest
 import org.kiwix.kiwixmobile.R
+import org.kiwix.kiwixmobile.main.KiwixMainActivity
 import org.kiwix.kiwixmobile.testutils.RetryRule
 import org.kiwix.kiwixmobile.testutils.TestUtils.closeSystemDialogs
 import org.kiwix.kiwixmobile.testutils.TestUtils.isSystemUINotRespondingDialogVisible
@@ -39,6 +42,9 @@ class HelpFragmentTest : BaseActivityTest() {
       }
       waitForIdle()
     }
+    activityScenario = ActivityScenario.launch(KiwixMainActivity::class.java).apply {
+      moveToState(Lifecycle.State.RESUMED)
+    }
   }
 
   @Rule
@@ -47,7 +53,7 @@ class HelpFragmentTest : BaseActivityTest() {
 
   @Test
   fun verifyHelpActivity() {
-    activityScenarioRule.scenario.onActivity {
+    activityScenario.onActivity {
       it.navigate(R.id.helpFragment)
     }
     help {

app/src/androidTest/java/org/kiwix/kiwixmobile/initial/download/InitialDownloadTest.kt

@@ -19,6 +19,7 @@
 package org.kiwix.kiwixmobile.initial.download
 
 import androidx.core.content.edit
+import androidx.lifecycle.Lifecycle
 import androidx.preference.PreferenceManager
 import androidx.test.core.app.ActivityScenario
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -63,11 +64,13 @@ class InitialDownloadTest : BaseActivityTest() {
       putBoolean(SharedPreferenceUtil.IS_PLAY_STORE_BUILD, true)
       putBoolean(SharedPreferenceUtil.PREF_IS_TEST, true)
     }
+    activityScenario = ActivityScenario.launch(KiwixMainActivity::class.java).apply {
+      moveToState(Lifecycle.State.RESUMED)
+    }
   }
 
   @Test
   fun initialDownloadTest() {
-    ActivityScenario.launch(KiwixMainActivity::class.java)
     BaristaSleepInteractions.sleep(TestUtils.TEST_PAUSE_MS_FOR_SEARCH_TEST.toLong())
     initialDownload {
       clickLibraryOnBottomNav()

app/src/androidTest/java/org/kiwix/kiwixmobile/intro/IntroFragmentTest.kt

@@ -18,7 +18,9 @@
 package org.kiwix.kiwixmobile.intro
 
 import androidx.core.content.edit
+import androidx.lifecycle.Lifecycle
 import androidx.preference.PreferenceManager
+import androidx.test.core.app.ActivityScenario
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.UiDevice
 import leakcanary.LeakAssertions
@@ -28,6 +30,7 @@ import org.junit.Test
 import org.kiwix.kiwixmobile.BaseActivityTest
 import org.kiwix.kiwixmobile.R
 import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil
+import org.kiwix.kiwixmobile.main.KiwixMainActivity
 import org.kiwix.kiwixmobile.testutils.RetryRule
 import org.kiwix.kiwixmobile.testutils.TestUtils.closeSystemDialogs
 import org.kiwix.kiwixmobile.testutils.TestUtils.isSystemUINotRespondingDialogVisible
@@ -40,7 +43,7 @@ class IntroFragmentTest : BaseActivityTest() {
 
   @Test
   fun viewIsSwipeableAndNavigatesToMain() {
-    activityScenarioRule.scenario.onActivity {
+    activityScenario.onActivity {
       it.navigate(R.id.introFragment)
     }
     intro(IntroRobot::swipeLeft) clickGetStarted {}
@@ -58,5 +61,8 @@ class IntroFragmentTest : BaseActivityTest() {
     PreferenceManager.getDefaultSharedPreferences(context).edit {
       putBoolean(SharedPreferenceUtil.PREF_SHOW_INTRO, true)
     }
+    activityScenario = ActivityScenario.launch(KiwixMainActivity::class.java).apply {
+      moveToState(Lifecycle.State.RESUMED)
+    }
   }
 }

app/src/androidTest/java/org/kiwix/kiwixmobile/main/TopLevelDestinationTest.kt

@@ -18,6 +18,7 @@
 package org.kiwix.kiwixmobile.main
 
 import androidx.core.content.edit
+import androidx.lifecycle.Lifecycle
 import androidx.preference.PreferenceManager
 import androidx.test.core.app.ActivityScenario
 import androidx.test.platform.app.InstrumentationRegistry
@@ -59,11 +60,13 @@ class TopLevelDestinationTest : BaseActivityTest() {
       putBoolean(SharedPreferenceUtil.PREF_IS_TEST, true)
       putBoolean(SharedPreferenceUtil.PREF_EXTERNAL_LINK_POPUP, true)
     }
+    activityScenario = ActivityScenario.launch(KiwixMainActivity::class.java).apply {
+      moveToState(Lifecycle.State.RESUMED)
+    }
   }
 
   @Test
   fun testTopLevelDestination() {
-    ActivityScenario.launch(KiwixMainActivity::class.java)
     topLevel {
       clickReaderOnBottomNav {
       }

app/src/androidTest/java/org/kiwix/kiwixmobile/mimetype/MimeTypeTest.kt

@@ -19,17 +19,20 @@
 package org.kiwix.kiwixmobile.mimetype
 
 import androidx.core.content.edit
+import androidx.lifecycle.Lifecycle
 import androidx.preference.PreferenceManager
+import androidx.test.core.app.ActivityScenario
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.UiDevice
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.kiwix.kiwixlib.JNIKiwixReader
+import org.kiwix.libzim.Archive
 import org.kiwix.kiwixmobile.BaseActivityTest
 import org.kiwix.kiwixmobile.core.NightModeConfig
 import org.kiwix.kiwixmobile.core.reader.ZimFileReader
 import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil
+import org.kiwix.kiwixmobile.main.KiwixMainActivity
 import org.kiwix.kiwixmobile.testutils.TestUtils.closeSystemDialogs
 import org.kiwix.kiwixmobile.testutils.TestUtils.isSystemUINotRespondingDialogVisible
 import java.io.File
@@ -50,6 +53,9 @@ class MimeTypeTest : BaseActivityTest() {
       putBoolean(SharedPreferenceUtil.PREF_SHOW_INTRO, false)
       putBoolean(SharedPreferenceUtil.PREF_WIFI_ONLY, false)
     }
+    activityScenario = ActivityScenario.launch(KiwixMainActivity::class.java).apply {
+      moveToState(Lifecycle.State.RESUMED)
+    }
   }
 
   @Test
@@ -70,23 +76,32 @@ class MimeTypeTest : BaseActivityTest() {
     }
     val zimFileReader = ZimFileReader(
       zimFile,
-      JNIKiwixReader(zimFile.canonicalPath),
+      Archive(zimFile.canonicalPath),
       NightModeConfig(SharedPreferenceUtil(context), context)
     )
     zimFileReader.getRandomArticleUrl()?.let {
-      val mimeType = zimFileReader.readContentAndMimeType(it)
-      if (mimeType.contains("^([^ ]+).*$") || mimeType.contains(";")) {
+      val mimeType = zimFileReader.getMimeTypeFromUrl(it)
+      if (mimeType?.contains("^([^ ]+).*$") == true || mimeType?.contains(";") == true) {
         Assert.fail(
           "Unable to get mime type from zim file. File = " +
             " $zimFile and url of article = $it"
         )
       }
-    }.also {
-      zimFileReader.dispose()
     } ?: kotlin.run {
       Assert.fail("Unable to get article from zim file $zimFile")
-    }.also {
-      zimFileReader.dispose()
     }
+    // test mimetypes for some actual url
+    Assert.assertEquals(
+      "text/html",
+      zimFileReader.getMimeTypeFromUrl("https://kiwix.app/A/index.html")
+    )
+    Assert.assertEquals(
+      "text/css",
+      zimFileReader.getMimeTypeFromUrl("https://kiwix.app/-/assets/style1.css")
+    )
+    // test mimetype for invalid url
+    Assert.assertEquals(null, zimFileReader.getMimeTypeFromUrl("https://kiwix.app/A/test.html"))
+    // dispose the ZimFileReader
+    zimFileReader.dispose()
   }
 }

app/src/androidTest/java/org/kiwix/kiwixmobile/nav/destination/library/LocalLibraryTest.kt

@@ -20,6 +20,7 @@ package org.kiwix.kiwixmobile.nav.destination.library
 
 import androidx.core.content.ContextCompat
 import androidx.core.content.edit
+import androidx.lifecycle.Lifecycle
 import androidx.preference.PreferenceManager
 import androidx.test.core.app.ActivityScenario
 import androidx.test.platform.app.InstrumentationRegistry
@@ -65,11 +66,14 @@ class LocalLibraryTest : BaseActivityTest() {
       // manage external storage permission dialog on android 11 and above
       putBoolean(SharedPreferenceUtil.PREF_MANAGE_EXTERNAL_FILES, false)
     }
+    activityScenario = ActivityScenario.launch(KiwixMainActivity::class.java).apply {
+      moveToState(Lifecycle.State.RESUMED)
+    }
   }
 
   @Test
   fun testLocalLibrary() {
-    ActivityScenario.launch(KiwixMainActivity::class.java).onActivity {
+    activityScenario.onActivity {
       it.navigate(R.id.libraryFragment)
     }
     library {

app/src/androidTest/java/org/kiwix/kiwixmobile/note/NoteFragmentTest.kt

@@ -18,6 +18,8 @@
 
 package org.kiwix.kiwixmobile.note
 
+import androidx.lifecycle.Lifecycle
+import androidx.test.core.app.ActivityScenario
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.UiDevice
 import leakcanary.LeakAssertions
@@ -26,6 +28,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.kiwix.kiwixmobile.BaseActivityTest
 import org.kiwix.kiwixmobile.R
+import org.kiwix.kiwixmobile.main.KiwixMainActivity
 import org.kiwix.kiwixmobile.testutils.RetryRule
 import org.kiwix.kiwixmobile.testutils.TestUtils.closeSystemDialogs
 import org.kiwix.kiwixmobile.testutils.TestUtils.isSystemUINotRespondingDialogVisible
@@ -44,11 +47,14 @@ class NoteFragmentTest : BaseActivityTest() {
       }
       waitForIdle()
     }
+    activityScenario = ActivityScenario.launch(KiwixMainActivity::class.java).apply {
+      moveToState(Lifecycle.State.RESUMED)
+    }
   }
 
   @Test
   fun verifyNoteFragment() {
-    activityScenarioRule.scenario.onActivity {
+    activityScenario.onActivity {
       it.navigate(R.id.notesFragment)
     }
     note {

app/src/androidTest/java/org/kiwix/kiwixmobile/page/history/NavigationHistoryTest.kt

@@ -20,6 +20,7 @@ package org.kiwix.kiwixmobile.page.history
 
 import androidx.core.content.edit
 import androidx.core.net.toUri
+import androidx.lifecycle.Lifecycle
 import androidx.preference.PreferenceManager
 import androidx.test.core.app.ActivityScenario
 import androidx.test.internal.runner.junit4.statement.UiThreadStatement
@@ -63,11 +64,14 @@ class NavigationHistoryTest : BaseActivityTest() {
       putBoolean(SharedPreferenceUtil.PREF_WIFI_ONLY, false)
       putBoolean(SharedPreferenceUtil.PREF_IS_TEST, true)
     }
+    activityScenario = ActivityScenario.launch(KiwixMainActivity::class.java).apply {
+      moveToState(Lifecycle.State.RESUMED)
+    }
   }
 
   @Test
   fun navigationHistoryDialogTest() {
-    ActivityScenario.launch(KiwixMainActivity::class.java).onActivity {
+    activityScenario.onActivity {
       kiwixMainActivity = it
       kiwixMainActivity.navigate(R.id.libraryFragment)
     }