Merge pull request #2846 from kiwix/develop

Merging develop branch to master.

Author: kelson42

.github/workflows/coverage.yml

@@ -15,23 +15,26 @@ jobs:
   coverageReport:
     strategy:
       matrix:
-        api-level: [21, 21, 30]
+        api-level: [21,30]
       fail-fast: false
-    runs-on: macOS-latest
+    runs-on: macos-10.15
     steps:
       - name: checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
         with:
           fetch-depth: 1
 
       - name: create instrumentation coverage
-        uses: ReactiveCircus/[email protected]
+        uses: ReactiveCircus/[email protected]
+        env:
+          GRADLE_OPTS: "-Dorg.gradle.internal.http.connectionTimeout=60000 -Dorg.gradle.internal.http.socketTimeout=60000 -Dorg.gradle.internal.network.retry.max.attempts=6 -Dorg.gradle.internal.network.retry.initial.backOff=2000"
         with:
           api-level: ${{ matrix.api-level }}
           arch: x86_64
           ndk: 21.4.7075529
           script: bash contrib/instrumentation.sh
 
+
       - name: Upload screenshot result
         uses: actions/upload-artifact@v1
         if: failure()
@@ -40,15 +43,17 @@ jobs:
           path: screencap.png
 
       - name: create unit coverage
+        if: ${{ matrix.api-level==21  }}
         run: ./gradlew jacocoTestDebugUnitTestReport jacocoTestCustomExampleDebugUnitTestReport
 
       - name: Upload coverage to Codecov
+        if: ${{ matrix.api-level==21  }}
         run: |
           bash <(curl -s https://codecov.io/bash)
 
       - name: Upload Coverage to GH-Actions
         uses: actions/[email protected]
-        if: ${{ always()  }}
+        if: ${{ matrix.api-level==21  }}
         with:
           name: Tests Coverage Report
           path: |

.github/workflows/nightly.yml

@@ -69,5 +69,5 @@ jobs:
         run: |
           mkdir $DATE
           cp $UNIVERSAL_DEBUG_APK $DATE
-          scp -vrp -i ssh_key -o StrictHostKeyChecking=no $DATE [email protected]:/data/download/nightly/
+          scp -P 30022 -vrp -i ssh_key -o StrictHostKeyChecking=no $DATE ci@master.download.kiwix.org:/data/download/nightly/
 

.github/workflows/release.yml

@@ -47,7 +47,7 @@ jobs:
         run: |
           ./gradlew assembleRelease
           cp $UNIVERSAL_RELEASE_APK kiwix-${TAG}.apk
-          scp -vrp -i ssh_key -o StrictHostKeyChecking=no kiwix-${TAG}.apk [email protected]:/data/download/release/kiwix-android/
+          scp -P 30022 -vrp -i ssh_key -o StrictHostKeyChecking=no kiwix-${TAG}.apk ci@master.download.kiwix.org:/data/download/release/kiwix-android/
 
       - name: Publish to github releases
         uses: ncipollo/release-action@v1

CHANGELOG

@@ -1,3 +1,14 @@
+3.5.0
+* FIX: Storing Zim/Book files inside the public Kiwix Directory on internal storage.
+* FIX: Storing Zim/Book files inside the public Kiwix Directory on external storage in android 11 and above.
+* FIX: Ability to save Notes in android 10 and above.
+* FIX: Ability to open externally downloaded Zim Files.
+* FIX: MIME type fix for "*.js" titles.
+* FIX: CI/CD Pipeline fixed for android 21 & android 30.
+* FIX: Partial library migration from jcenter to jitpack & maven repo.
+* FIX: Add network permission dialog on download navigation.
+* NEW: File Selector for selecting any zim files from storage.
+
 3.4.6
 * FIX: Added MANAGE_EXTERNAL_STORAGE permission for Android 11 and later
 * FIX: Hide "Download over wifi settings" on custom apps

app/build.gradle.kts

@@ -10,8 +10,8 @@ apply(from = rootProject.file("jacoco.gradle"))
 
 ext {
   set("versionMajor", 3)
-  set("versionMinor", 4)
-  set("versionPatch", 6)
+  set("versionMinor", 5)
+  set("versionPatch", 0)
 }
 
 fun generateVersionName() = "${ext["versionMajor"]}.${ext["versionMinor"]}.${ext["versionPatch"]}"
@@ -87,7 +87,4 @@ play {
 
 dependencies {
   implementation(Libs.squidb)
-  implementation(Libs.squidb_annotations)
-  implementation(Libs.ink_page_indicator)
-  add("kapt", Libs.squidb_processor)
 }

app/src/androidTest/AndroidManifest.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:tools="http://schemas.android.com/tools"
+  xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.kiwix.kiwixmobile">
 
+  <application
+    android:usesCleartextTraffic="true"/>
   <uses-sdk tools:overrideLibrary="android_libs.ub_uiautomator" />
 </manifest>

app/src/androidTest/java/DebugFunctions.kt

@@ -36,13 +36,21 @@ inline fun <reified T : BaseRobot> T.applyWithViewHierarchyPrinting(
     } catch (runtimeException: RuntimeException) {
       uiDevice.takeScreenshot(File(context.filesDir, "${System.currentTimeMillis()}.png"))
       InstrumentationRegistry.getInstrumentation().runOnMainSync {
-        throw RuntimeException(
-          combineMessages(
-            runtimeException,
-            ActivityLifecycleMonitorRegistry.getInstance().getActivitiesInStage(RESUMED).last()
-          ),
-          runtimeException
-        )
+        // During the Pause state, it can't any state or since it may not hold strong reference it
+        // may garbage collected in the low memory stage or may not return an instance of particular
+        // activity
+        val activity =
+          ActivityLifecycleMonitorRegistry.getInstance().getActivitiesInStage(RESUMED).lastOrNull()
+        if (activity != null) {
+          throw RuntimeException(
+            combineMessages(
+              runtimeException = runtimeException,
+              activity = activity
+            ),
+            runtimeException
+          )
+        }
+        throw RuntimeException()
       }
     }
   }

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

@@ -21,6 +21,7 @@ package org.kiwix.kiwixmobile
 import android.R.id
 import android.app.Instrumentation
 import android.content.Context
+import androidx.test.espresso.NoMatchingViewException
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.Direction
 import androidx.test.uiautomator.UiDevice
@@ -52,7 +53,7 @@ abstract class BaseRobot(
     uiDevice.pressBack()
   }
 
-  protected fun isVisible(findable: Findable, timeout: Long = DEFAULT_WAIT) =
+  protected fun isVisible(findable: Findable, timeout: Long = VERY_LONG_WAIT) =
     waitFor(findable, timeout) ?: throw RuntimeException(findable.errorMessage(this))
 
   protected fun UiObject2.swipeLeft() {
@@ -63,7 +64,7 @@ abstract class BaseRobot(
     customSwipe(Direction.RIGHT)
   }
 
-  protected fun clickOn(findable: Findable, timeout: Long = DEFAULT_WAIT) {
+  protected fun clickOn(findable: Findable, timeout: Long = VERY_LONG_WAIT) {
     isVisible(findable, timeout).click()
   }
 
@@ -81,9 +82,20 @@ abstract class BaseRobot(
 
   private fun waitFor(
     findable: Findable,
-    timeout: Long = DEFAULT_WAIT
-  ): UiObject2? =
-    uiDevice.wait(Until.findObject(findable.selector(this)), timeout)
+    timeout: Long = VERY_LONG_WAIT,
+    retryCount: Int = 5
+  ): UiObject2? {
+    var uiObject2: UiObject2? = null
+    for (i in 0 until retryCount) {
+      try {
+        uiObject2 = uiDevice.wait(Until.findObject(findable.selector(this)), timeout)
+        break
+      } catch (noMatchingViewException: NoMatchingViewException) {
+        noMatchingViewException.printStackTrace()
+      }
+    }
+    return uiObject2
+  }
 
   private fun UiObject2.customSwipe(
     direction: Direction,

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

@@ -26,8 +26,8 @@
 import androidx.test.filters.LargeTest;
 import androidx.test.rule.ActivityTestRule;
 import androidx.test.rule.GrantPermissionRule;
-import com.schibsted.spain.barista.interaction.BaristaMenuClickInteractions;
-import com.schibsted.spain.barista.interaction.BaristaSleepInteractions;
+import com.adevinta.android.barista.interaction.BaristaMenuClickInteractions;
+import com.adevinta.android.barista.interaction.BaristaSleepInteractions;
 import java.util.concurrent.TimeUnit;
 import org.junit.After;
 import org.junit.Before;
@@ -41,9 +41,9 @@
 
 import static androidx.test.espresso.Espresso.onData;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static com.schibsted.spain.barista.assertion.BaristaVisibilityAssertions.assertDisplayed;
-import static com.schibsted.spain.barista.interaction.BaristaClickInteractions.clickOn;
-import static com.schibsted.spain.barista.interaction.BaristaSwipeRefreshInteractions.refresh;
+import static com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertDisplayed;
+import static com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn;
+import static com.adevinta.android.barista.interaction.BaristaSwipeRefreshInteractions.refresh;
 import static junit.framework.Assert.fail;
 import static org.kiwix.kiwixmobile.testutils.TestUtils.TEST_PAUSE_MS;
 import static org.kiwix.kiwixmobile.testutils.TestUtils.allowPermissionsIfNeeded;

app/src/androidTest/java/org/kiwix/kiwixmobile/NetworkTest.java

@@ -25,8 +25,8 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.rule.ActivityTestRule;
 import androidx.test.rule.GrantPermissionRule;
-import com.schibsted.spain.barista.interaction.BaristaMenuClickInteractions;
-import com.schibsted.spain.barista.interaction.BaristaSleepInteractions;
+import com.adevinta.android.barista.interaction.BaristaMenuClickInteractions;
+import com.adevinta.android.barista.interaction.BaristaSleepInteractions;
 import java.io.InputStream;
 import java.util.concurrent.TimeUnit;
 import org.junit.After;
@@ -49,10 +49,10 @@
 import static androidx.test.espresso.action.ViewActions.click;
 import static androidx.test.espresso.action.ViewActions.longClick;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static com.schibsted.spain.barista.interaction.BaristaClickInteractions.clickOn;
-import static com.schibsted.spain.barista.interaction.BaristaDialogInteractions.clickDialogPositiveButton;
-import static com.schibsted.spain.barista.interaction.BaristaMenuClickInteractions.clickMenu;
-import static com.schibsted.spain.barista.interaction.BaristaSwipeRefreshInteractions.refresh;
+import static com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn;
+import static com.adevinta.android.barista.interaction.BaristaDialogInteractions.clickDialogPositiveButton;
+import static com.adevinta.android.barista.interaction.BaristaMenuClickInteractions.clickMenu;
+import static com.adevinta.android.barista.interaction.BaristaSwipeRefreshInteractions.refresh;
 import static org.hamcrest.CoreMatchers.allOf;
 import static org.kiwix.kiwixmobile.testutils.TestUtils.TEST_PAUSE_MS;
 import static org.kiwix.kiwixmobile.testutils.TestUtils.getResourceString;