From c47b9962e5579e04e382518bb1fd2f56b67e9655 Mon Sep 17 00:00:00 2001
From: Sean Mac Gillicuddy <seantheappdev@gmail.com>
Date: Thu, 11 Jun 2020 11:22:42 +0100
Subject: [PATCH] #2026 Migrate Zim prefix away from "content://" - allow test
 to click on either text

---
 .../settings/KiwixSettingsActivityTest.java       | 15 +++++++++++----
 core/src/main/res/values/strings.xml              |  1 -
 core/src/main/res/xml/preferences.xml             |  3 +--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/KiwixSettingsActivityTest.java b/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/KiwixSettingsActivityTest.java
index 3223aec8b..d8ee27729 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/KiwixSettingsActivityTest.java
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/KiwixSettingsActivityTest.java
@@ -18,9 +18,11 @@
 
 package org.kiwix.kiwixmobile.settings;
 
+import android.view.View;
 import androidx.annotation.StringRes;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.test.rule.ActivityTestRule;
+import org.hamcrest.Matcher;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Rule;
 import org.junit.Test;
@@ -33,6 +35,7 @@ import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant;
 import static androidx.test.espresso.matcher.ViewMatchers.withClassName;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static com.schibsted.spain.barista.assertion.BaristaVisibilityAssertions.assertDisplayed;
+import static org.hamcrest.Matchers.anyOf;
 import static org.hamcrest.Matchers.is;
 
 public class KiwixSettingsActivityTest {
@@ -49,9 +52,13 @@ public class KiwixSettingsActivityTest {
     clickOn(R.string.pref_wifi_only);
   }
 
-  private void clickOn(@StringRes int stringId) {
+  private void clickOn(@StringRes int... stringIds) {
+    Matcher<View>[] matchers= new Matcher[stringIds.length];
+    for (int i = 0; i < stringIds.length; i++) {
+      matchers[i]= withText(stringIds[i]);
+    }
     onView(withClassName(is(RecyclerView.class.getName())))
-      .perform(actionOnItem(hasDescendant(withText(stringId)), click()));
+      .perform(actionOnItem(hasDescendant(anyOf(matchers)), click()));
   }
 
   @Test
@@ -62,8 +69,8 @@ public class KiwixSettingsActivityTest {
 
   @Test
   public void testStorageDialog() {
-    clickOn(R.string.pref_storage_summary);
-    assertDisplayed(R.string.internal_storage);
+    clickOn(R.string.internal_storage, R.string.external_storage);
+    assertDisplayed(R.string.pref_storage);
   }
 
   @Test
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 0e5002912..a9d025c69 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -275,7 +275,6 @@
   <string name="diagnostic_report_message">Please send all the following details so we can diagnose the problem</string>
   <string name="percentage">%d%%</string>
   <string name="pref_text_zoom_title">Text Zoom</string>
-  <string name="pref_storage_summary">Choose where files get saved to</string>
   <string-array name="pref_night_modes_entries">
     <item>@string/on</item>
     <item>@string/off</item>
diff --git a/core/src/main/res/xml/preferences.xml b/core/src/main/res/xml/preferences.xml
index b4c7825ce..e72d5b73d 100644
--- a/core/src/main/res/xml/preferences.xml
+++ b/core/src/main/res/xml/preferences.xml
@@ -68,8 +68,7 @@
 
   <PreferenceCategory
     android:key="pref_storage"
-    android:title="@string/pref_storage"
-    app:summary="@string/pref_storage_summary"
+    app:title="@string/pref_storage"
     app:iconSpaceReserved="false">
 
     <Preference