diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/help/HelpFragmentTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/help/HelpFragmentTest.kt
index ffd2c4722..8b6e06dd4 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/help/HelpFragmentTest.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/help/HelpFragmentTest.kt
@@ -17,7 +17,6 @@
*/
package org.kiwix.kiwixmobile.help
-import android.os.Build
import androidx.lifecycle.Lifecycle
import androidx.test.core.app.ActivityScenario
import androidx.test.espresso.IdlingRegistry
@@ -51,6 +50,15 @@ class HelpFragmentTest : BaseActivityTest() {
}
waitForIdle()
}
+ context.let {
+ sharedPreferenceUtil = SharedPreferenceUtil(it).apply {
+ setIntroShown()
+ putPrefWifiOnly(false)
+ setIsPlayStoreBuildType(true)
+ prefIsTest = true
+ putPrefLanguage("en")
+ }
+ }
activityScenario = ActivityScenario.launch(KiwixMainActivity::class.java).apply {
moveToState(Lifecycle.State.RESUMED)
onActivity {
@@ -75,7 +83,6 @@ class HelpFragmentTest : BaseActivityTest() {
@Test
fun verifyHelpActivity() {
- setShowPlayStoreRestriction(false)
activityScenario.onActivity {
it.navigate(R.id.helpFragment)
}
@@ -89,50 +96,11 @@ class HelpFragmentTest : BaseActivityTest() {
clickOnHowToUpdateContent()
assertHowToUpdateContentIsExpanded()
clickOnHowToUpdateContent()
- assertZimFileNotShowingIsNotVisible()
clickOnSendFeedback()
}
LeakAssertions.assertNoLeaks()
}
- @Test
- fun verifyHelpActivityWithPlayStoreRestriction() {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
- setShowPlayStoreRestriction(true)
- activityScenario.onActivity {
- it.navigate(R.id.helpFragment)
- }
- help {
- clickOnWhatDoesKiwixDo()
- assertWhatDoesKiwixDoIsExpanded()
- clickOnWhatDoesKiwixDo()
- clickOnWhereIsContent()
- assertWhereIsContentIsExpanded()
- clickOnWhereIsContent()
- clickOnHowToUpdateContent()
- assertHowToUpdateContentIsExpanded()
- clickOnHowToUpdateContent()
- clickOnHowToOpenZimFiles()
- assertHowToOpenZimFilesIsExpanded()
- clickOnHowToOpenZimFiles()
- clickOnSendFeedback()
- }
- LeakAssertions.assertNoLeaks()
- }
- }
-
- private fun setShowPlayStoreRestriction(showRestriction: Boolean) {
- context.let {
- sharedPreferenceUtil = SharedPreferenceUtil(it).apply {
- setIntroShown()
- putPrefWifiOnly(false)
- setIsPlayStoreBuildType(showRestriction)
- prefIsTest = true
- putPrefLanguage("en")
- }
- }
- }
-
@After
fun finish() {
IdlingRegistry.getInstance().unregister(KiwixIdlingResource.getInstance())
diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/help/HelpRobot.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/help/HelpRobot.kt
index 553905ef5..4b2776ad3 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/help/HelpRobot.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/help/HelpRobot.kt
@@ -19,7 +19,6 @@ package org.kiwix.kiwixmobile.help
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.action.ViewActions.click
-import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
import androidx.test.espresso.matcher.ViewMatchers.withText
import org.kiwix.kiwixmobile.BaseRobot
import org.kiwix.kiwixmobile.Findable.StringId.TextId
@@ -83,19 +82,6 @@ class HelpRobot : BaseRobot() {
clickOn(ViewId(id.activity_help_feedback_text_view))
}
- fun clickOnHowToOpenZimFiles() {
- clickOn(TextId(string.how_to_open_existing_zim_files))
- }
-
- fun assertHowToOpenZimFilesIsExpanded() {
- isVisible(Text(context.getString(string.how_to_open_existing_zim_files_description)))
- }
-
- fun assertZimFileNotShowingIsNotVisible() {
- onView(withText("Zim files not showing?"))
- .check(doesNotExist())
- }
-
private fun helpTextFormat(vararg stringIds: Int) =
stringIds.joinToString(separator = "\n", transform = context::getString)
}
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/help/KiwixHelpFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/help/KiwixHelpFragment.kt
index 7ac1c1196..9dedd6bd8 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/help/KiwixHelpFragment.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/help/KiwixHelpFragment.kt
@@ -22,21 +22,9 @@ import org.kiwix.kiwixmobile.core.R
import org.kiwix.kiwixmobile.core.help.HelpFragment
class KiwixHelpFragment : HelpFragment() {
- override fun rawTitleDescriptionMap() =
- if (sharedPreferenceUtil.isPlayStoreBuildWithAndroid11OrAbove()) {
- listOf(
- R.string.help_2 to R.array.description_help_2,
- R.string.help_5 to R.array.description_help_5,
- R.string.how_to_update_content to R.array.update_content_description,
- R.string.how_to_open_existing_zim_files to getString(
- R.string.how_to_open_existing_zim_files_description
- )
- )
- } else {
- listOf(
- R.string.help_2 to R.array.description_help_2,
- R.string.help_5 to R.array.description_help_5,
- R.string.how_to_update_content to R.array.update_content_description
- )
- }
+ override fun rawTitleDescriptionMap() = listOf(
+ R.string.help_2 to R.array.description_help_2,
+ R.string.help_5 to R.array.description_help_5,
+ R.string.how_to_update_content to R.array.update_content_description
+ )
}
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index bd83c69d0..7c7c2e871 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -324,8 +324,6 @@
Tabs restored
Open Drawer
Close Drawer
- How to open existing ZIM files?
- To read your existing zim file from storage, use the file picker(+) icon in the library screen.
Preparing for copy/move
Copy
Move