From ee5e686b3d9672cf2dbb4763e7232ccee5f4eae8 Mon Sep 17 00:00:00 2001
From: HissPirat <franslukas@gmail.com>
Date: Mon, 14 Sep 2020 15:53:20 +0200
Subject: [PATCH] #2319 requested fixes

---
 .../kiwixmobile/intro/IntroFragmentTest.kt    |  7 +-----
 .../core/extensions/ActivityExtensions.kt     | 22 +++++++++----------
 .../core/main/CoreReaderFragment.java         |  5 +++--
 .../search/viewmodel/SearchViewModelTest.kt   |  2 +-
 4 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/intro/IntroFragmentTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/intro/IntroFragmentTest.kt
index 8ee065f5c..588734f53 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/intro/IntroFragmentTest.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/intro/IntroFragmentTest.kt
@@ -18,12 +18,10 @@
 package org.kiwix.kiwixmobile.intro
 
 import androidx.test.internal.runner.junit4.statement.UiThreadStatement.runOnUiThread
-import com.schibsted.spain.barista.interaction.BaristaSleepInteractions
 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.TestUtils
 
 class IntroFragmentTest : BaseActivityTest<KiwixMainActivity>() {
 
@@ -32,9 +30,6 @@ class IntroFragmentTest : BaseActivityTest<KiwixMainActivity>() {
   @Test
   fun viewIsSwipeableAndNavigatesToMain() {
     runOnUiThread { activityRule.activity.navigate(R.id.introFragment) }
-    BaristaSleepInteractions.sleep(TestUtils.TEST_PAUSE_MS.toLong())
-    intro {
-      swipeLeft()
-    } clickGetStarted { }
+    intro(IntroRobot::swipeLeft) clickGetStarted { }
   }
 }
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/extensions/ActivityExtensions.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/extensions/ActivityExtensions.kt
index 0f2dffca6..02770accb 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/extensions/ActivityExtensions.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/extensions/ActivityExtensions.kt
@@ -39,7 +39,7 @@ import org.kiwix.kiwixmobile.core.main.CoreMainActivity
 
 object ActivityExtensions {
 
-  private val Activity.thisAsCoreMainActivity: CoreMainActivity get() = this as CoreMainActivity
+  private val Activity.coreMainActivity: CoreMainActivity get() = this as CoreMainActivity
 
   fun AppCompatActivity.startActionMode(
     menuId: Int,
@@ -85,29 +85,29 @@ object ActivityExtensions {
       .get(T::class.java)
 
   fun Activity.navigate(action: NavDirections) {
-    thisAsCoreMainActivity.navigate(action)
+    coreMainActivity.navigate(action)
   }
 
   val Activity.cachedComponent: CoreActivityComponent
-    get() = thisAsCoreMainActivity.cachedComponent
+    get() = coreMainActivity.cachedComponent
 
   fun Activity.setupDrawerToggle(toolbar: Toolbar) =
-    thisAsCoreMainActivity.setupDrawerToggle(toolbar)
+    coreMainActivity.setupDrawerToggle(toolbar)
 
   fun Activity.navigate(fragmentId: Int) {
-    thisAsCoreMainActivity.navigate(fragmentId)
+    coreMainActivity.navigate(fragmentId)
   }
 
   fun Activity.navigate(fragmentId: Int, bundle: Bundle) {
-    thisAsCoreMainActivity.navigate(fragmentId, bundle)
+    coreMainActivity.navigate(fragmentId, bundle)
   }
 
   fun Activity.popNavigationBackstack() {
-    thisAsCoreMainActivity.navController.popBackStack()
+    coreMainActivity.navController.popBackStack()
   }
 
   private fun <T> Activity.getObservableNavigationResult(key: String = "result") =
-    thisAsCoreMainActivity.navController.currentBackStackEntry?.savedStateHandle
+    coreMainActivity.navController.currentBackStackEntry?.savedStateHandle
       ?.getLiveData<T>(key)
 
   fun <T> Activity.observeNavigationResult(
@@ -117,15 +117,15 @@ object ActivityExtensions {
   ) {
     getObservableNavigationResult<T>(key)?.observe(owner) {
       observer.onChanged(it)
-      thisAsCoreMainActivity.consumeObservable<T>(key)
+      coreMainActivity.consumeObservable<T>(key)
     }
   }
 
   fun <T> Activity.consumeObservable(key: String = "result") =
-    thisAsCoreMainActivity.navController.currentBackStackEntry?.savedStateHandle?.remove<T>(key)
+    coreMainActivity.navController.currentBackStackEntry?.savedStateHandle?.remove<T>(key)
 
   fun <T> Activity.setNavigationResult(result: T, key: String = "result") {
-    thisAsCoreMainActivity.navController.previousBackStackEntry?.savedStateHandle?.set(
+    coreMainActivity.navController.previousBackStackEntry?.savedStateHandle?.set(
       key,
       result
     )
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java
index 4c6d04925..a9eece3dc 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java
@@ -1240,8 +1240,9 @@ public abstract class CoreReaderFragment extends BaseFragment
 
   private void goToSearchWithText(Intent intent) {
     saveTabStates();
-    String searchString = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? intent.getStringExtra(
-      Intent.EXTRA_PROCESS_TEXT) : "";
+    String searchString = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+      ? intent.getStringExtra(Intent.EXTRA_PROCESS_TEXT)
+      : "";
     openSearch(searchString, false, false);
   }
 
diff --git a/core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModelTest.kt b/core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModelTest.kt
index 4eecfced6..a3e2a40e9 100644
--- a/core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModelTest.kt
+++ b/core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModelTest.kt
@@ -266,7 +266,7 @@ internal class SearchViewModelTest {
     }
 
     @Test
-    fun `CreatedWithIntent offers SearchArgumentProcessing`() {
+    fun `CreatedWithArguments offers SearchArgumentProcessing`() {
       val bundle = mockk<Bundle>()
       actionResultsInEffects(
         CreatedWithArguments(bundle),