Merge pull request #1647 from kiwix/release/3.1.2

Release/3.1.2

app/build.gradle.kts

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

core/src/main/java/org/kiwix/kiwixmobile/core/base/BaseActivity.kt

@@ -17,6 +17,8 @@
  */
 package org.kiwix.kiwixmobile.core.base
 
+import android.content.res.Configuration
+import android.os.Build
 import android.os.Bundle
 import androidx.annotation.LayoutRes
 import androidx.appcompat.app.AppCompatActivity
@@ -49,6 +51,16 @@ abstract class BaseActivity : AppCompatActivity() {
     unbinder = ButterKnife.bind(this)
   }
 
+  // TODO https://issuetracker.google.com/issues/141132133 remove this once appcompat has been fixed
+  override fun applyOverrideConfiguration(overrideConfiguration: Configuration?) {
+    if (Build.VERSION.SDK_INT in Build.VERSION_CODES.LOLLIPOP..Build.VERSION_CODES.N_MR1 &&
+      (resources.configuration.uiMode == applicationContext.resources.configuration.uiMode)
+    ) {
+      return
+    }
+    super.applyOverrideConfiguration(overrideConfiguration)
+  }
+
   override fun onDestroy() {
     super.onDestroy()
     unbinder?.unbind()

core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.java

@@ -494,6 +494,7 @@ public abstract class CoreMainActivity extends BaseActivity
   }
 
   protected void hideTabSwitcher() {
+    if (actionBar != null) {
       actionBar.setDisplayHomeAsUpEnabled(false);
       actionBar.setDisplayShowTitleEnabled(true);
 
@@ -505,6 +506,7 @@ public abstract class CoreMainActivity extends BaseActivity
       contentFrame.setVisibility(View.VISIBLE);
       mainMenu.showWebViewOptions(!urlIsInvalid());
     }
+  }
 
   @OnClick(R2.id.bottom_toolbar_arrow_back)
   void goBack() {

core/src/main/java/org/kiwix/kiwixmobile/core/search/SearchActivity.java

@@ -346,6 +346,8 @@ public class SearchActivity extends BaseActivity
   @Override
   protected void onSaveInstanceState(Bundle outState) {
     super.onSaveInstanceState(outState);
+    if (searchView != null && searchView.getQuery() != null) {
       outState.putString(EXTRA_SEARCH_TEXT, searchView.getQuery().toString());
     }
+  }
 }