Merge pull request #2781 from kiwix/develop

Merge develop to master for 3.4.6

Author: kelson42

.github/workflows/coverage.yml

@@ -15,7 +15,7 @@ jobs:
   coverageReport:
     strategy:
       matrix:
-        api-level: [21, 21]
+        api-level: [21, 21, 30]
       fail-fast: false
     runs-on: macOS-latest
     steps:

.github/workflows/nightly.yml

@@ -10,7 +10,7 @@ jobs:
   instrumentation_tests:
     strategy:
       matrix:
-        api-level: [21, 22, 23, 24, 25, 27, 28]
+        api-level: [21, 22, 23, 24, 25, 27, 28, 30]
       fail-fast: false
     runs-on: macOS-latest
     steps:

CHANGELOG

@@ -1,3 +1,11 @@
+3.4.6
+* FIX: Added MANAGE_EXTERNAL_STORAGE permission for Android 11 and later
+* FIX: Hide "Download over wifi settings" on custom apps
+* FIX: Hide SD card access setting on custom apps
+* FIX: Launch screen icon updated
+* FIX: Broken "Get content" launcher icon
+* NEW: Better hide virtual keyboard in library
+
 3.4.5
 NEW: Supports Android 11
 NEW: Hotspot socket address better visible, clickable and shareable

README.md

@@ -17,6 +17,7 @@ Kiwix Android is written in [Kotlin](https://kotlinlang.org/) (with a few old
 pieces in Java).
 
 [![Build Status](https://github.com/kiwix/kiwix-android/workflows/CI/badge.svg?query=branch%3Adevelop+workflow%3ANightly)](https://github.com/kiwix/kiwix-android/actions?query=workflow%3ANightly+branch%3Adevelop)
+[![Nightly](https://github.com/kiwix/kiwix-android/actions/workflows/nightly.yml/badge.svg)](https://github.com/kiwix/kiwix-android/actions/workflows/nightly.yml)
 [![codecov](https://codecov.io/gh/kiwix/kiwix-android/branch/develop/graph/badge.svg)](https://codecov.io/gh/kiwix/kiwix-android)
 [![CodeFactor](https://www.codefactor.io/repository/github/kiwix/kiwix-android/badge)](https://www.codefactor.io/repository/github/kiwix/kiwix-android)
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)

app/build.gradle.kts

@@ -11,7 +11,7 @@ apply(from = rootProject.file("jacoco.gradle"))
 ext {
   set("versionMajor", 3)
   set("versionMinor", 4)
-  set("versionPatch", 5)
+  set("versionPatch", 6)
 }
 
 fun generateVersionName() = "${ext["versionMajor"]}.${ext["versionMinor"]}.${ext["versionPatch"]}"

app/detekt_baseline.xml

@@ -11,7 +11,7 @@
     <ID>MagicNumber:ShareFiles.kt$ShareFiles$24</ID>
     <ID>MagicNumber:ZimManageViewModel.kt$ZimManageViewModel$5</ID>
     <ID>MagicNumber:ZimManageViewModel.kt$ZimManageViewModel$500</ID>
-    <ID>MagicNumber:ZimHostFragment.kt$ZimHostFragment$4</ID>
+    <ID>NestedBlockDepth:LocalLibraryFragment.kt$LocalLibraryFragment$checkPermissions</ID>
     <ID>NestedBlockDepth:PeerGroupHandshake.kt$PeerGroupHandshake$readHandshakeAndExchangeMetaData</ID>
     <ID>NestedBlockDepth:ReceiverHandShake.kt$ReceiverHandShake$exchangeFileTransferMetadata</ID>
     <ID>PackageNaming:AvailableSpaceCalculator.kt$package org.kiwix.kiwixmobile.zim_manager.library_view</ID>

app/src/androidTest/java/org/kiwix/kiwixmobile/testutils/Matcher.java

@@ -0,0 +1,49 @@
+/*
+ * Kiwix Android
+ * Copyright (c) 2021 Kiwix <android.kiwix.org>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package org.kiwix.kiwixmobile.testutils
+
+import android.view.View
+import android.view.ViewGroup
+import org.hamcrest.Description
+import org.hamcrest.Matcher
+import org.hamcrest.TypeSafeMatcher
+
+class Matcher {
+  companion object {
+    @JvmStatic
+    fun childAtPosition(
+      parentMatcher: Matcher<View?>,
+      position: Int
+    ): Matcher<View> {
+      return object : TypeSafeMatcher<View>() {
+        override fun describeTo(description: Description) {
+          description.appendText("Child at position $position in parent ")
+          parentMatcher.describeTo(description)
+        }
+
+        public override fun matchesSafely(view: View): Boolean {
+          val parent = view.parent
+          return parent is ViewGroup && parentMatcher.matches(parent) && view == parent.getChildAt(
+              position
+            )
+        }
+      }
+    }
+  }
+}

app/src/androidTest/java/org/kiwix/kiwixmobile/testutils/Matcher.kt

@@ -6,6 +6,8 @@
   <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
   <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+  <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
+    tools:ignore="ScopedStorage" />
 
   <queries>
     <intent>

app/src/main/AndroidManifest.xml

@@ -37,6 +37,7 @@ import org.kiwix.kiwixmobile.R
 import org.kiwix.kiwixmobile.cachedComponent
 import org.kiwix.kiwixmobile.core.base.BaseActivity
 import org.kiwix.kiwixmobile.core.base.BaseFragment
+import org.kiwix.kiwixmobile.core.extensions.closeKeyboard
 import org.kiwix.kiwixmobile.core.extensions.viewModel
 import org.kiwix.kiwixmobile.core.main.CoreMainActivity
 import org.kiwix.kiwixmobile.core.utils.SimpleTextListener
@@ -133,6 +134,7 @@ class LanguageFragment : BaseFragment() {
     return when (item.itemId) {
       R.id.menu_language_save -> {
         languageViewModel.actions.offer(Action.SaveAll)
+        closeKeyboard()
         true
       }
       else -> super.onOptionsItemSelected(item)