From 4645aa1c4e8c1636bc1a9139e439f5838e233481 Mon Sep 17 00:00:00 2001 From: MohitMaliFtechiz Date: Mon, 30 Sep 2024 18:38:11 +0530 Subject: [PATCH 1/2] Removed the restriction popup from start in PS variant. * Since now we have a way to load the sideloaded zim files in application so this popup does not make sense. Therefore, we are removing this. --- .../ObjectBoxToLibkiwixMigratorTest.kt | 1 - .../kiwixmobile/deeplinks/DeepLinksTest.kt | 1 - .../kiwixmobile/download/DownloadTest.kt | 1 - .../initial/download/InitialDownloadTest.kt | 1 - .../language/LanguageFragmentTest.kt | 1 - .../LocalFileTransferTest.kt | 1 - .../localLibrary/CopyMoveFileHandlerTest.kt | 1 - .../main/DarkModeViewPainterTest.kt | 1 - .../main/TopLevelDestinationTest.kt | 1 - .../kiwixmobile/mimetype/MimeTypeTest.kt | 1 - .../PlayStoreRestrictionDialogRobot.kt | 66 --------- .../PlayStoreRestrictionDialogTest.kt | 126 ------------------ .../destination/library/LocalLibraryTest.kt | 1 - .../kiwixmobile/note/NoteFragmentTest.kt | 1 - .../page/bookmarks/ImportBookmarkTest.kt | 1 - .../page/bookmarks/LibkiwixBookmarkTest.kt | 1 - .../page/history/NavigationHistoryTest.kt | 1 - .../kiwixmobile/reader/EncodedUrlTest.kt | 1 - .../reader/KiwixReaderFragmentTest.kt | 1 - .../ZimFileReaderWithSplittedZimFileTest.kt | 1 - .../kiwixmobile/search/SearchFragmentTest.kt | 1 - .../settings/KiwixSettingsFragmentTest.kt | 1 - .../webserver/ZimHostFragmentTest.kt | 1 - .../library/LocalLibraryFragment.kt | 17 +-- .../core/utils/SharedPreferenceUtil.kt | 7 - .../core/utils/dialog/KiwixDialog.kt | 14 -- core/src/main/res/values-br/strings.xml | 1 - core/src/main/res/values-da/strings.xml | 1 - core/src/main/res/values-dag/strings.xml | 1 - core/src/main/res/values-de/strings.xml | 1 - core/src/main/res/values-eo/strings.xml | 1 - core/src/main/res/values-es/strings.xml | 1 - core/src/main/res/values-fr/strings.xml | 1 - core/src/main/res/values-ha/strings.xml | 1 - core/src/main/res/values-ia/strings.xml | 1 - core/src/main/res/values-ig/strings.xml | 1 - core/src/main/res/values-igl/strings.xml | 1 - core/src/main/res/values-iw/strings.xml | 1 - core/src/main/res/values-lb/strings.xml | 1 - core/src/main/res/values-mk/strings.xml | 1 - core/src/main/res/values-nl/strings.xml | 1 - core/src/main/res/values-pt-rBR/strings.xml | 1 - core/src/main/res/values-ru/strings.xml | 1 - core/src/main/res/values-sl/strings.xml | 1 - core/src/main/res/values-sv/strings.xml | 1 - core/src/main/res/values-sw/strings.xml | 1 - core/src/main/res/values-ta/strings.xml | 1 - core/src/main/res/values-tn/strings.xml | 1 - core/src/main/res/values-tr/strings.xml | 1 - core/src/main/res/values-yo/strings.xml | 1 - core/src/main/res/values-zh-rTW/strings.xml | 1 - core/src/main/res/values-zh/strings.xml | 1 - core/src/main/res/values/strings.xml | 1 - .../search/SearchFragmentTestForCustomApp.kt | 1 - 54 files changed, 1 insertion(+), 278 deletions(-) delete mode 100644 app/src/androidTest/java/org/kiwix/kiwixmobile/nav/destination/PlayStoreRestrictionDialogRobot.kt delete mode 100644 app/src/androidTest/java/org/kiwix/kiwixmobile/nav/destination/PlayStoreRestrictionDialogTest.kt diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/ObjectBoxToLibkiwixMigratorTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/ObjectBoxToLibkiwixMigratorTest.kt index 1698b6a879..d60a3b435f 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/ObjectBoxToLibkiwixMigratorTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/ObjectBoxToLibkiwixMigratorTest.kt @@ -98,7 +98,6 @@ class ObjectBoxToLibkiwixMigratorTest : BaseActivityTest() { putBoolean(SharedPreferenceUtil.PREF_SHOW_INTRO, false) putBoolean(SharedPreferenceUtil.PREF_IS_TEST, true) putBoolean(SharedPreferenceUtil.IS_PLAY_STORE_BUILD, true) - putBoolean(SharedPreferenceUtil.PREF_PLAY_STORE_RESTRICTION, false) putString(SharedPreferenceUtil.PREF_LANG, "en") } activityScenario = ActivityScenario.launch(KiwixMainActivity::class.java).apply { diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/deeplinks/DeepLinksTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/deeplinks/DeepLinksTest.kt index eaa3d80aca..59d1be68e1 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/deeplinks/DeepLinksTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/deeplinks/DeepLinksTest.kt @@ -70,7 +70,6 @@ class DeepLinksTest : BaseActivityTest() { putPrefWifiOnly(false) setIsPlayStoreBuildType(true) prefIsTest = true - playStoreRestrictionPermissionDialog = false putPrefLanguage("en") lastDonationPopupShownInMilliSeconds = System.currentTimeMillis() } diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/download/DownloadTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/download/DownloadTest.kt index a05f85fb8a..9f4d7b0399 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/download/DownloadTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/download/DownloadTest.kt @@ -92,7 +92,6 @@ class DownloadTest : BaseActivityTest() { putBoolean(SharedPreferenceUtil.PREF_SHOW_STORAGE_OPTION, false) putBoolean(SharedPreferenceUtil.IS_PLAY_STORE_BUILD, true) putBoolean(SharedPreferenceUtil.PREF_IS_TEST, true) - putBoolean(SharedPreferenceUtil.PREF_PLAY_STORE_RESTRICTION, false) putString(SharedPreferenceUtil.PREF_LANG, "en") putLong( SharedPreferenceUtil.PREF_LAST_DONATION_POPUP_SHOWN_IN_MILLISECONDS, diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/initial/download/InitialDownloadTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/initial/download/InitialDownloadTest.kt index fd6d0e0f09..1289c0a30e 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/initial/download/InitialDownloadTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/initial/download/InitialDownloadTest.kt @@ -83,7 +83,6 @@ class InitialDownloadTest : BaseActivityTest() { putBoolean(SharedPreferenceUtil.PREF_SHOW_STORAGE_OPTION, true) putBoolean(SharedPreferenceUtil.IS_PLAY_STORE_BUILD, true) putBoolean(SharedPreferenceUtil.PREF_IS_TEST, true) - putBoolean(SharedPreferenceUtil.PREF_PLAY_STORE_RESTRICTION, false) putString(SharedPreferenceUtil.PREF_LANG, "en") putLong( SharedPreferenceUtil.PREF_LAST_DONATION_POPUP_SHOWN_IN_MILLISECONDS, diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/language/LanguageFragmentTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/language/LanguageFragmentTest.kt index 51e11b5294..80d2748d33 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/language/LanguageFragmentTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/language/LanguageFragmentTest.kt @@ -80,7 +80,6 @@ class LanguageFragmentTest { .edit { putBoolean(SharedPreferenceUtil.PREF_SHOW_INTRO, false) putBoolean(SharedPreferenceUtil.PREF_WIFI_ONLY, false) - putBoolean(SharedPreferenceUtil.PREF_PLAY_STORE_RESTRICTION, false) putString(SharedPreferenceUtil.PREF_LANG, "en") putLong( SharedPreferenceUtil.PREF_LAST_DONATION_POPUP_SHOWN_IN_MILLISECONDS, diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/localFileTransfer/LocalFileTransferTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/localFileTransfer/LocalFileTransferTest.kt index aa792349b3..3295d1e3e1 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/localFileTransfer/LocalFileTransferTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/localFileTransfer/LocalFileTransferTest.kt @@ -203,7 +203,6 @@ class LocalFileTransferTest { putBoolean(SharedPreferenceUtil.PREF_WIFI_ONLY, false) putBoolean(SharedPreferenceUtil.PREF_IS_TEST, true) putBoolean(SharedPreferenceUtil.PREF_SHOW_SHOWCASE, shouldShowShowCase) - putBoolean(SharedPreferenceUtil.PREF_PLAY_STORE_RESTRICTION, false) putString(SharedPreferenceUtil.PREF_LANG, "en") } if (isResetShowCaseId) { diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/localLibrary/CopyMoveFileHandlerTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/localLibrary/CopyMoveFileHandlerTest.kt index 26927c92e9..6f3c66ee64 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/localLibrary/CopyMoveFileHandlerTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/localLibrary/CopyMoveFileHandlerTest.kt @@ -75,7 +75,6 @@ class CopyMoveFileHandlerTest : BaseActivityTest() { putBoolean(SharedPreferenceUtil.PREF_SHOW_INTRO, false) putBoolean(SharedPreferenceUtil.PREF_WIFI_ONLY, false) putBoolean(SharedPreferenceUtil.PREF_IS_TEST, true) - putBoolean(SharedPreferenceUtil.PREF_PLAY_STORE_RESTRICTION, false) putString(SharedPreferenceUtil.PREF_LANG, "en") putLong( SharedPreferenceUtil.PREF_LAST_DONATION_POPUP_SHOWN_IN_MILLISECONDS, diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/main/DarkModeViewPainterTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/main/DarkModeViewPainterTest.kt index aac0a105cc..642eb994a5 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/main/DarkModeViewPainterTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/main/DarkModeViewPainterTest.kt @@ -68,7 +68,6 @@ class DarkModeViewPainterTest : BaseActivityTest() { putBoolean(SharedPreferenceUtil.PREF_IS_TEST, true) putBoolean(SharedPreferenceUtil.PREF_EXTERNAL_LINK_POPUP, true) putBoolean(SharedPreferenceUtil.PREF_SHOW_SHOWCASE, false) - putBoolean(SharedPreferenceUtil.PREF_PLAY_STORE_RESTRICTION, false) putString(SharedPreferenceUtil.PREF_LANG, "en") } activityScenario = ActivityScenario.launch(KiwixMainActivity::class.java).apply { diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/main/TopLevelDestinationTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/main/TopLevelDestinationTest.kt index 420c932e59..89dc86a71d 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/main/TopLevelDestinationTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/main/TopLevelDestinationTest.kt @@ -62,7 +62,6 @@ class TopLevelDestinationTest : BaseActivityTest() { putBoolean(SharedPreferenceUtil.PREF_IS_TEST, true) putBoolean(SharedPreferenceUtil.PREF_EXTERNAL_LINK_POPUP, true) putBoolean(SharedPreferenceUtil.PREF_SHOW_SHOWCASE, false) - putBoolean(SharedPreferenceUtil.PREF_PLAY_STORE_RESTRICTION, false) putString(SharedPreferenceUtil.PREF_LANG, "en") putLong( SharedPreferenceUtil.PREF_LAST_DONATION_POPUP_SHOWN_IN_MILLISECONDS, diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/mimetype/MimeTypeTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/mimetype/MimeTypeTest.kt index e9578891e4..c6f172e7e6 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/mimetype/MimeTypeTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/mimetype/MimeTypeTest.kt @@ -54,7 +54,6 @@ class MimeTypeTest : BaseActivityTest() { PreferenceManager.getDefaultSharedPreferences(context).edit { putBoolean(SharedPreferenceUtil.PREF_SHOW_INTRO, false) putBoolean(SharedPreferenceUtil.PREF_WIFI_ONLY, false) - putBoolean(SharedPreferenceUtil.PREF_PLAY_STORE_RESTRICTION, false) putString(SharedPreferenceUtil.PREF_LANG, "en") putLong( SharedPreferenceUtil.PREF_LAST_DONATION_POPUP_SHOWN_IN_MILLISECONDS, diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/nav/destination/PlayStoreRestrictionDialogRobot.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/nav/destination/PlayStoreRestrictionDialogRobot.kt deleted file mode 100644 index f26156f8e6..0000000000 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/nav/destination/PlayStoreRestrictionDialogRobot.kt +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Kiwix Android - * Copyright (c) 2023 Kiwix - * 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 . - * - */ - -package org.kiwix.kiwixmobile.nav.destination - -import androidx.test.espresso.Espresso.onView -import androidx.test.espresso.action.ViewActions.click -import androidx.test.espresso.assertion.ViewAssertions.doesNotExist -import androidx.test.espresso.assertion.ViewAssertions.matches -import androidx.test.espresso.matcher.ViewMatchers.isDisplayed -import androidx.test.espresso.matcher.ViewMatchers.withId -import androidx.test.espresso.matcher.ViewMatchers.withText -import applyWithViewHierarchyPrinting -import com.adevinta.android.barista.interaction.BaristaSleepInteractions -import org.kiwix.kiwixmobile.BaseRobot -import org.kiwix.kiwixmobile.R -import org.kiwix.kiwixmobile.testutils.TestUtils -import org.kiwix.kiwixmobile.testutils.TestUtils.testFlakyView - -fun playStoreRestriction(func: PlayStoreRestrictionDialogRobot.() -> Unit) = - PlayStoreRestrictionDialogRobot().applyWithViewHierarchyPrinting(func) - -class PlayStoreRestrictionDialogRobot : BaseRobot() { - - fun clickLibraryOnBottomNav() { - pauseForBetterTestPerformance() - testFlakyView({ onView(withId(R.id.libraryFragment)).perform(click()) }) - } - - fun assertPlayStoreRestrictionDialogDisplayed() { - pauseForBetterTestPerformance() - onView(withText("UNDERSTOOD")) - .check(matches(isDisplayed())) - } - - fun assetPlayStoreRestrictionDialogNotDisplayed() { - pauseForBetterTestPerformance() - onView(withText("UNDERSTOOD")) - .check(doesNotExist()) - } - - fun clickOnUnderstood() { - pauseForBetterTestPerformance() - onView(withText("UNDERSTOOD")) - .perform(click()) - } - - private fun pauseForBetterTestPerformance() { - BaristaSleepInteractions.sleep(TestUtils.TEST_PAUSE_MS.toLong()) - } -} diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/nav/destination/PlayStoreRestrictionDialogTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/nav/destination/PlayStoreRestrictionDialogTest.kt deleted file mode 100644 index 4d2ea6eb69..0000000000 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/nav/destination/PlayStoreRestrictionDialogTest.kt +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Kiwix Android - * Copyright (c) 2023 Kiwix - * 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 . - * - */ - -package org.kiwix.kiwixmobile.nav.destination - -import android.Manifest -import android.content.Context -import android.os.Build -import androidx.lifecycle.Lifecycle -import androidx.test.core.app.ActivityScenario -import androidx.test.espresso.accessibility.AccessibilityChecks -import androidx.test.platform.app.InstrumentationRegistry -import androidx.test.rule.GrantPermissionRule -import androidx.test.uiautomator.UiDevice -import leakcanary.LeakAssertions -import org.junit.Before -import org.junit.Rule -import org.junit.Test -import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil -import org.kiwix.kiwixmobile.main.KiwixMainActivity -import org.kiwix.kiwixmobile.testutils.RetryRule -import org.kiwix.kiwixmobile.testutils.TestUtils - -class PlayStoreRestrictionDialogTest { - @Rule - @JvmField - var retryRule = RetryRule() - - private lateinit var sharedPreferenceUtil: SharedPreferenceUtil - - private lateinit var activityScenario: ActivityScenario - - private val permissions = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - arrayOf( - Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.NEARBY_WIFI_DEVICES - ) - } else { - arrayOf( - Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.ACCESS_FINE_LOCATION - ) - } - - @Rule - @JvmField - var permissionRules: GrantPermissionRule = - GrantPermissionRule.grant(*permissions) - private var context: Context? = null - - init { - AccessibilityChecks.enable().setRunChecksFromRootView(true) - } - - @Before - fun waitForIdle() { - context = InstrumentationRegistry.getInstrumentation().targetContext - UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()).apply { - if (TestUtils.isSystemUINotRespondingDialogVisible(this)) { - TestUtils.closeSystemDialogs(context, this) - } - waitForIdle() - } - } - - @Test - fun showPlayStoreRestrictionDialog() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { - setShowPlayStoreRestrictionDialog(true) - activityScenario = ActivityScenario.launch(KiwixMainActivity::class.java).apply { - moveToState(Lifecycle.State.RESUMED) - } - playStoreRestriction { - clickLibraryOnBottomNav() - assertPlayStoreRestrictionDialogDisplayed() - clickOnUnderstood() - } - LeakAssertions.assertNoLeaks() - } - } - - @Test - fun testPlayStoreDialogShowOnlyOnce() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { - setShowPlayStoreRestrictionDialog(false) - activityScenario = ActivityScenario.launch(KiwixMainActivity::class.java).apply { - moveToState(Lifecycle.State.RESUMED) - } - playStoreRestriction { - clickLibraryOnBottomNav() - assetPlayStoreRestrictionDialogNotDisplayed() - } - LeakAssertions.assertNoLeaks() - } - } - - private fun setShowPlayStoreRestrictionDialog(showDialog: Boolean) { - context?.let { - sharedPreferenceUtil = SharedPreferenceUtil(it).apply { - setIntroShown() - putPrefWifiOnly(false) - setIsPlayStoreBuildType(true) - prefIsTest = true - playStoreRestrictionPermissionDialog = showDialog - putPrefLanguage("en") - } - } - } -} diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/nav/destination/library/LocalLibraryTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/nav/destination/library/LocalLibraryTest.kt index 1d650bf063..d5a05c0c72 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/nav/destination/library/LocalLibraryTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/nav/destination/library/LocalLibraryTest.kt @@ -88,7 +88,6 @@ class LocalLibraryTest : BaseActivityTest() { // the manage external storage permission dialog on Android 11 and above // while refreshing the content in LocalLibraryFragment. putBoolean(SharedPreferenceUtil.PREF_SHOW_MANAGE_PERMISSION_DIALOG_ON_REFRESH, false) - putBoolean(SharedPreferenceUtil.PREF_PLAY_STORE_RESTRICTION, false) putString(SharedPreferenceUtil.PREF_LANG, "en") putLong( SharedPreferenceUtil.PREF_LAST_DONATION_POPUP_SHOWN_IN_MILLISECONDS, diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/note/NoteFragmentTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/note/NoteFragmentTest.kt index 2c0dcd2d23..43c9ebf408 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/note/NoteFragmentTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/note/NoteFragmentTest.kt @@ -72,7 +72,6 @@ class NoteFragmentTest : BaseActivityTest() { putBoolean(SharedPreferenceUtil.PREF_SHOW_INTRO, false) putBoolean(SharedPreferenceUtil.PREF_WIFI_ONLY, false) putBoolean(SharedPreferenceUtil.PREF_IS_TEST, true) - putBoolean(SharedPreferenceUtil.PREF_PLAY_STORE_RESTRICTION, false) putString(SharedPreferenceUtil.PREF_LANG, "en") putLong( SharedPreferenceUtil.PREF_LAST_DONATION_POPUP_SHOWN_IN_MILLISECONDS, diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/page/bookmarks/ImportBookmarkTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/page/bookmarks/ImportBookmarkTest.kt index 61d0fe51d0..4f3c0d8883 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/page/bookmarks/ImportBookmarkTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/page/bookmarks/ImportBookmarkTest.kt @@ -111,7 +111,6 @@ class ImportBookmarkTest : BaseActivityTest() { putBoolean(SharedPreferenceUtil.PREF_SHOW_INTRO, false) putBoolean(SharedPreferenceUtil.PREF_WIFI_ONLY, false) putBoolean(SharedPreferenceUtil.PREF_IS_TEST, true) - putBoolean(SharedPreferenceUtil.PREF_PLAY_STORE_RESTRICTION, false) putString(SharedPreferenceUtil.PREF_LANG, "en") putLong( SharedPreferenceUtil.PREF_LAST_DONATION_POPUP_SHOWN_IN_MILLISECONDS, diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/page/bookmarks/LibkiwixBookmarkTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/page/bookmarks/LibkiwixBookmarkTest.kt index febf8a06b1..a34defb3ea 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/page/bookmarks/LibkiwixBookmarkTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/page/bookmarks/LibkiwixBookmarkTest.kt @@ -68,7 +68,6 @@ class LibkiwixBookmarkTest : BaseActivityTest() { putBoolean(SharedPreferenceUtil.PREF_SHOW_INTRO, false) putBoolean(SharedPreferenceUtil.PREF_WIFI_ONLY, false) putBoolean(SharedPreferenceUtil.PREF_IS_TEST, true) - putBoolean(SharedPreferenceUtil.PREF_PLAY_STORE_RESTRICTION, false) putString(SharedPreferenceUtil.PREF_LANG, "en") putLong( SharedPreferenceUtil.PREF_LAST_DONATION_POPUP_SHOWN_IN_MILLISECONDS, diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/page/history/NavigationHistoryTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/page/history/NavigationHistoryTest.kt index e433902452..580f951359 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/page/history/NavigationHistoryTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/page/history/NavigationHistoryTest.kt @@ -66,7 +66,6 @@ class NavigationHistoryTest : BaseActivityTest() { putBoolean(SharedPreferenceUtil.PREF_SHOW_INTRO, false) putBoolean(SharedPreferenceUtil.PREF_WIFI_ONLY, false) putBoolean(SharedPreferenceUtil.PREF_IS_TEST, true) - putBoolean(SharedPreferenceUtil.PREF_PLAY_STORE_RESTRICTION, false) putString(SharedPreferenceUtil.PREF_LANG, "en") putLong( SharedPreferenceUtil.PREF_LAST_DONATION_POPUP_SHOWN_IN_MILLISECONDS, diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/reader/EncodedUrlTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/reader/EncodedUrlTest.kt index a387f40460..448a14cf4e 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/reader/EncodedUrlTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/reader/EncodedUrlTest.kt @@ -54,7 +54,6 @@ class EncodedUrlTest : BaseActivityTest() { PreferenceManager.getDefaultSharedPreferences(context).edit { putBoolean(SharedPreferenceUtil.PREF_SHOW_INTRO, false) putBoolean(SharedPreferenceUtil.PREF_WIFI_ONLY, false) - putBoolean(SharedPreferenceUtil.PREF_PLAY_STORE_RESTRICTION, false) putString(SharedPreferenceUtil.PREF_LANG, "en") putLong( SharedPreferenceUtil.PREF_LAST_DONATION_POPUP_SHOWN_IN_MILLISECONDS, diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/reader/KiwixReaderFragmentTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/reader/KiwixReaderFragmentTest.kt index 8f864b5bc6..89939a2fbe 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/reader/KiwixReaderFragmentTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/reader/KiwixReaderFragmentTest.kt @@ -68,7 +68,6 @@ class KiwixReaderFragmentTest : BaseActivityTest() { putBoolean(SharedPreferenceUtil.PREF_SHOW_INTRO, false) putBoolean(SharedPreferenceUtil.PREF_WIFI_ONLY, false) putBoolean(SharedPreferenceUtil.PREF_IS_TEST, true) - putBoolean(SharedPreferenceUtil.PREF_PLAY_STORE_RESTRICTION, false) putString(SharedPreferenceUtil.PREF_LANG, "en") } activityScenario = ActivityScenario.launch(KiwixMainActivity::class.java).apply { diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/reader/ZimFileReaderWithSplittedZimFileTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/reader/ZimFileReaderWithSplittedZimFileTest.kt index cfb168dd0e..f740f1aec7 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/reader/ZimFileReaderWithSplittedZimFileTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/reader/ZimFileReaderWithSplittedZimFileTest.kt @@ -69,7 +69,6 @@ class ZimFileReaderWithSplittedZimFileTest : BaseActivityTest() { PreferenceManager.getDefaultSharedPreferences(context).edit { putBoolean(SharedPreferenceUtil.PREF_SHOW_INTRO, false) putBoolean(SharedPreferenceUtil.PREF_WIFI_ONLY, false) - putBoolean(SharedPreferenceUtil.PREF_PLAY_STORE_RESTRICTION, false) putString(SharedPreferenceUtil.PREF_LANG, "en") } activityScenario = ActivityScenario.launch(KiwixMainActivity::class.java).apply { diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/search/SearchFragmentTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/search/SearchFragmentTest.kt index d325c6a1a0..1a6cb6725b 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/search/SearchFragmentTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/search/SearchFragmentTest.kt @@ -85,7 +85,6 @@ class SearchFragmentTest : BaseActivityTest() { putBoolean(SharedPreferenceUtil.PREF_SHOW_INTRO, false) putBoolean(SharedPreferenceUtil.PREF_WIFI_ONLY, false) putBoolean(SharedPreferenceUtil.PREF_IS_TEST, true) - putBoolean(SharedPreferenceUtil.PREF_PLAY_STORE_RESTRICTION, false) putString(SharedPreferenceUtil.PREF_LANG, "en") putLong( SharedPreferenceUtil.PREF_LAST_DONATION_POPUP_SHOWN_IN_MILLISECONDS, diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/KiwixSettingsFragmentTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/KiwixSettingsFragmentTest.kt index fd04bb49ee..b7c1572229 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/KiwixSettingsFragmentTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/KiwixSettingsFragmentTest.kt @@ -81,7 +81,6 @@ class KiwixSettingsFragmentTest { "en", SharedPreferenceUtil(it).apply { setIsPlayStoreBuildType(true) - playStoreRestrictionPermissionDialog = false lastDonationPopupShownInMilliSeconds = System.currentTimeMillis() } ) diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/webserver/ZimHostFragmentTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/webserver/ZimHostFragmentTest.kt index d8ca561647..9b5cbbe804 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/webserver/ZimHostFragmentTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/webserver/ZimHostFragmentTest.kt @@ -106,7 +106,6 @@ class ZimHostFragmentTest { putPrefWifiOnly(false) setIsPlayStoreBuildType(true) prefIsTest = true - playStoreRestrictionPermissionDialog = false putPrefLanguage("en") lastDonationPopupShownInMilliSeconds = System.currentTimeMillis() } diff --git a/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/LocalLibraryFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/LocalLibraryFragment.kt index 3fd12bdee7..73540f1302 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/LocalLibraryFragment.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/LocalLibraryFragment.kt @@ -459,11 +459,7 @@ class LocalLibraryFragment : BaseFragment(), CopyMoveFileHandler.FileCopyMoveCal override fun onResume() { super.onResume() - if (sharedPreferenceUtil.isPlayStoreBuildWithAndroid11OrAbove() && - sharedPreferenceUtil.playStoreRestrictionPermissionDialog - ) { - showPlayStoreRestrictionInformationToUser() - } else if (!sharedPreferenceUtil.isPlayStoreBuildWithAndroid11OrAbove() && + if (!sharedPreferenceUtil.isPlayStoreBuildWithAndroid11OrAbove() && !sharedPreferenceUtil.prefIsTest && !permissionDeniedLayoutShowing ) { checkPermissions() @@ -472,17 +468,6 @@ class LocalLibraryFragment : BaseFragment(), CopyMoveFileHandler.FileCopyMoveCal } } - private fun showPlayStoreRestrictionInformationToUser() { - // We should only ask for first time - sharedPreferenceUtil.playStoreRestrictionPermissionDialog = false - // Show Dialog to the user to inform about the play store restriction - dialogShower.show( - KiwixDialog.PlayStoreRestrictionPopup(KIWIX_APK_WEBSITE_URL), - {}, - ::openKiwixWebsiteForDownloadingApk - ) - } - private fun openKiwixWebsiteForDownloadingApk() { requireActivity().startActivity(KIWIX_APK_WEBSITE_URL.toUri().browserIntent()) } diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/SharedPreferenceUtil.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/SharedPreferenceUtil.kt index 55add2af57..29795da465 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/SharedPreferenceUtil.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/SharedPreferenceUtil.kt @@ -243,12 +243,6 @@ class SharedPreferenceUtil @Inject constructor(val context: Context) { manageExternalFilesPermissionDialogOnRefresh ) } - var playStoreRestrictionPermissionDialog: Boolean - get() = sharedPreferences.getBoolean(PREF_PLAY_STORE_RESTRICTION, true) - set(playStoreRestrictionPermissionDialog) = - sharedPreferences.edit { - putBoolean(PREF_PLAY_STORE_RESTRICTION, playStoreRestrictionPermissionDialog) - } var hostedBooks: Set get() = sharedPreferences.getStringSet(PREF_HOSTED_BOOKS, null)?.toHashSet() ?: HashSet() @@ -330,7 +324,6 @@ class SharedPreferenceUtil @Inject constructor(val context: Context) { const val PREF_MANAGE_EXTERNAL_FILES = "pref_manage_external_files" const val PREF_SHOW_MANAGE_PERMISSION_DIALOG_ON_REFRESH = "pref_show_manage_external_files" const val IS_PLAY_STORE_BUILD = "is_play_store_build" - const val PREF_PLAY_STORE_RESTRICTION = "pref_play_store_restriction" const val PREF_BOOKMARKS_MIGRATED = "pref_bookmarks_migrated" const val PREF_RECENT_SEARCH_MIGRATED = "pref_recent_search_migrated" const val PREF_HISTORY_MIGRATED = "pref_history_migrated" diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/dialog/KiwixDialog.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/dialog/KiwixDialog.kt index 375d753189..ce7d2247dd 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/dialog/KiwixDialog.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/dialog/KiwixDialog.kt @@ -189,20 +189,6 @@ sealed class KiwixDialog( neutralMessage = R.string.do_not_ask_anymore ) - data class PlayStoreRestrictionPopup(override val args: List) : - KiwixDialog( - null, - R.string.zim_files_not_showing_description, - R.string.understood, - R.string.download, - cancelable = false - ), - HasBodyFormatArgs { - constructor(websiteUrl: String) : this( - listOf(websiteUrl) - ) - } - data class ShowRate(override val args: List, val customIcon: Int?) : KiwixDialog( R.string.rate_dialog_title, diff --git a/core/src/main/res/values-br/strings.xml b/core/src/main/res/values-br/strings.xml index c8ccb16e31..76b2693baf 100644 --- a/core/src/main/res/values-br/strings.xml +++ b/core/src/main/res/values-br/strings.xml @@ -246,7 +246,6 @@ Digeriñ an diretenn Serriñ an diretenn N’eo ket diskouezet ar restroù ZIM? - Komprenet am eus Aotreet Berzet Aotren diff --git a/core/src/main/res/values-da/strings.xml b/core/src/main/res/values-da/strings.xml index 08ba084d01..048b4032c9 100644 --- a/core/src/main/res/values-da/strings.xml +++ b/core/src/main/res/values-da/strings.xml @@ -180,7 +180,6 @@ Luk skuffe ZIM-filer viser ikke? På grund af Google Play-politikker på Android 11 og nyere, kan denne Google Store-app ikke åbne sideindlæste ZIM-filer. Du kan enten downloade dem gennem appen, eller i stedet installere den fulde version af Kiwix-appen fra vores officielle hjemmeside %s. - Forstået Tilladt Ikke tilladt Tillad diff --git a/core/src/main/res/values-dag/strings.xml b/core/src/main/res/values-dag/strings.xml index 595742a4cd..ed924b38ff 100644 --- a/core/src/main/res/values-dag/strings.xml +++ b/core/src/main/res/values-dag/strings.xml @@ -307,7 +307,6 @@ Kparimi leefe Zim fasara nima bi yin’dɔni? Kwa sababu ya sera za Google Play kwenye Android 11 na matoleo mapya zaidi, programu hii ya Google Store haiwezi kufungua faili za ZIM zilizopakiwa kando. Unaweza kuzipakua kupitia programu au, badala yake, usakinishe toleo kamili la programu ya kiwix kutoka kwa tovuti yetu rasmi %s. - N gbaaya Shili malibu zaŋ n-ti yaabu/kpɛhibu yaai Kpɛhi diff --git a/core/src/main/res/values-de/strings.xml b/core/src/main/res/values-de/strings.xml index 504ea519c9..86c5f12197 100644 --- a/core/src/main/res/values-de/strings.xml +++ b/core/src/main/res/values-de/strings.xml @@ -329,7 +329,6 @@ Schublade schließen Werden die Zim-Dateien nicht angezeigt? Aufgrund der Google-Play-Richtlinien für Android 11 und höher kann diese Google-Store-App keine seitlich geladenen ZIM-Dateien öffnen. Sie können sie entweder über die App herunterladen oder stattdessen die Vollversion der Kiwix-App von unserer offiziellen Website installieren %s - Verstanden Wie aktualisiert man Inhalte? Um Inhalte (eine Zim-Datei) zu aktualisieren, musst du die neueste Version genau derselben Inhalte vollständig herunterladen. Das kannst du über den Download-Bereich tun. Berechtigung für alle Dateien erforderlich diff --git a/core/src/main/res/values-eo/strings.xml b/core/src/main/res/values-eo/strings.xml index 697e48c732..733024736a 100644 --- a/core/src/main/res/values-eo/strings.xml +++ b/core/src/main/res/values-eo/strings.xml @@ -202,6 +202,5 @@ Malŝaltita Teksta Zomo Malfermi en nova langeto - Komprenita Permesi diff --git a/core/src/main/res/values-es/strings.xml b/core/src/main/res/values-es/strings.xml index 2d973b82f8..4715cde390 100644 --- a/core/src/main/res/values-es/strings.xml +++ b/core/src/main/res/values-es/strings.xml @@ -319,7 +319,6 @@ Abrir cajón Cerrar cajón ¿Los archivos de Zim no se muestran? - Entendido ¿Cómo actualizar contenido? Para actualizar el contenido (un archivo zim), debe descargar la última versión completa de este mismo contenido. Puede hacerlo a través de la sección de descargas. Se necesita permiso para todos los archivos diff --git a/core/src/main/res/values-fr/strings.xml b/core/src/main/res/values-fr/strings.xml index 3a0c6a55ec..801b9681b1 100644 --- a/core/src/main/res/values-fr/strings.xml +++ b/core/src/main/res/values-fr/strings.xml @@ -343,7 +343,6 @@ Fermer le tiroir Les fichiers Zim ne s’affichent pas ? En raison des politiques de Google Play sur Android 11 et versions ultérieures, cette application Google Store ne peut pas ouvrir les fichiers ZIM téléchargés. Vous pouvez soit les télécharger via l’application, soit installer la version complète de l’application kiwix depuis notre site officiel %s. - Compris Préparation de la copie/du déplacement Copier Déplacer diff --git a/core/src/main/res/values-ha/strings.xml b/core/src/main/res/values-ha/strings.xml index 213375c408..e938f56ba1 100644 --- a/core/src/main/res/values-ha/strings.xml +++ b/core/src/main/res/values-ha/strings.xml @@ -298,7 +298,6 @@ Rufe Drawer Zim fayilolin da ba su nuna ba? Saboda manufofin Google Play akan Android 11 da sama, wannan app ɗin Google Store ba zai iya buɗe fayilolin ZIM masu ɗaukar nauyi ba. Kuna iya ko dai zazzage su ta hanyar app ɗin ko, maimakon haka, shigar da cikakken sigar kiwix app daga gidan yanar gizon mu %s - Fahimtar Yadda ake sabunta abun ciki? Don sabunta abun ciki (fayil ɗin zim) kuna buƙatar zazzage cikakken sabon sigar wannan abun ciki iri ɗaya. Kuna iya yin hakan ta sashin zazzagewa. Ana Bukata Duk Izinin Fayiloli diff --git a/core/src/main/res/values-ia/strings.xml b/core/src/main/res/values-ia/strings.xml index b2b30892d9..3f2a8379b5 100644 --- a/core/src/main/res/values-ia/strings.xml +++ b/core/src/main/res/values-ia/strings.xml @@ -314,7 +314,6 @@ Clauder tiratorio Le file Zim non appare? A causa del politicas de Google Play sur Android 11 e plus recente, iste application Google Store non pote aperir le files ZIM transferite localmente. Tu pote discargar le files per medio del application, o installar le version complete del application Kiwix de nostre sito web official: %s - Comprendite Como actualisar contento? Pro actualisar le contento (un file zim) tu debe discargar le ultime version complete de iste mesme contento. Tu pote facer lo in le section de discargamento. Permission pro tote le files es necessari diff --git a/core/src/main/res/values-ig/strings.xml b/core/src/main/res/values-ig/strings.xml index d5194da0cd..5dcce697ed 100644 --- a/core/src/main/res/values-ig/strings.xml +++ b/core/src/main/res/values-ig/strings.xml @@ -304,7 +304,6 @@ Mechie drawer Faịlụ Zim anaghị egosi? N’ihi iwu nke Google Play na Android 11 na karịa, ngwaọrụ Google Store a enweghị ike imeghe faịlụ Zim. Inwere ike ịbelata ha site a ngwaọrụ a ma ọ bụ, kama tinye udi zuru okè nke ngwaọrụ kiwix- site na webụsaaịtị anyị ama ama nke %s - Aghọtara Ole Otu esi emelite ọdịnaya? Imelite ọdịnaya (faịlụ zim) ịkwesịrị ibudata ụdị ọdịnaya kachasị ọhụrụ nke otu ọdịnaya a. Ị nwere ike ime nke ahụ site na ngalaba nbudata. Achọrọ ikike faịlụ niile diff --git a/core/src/main/res/values-igl/strings.xml b/core/src/main/res/values-igl/strings.xml index 38080ef6ce..98d4937564 100644 --- a/core/src/main/res/values-igl/strings.xml +++ b/core/src/main/res/values-igl/strings.xml @@ -170,7 +170,6 @@ Otakida du biñ Fi drówa bi Did drówa re - Anè re ju Ché ñwu É kí jé ñwu ñ Ché ñwu diff --git a/core/src/main/res/values-iw/strings.xml b/core/src/main/res/values-iw/strings.xml index 4e66ae1964..537461a52b 100644 --- a/core/src/main/res/values-iw/strings.xml +++ b/core/src/main/res/values-iw/strings.xml @@ -324,7 +324,6 @@ סגירת מגירה קובצי ה־zim אינם מוצגים? בשל מדיניות Google Play ב־Android 11 ומעלה, יישום ה־Google Store הזה לא יכול לפתוח קובצי ZIM עם טעינת צד. באפשרותך להוריד אותם דרך היישום או להתקין את הגרסה המלאה של אפליקציית kiwix מהאתר הרשמי שלנו %s - הבנתי הכנה להעתקה או העברה העתקה העברה diff --git a/core/src/main/res/values-lb/strings.xml b/core/src/main/res/values-lb/strings.xml index 9fca670841..0e9600aa85 100644 --- a/core/src/main/res/values-lb/strings.xml +++ b/core/src/main/res/values-lb/strings.xml @@ -202,7 +202,6 @@ Bibliothéik opmaachen Tirang opmaachen Tirang zoumaachen - Verstanen Erlaabt Net erlaabt Erlaben diff --git a/core/src/main/res/values-mk/strings.xml b/core/src/main/res/values-mk/strings.xml index 20ae6ae90c..e9fc2d5b79 100644 --- a/core/src/main/res/values-mk/strings.xml +++ b/core/src/main/res/values-mk/strings.xml @@ -316,7 +316,6 @@ Затвори фиока ZIM-податотеките не се прикажуваат? Поради правилата на Google Play за Андроид 11 и подоцнежни, овој прилог од Google Store не може да отвора настрана преземени ZIM-податотеки. Мора да ги преземете преку прилогот или пак да ја воспоставите целосната верзија на прилогот Кивикс од нашата официјална страница %s - Јасно Подготовка за копирање/преместување Копирај Премести diff --git a/core/src/main/res/values-nl/strings.xml b/core/src/main/res/values-nl/strings.xml index 00d81d6e19..e14fb10b64 100644 --- a/core/src/main/res/values-nl/strings.xml +++ b/core/src/main/res/values-nl/strings.xml @@ -321,7 +321,6 @@ Lade sluiten Zim-bestanden niet te zien? Als gevolg van het Google Play-beleid op Android 11 en hoger, kan deze Google Store-app geen “sideloaded” ZIM-bestanden openen. U kunt ze downloaden via de app, of in plaats daarvan vanaf onze officiële website %s de volledige versie van de Kiwix-app installeren. - Begrepen Hoe werk ik de inhoud bij? Om inhoud (een ZIM-bestand) bij te werken moet u de volledige nieuwste versie van precies dezelfde inhoud downloaden. Dat kan via de downloadsectie. Toestemming voor alle bestanden vereist diff --git a/core/src/main/res/values-pt-rBR/strings.xml b/core/src/main/res/values-pt-rBR/strings.xml index f1ec8875b8..f3b02456ce 100644 --- a/core/src/main/res/values-pt-rBR/strings.xml +++ b/core/src/main/res/values-pt-rBR/strings.xml @@ -329,7 +329,6 @@ Abrir gaveta Fechar gaveta Arquivos zim não estão aparecendo? - Entendido Como atualizar o conteúdo? Para atualizar o conteúdo (um arquivo zim), você precisa baixar a versão completa mais recente desse mesmo conteúdo. Você pode fazer isso através da seção de download. Permissão necessária para todos os arquivos diff --git a/core/src/main/res/values-ru/strings.xml b/core/src/main/res/values-ru/strings.xml index ba0d0bdb73..f31f47fff0 100644 --- a/core/src/main/res/values-ru/strings.xml +++ b/core/src/main/res/values-ru/strings.xml @@ -344,7 +344,6 @@ Закрыть редактор Файлы Zim не отображаются? В соответствии с правилами Google Play для Android 11 и более поздних версий это приложение Google Store не может открывать загруженные неопубликованными файлы ZIM. Вы можете либо скачать их через приложение, либо установить полную версию приложения kiwix с нашего официального сайта %s - Понятно Подготовка к копированию/перемещению Копировать Переместить diff --git a/core/src/main/res/values-sl/strings.xml b/core/src/main/res/values-sl/strings.xml index bf362c80f2..117f473070 100644 --- a/core/src/main/res/values-sl/strings.xml +++ b/core/src/main/res/values-sl/strings.xml @@ -302,7 +302,6 @@ Zapri predal Se datoteke Zim ne prikažejo? Zaradi pravilnikov storitve Google Play v sistemu Android 11 in novejših ta aplikacija Google Store ne more odpreti stransko naloženih datotek ZIM. Lahko jih prenesete prek aplikacije ali namesto tega namestite polno različico aplikacije Kiwix z našega uradnega spletnega mesta %s. - Razumem Kako posodobiti vsebino? Če želite posodobiti vsebino (datoteko ZIM), morate prenesti celotno najnovejšo različico te iste vsebine. To lahko storite v razdelku za prenos. Potrebno je dovoljenje za vse datoteke diff --git a/core/src/main/res/values-sv/strings.xml b/core/src/main/res/values-sv/strings.xml index ceabbca437..1c3365daf7 100644 --- a/core/src/main/res/values-sv/strings.xml +++ b/core/src/main/res/values-sv/strings.xml @@ -324,7 +324,6 @@ Stäng sidomeny Visas inte Zim-filer? På grund av Google Play-policyer på Android 11 och senare kan inte Google Store-appen öppna sidoladdade ZIM-filer. Du kan antingen ladda ner dem via appen eller, istället, installera den fullständiga versionen av kiwix app från vår officiella hemsida %s - Uppfattat Hur uppdaterar man innehåll? För att uppdatera innehåll (en zim-fil) behöver du ladda ned den fullständig senaste versionen samma innehåll. Du kan göra det via nedladdningsavsnittet. Behörighet för alla filer behövs diff --git a/core/src/main/res/values-sw/strings.xml b/core/src/main/res/values-sw/strings.xml index 692a23f927..4a967b437f 100644 --- a/core/src/main/res/values-sw/strings.xml +++ b/core/src/main/res/values-sw/strings.xml @@ -303,7 +303,6 @@ Funga Droo Faili za Zim hazionyeshwi? Kwa sababu ya sera za Google Play kwenye Android 11 na matoleo mapya zaidi, programu hii ya Google Store haiwezi kufungua faili za ZIM zilizopakiwa kando. Unaweza kuzipakua kupitia programu au, badala yake, usakinishe toleo kamili la programu ya kiwix kutoka kwa tovuti yetu rasmi %s - Kueleweka Jinsi ya kusasisha maudhui? Ili kusasisha maudhui (faili ya zim) unahitaji kupakua toleo jipya zaidi la maudhui haya haya. Unaweza kufanya hivyo kupitia sehemu ya kupakua. Ruhusa ya Faili Zote Inahitajika diff --git a/core/src/main/res/values-ta/strings.xml b/core/src/main/res/values-ta/strings.xml index 3abeb5e60f..301de4d7c4 100644 --- a/core/src/main/res/values-ta/strings.xml +++ b/core/src/main/res/values-ta/strings.xml @@ -287,7 +287,6 @@ தாவல் மீட்டமைக்கப்பட்டது இழுப்பறையைத் திற இழுப்பறையை மூடு - விளங்கியது உள்ளடக்கத்தை எவ்வாறு புதுப்பிப்பது? உள்ளடக்கத்தைப் புதுப்பிக்க (ஒரு zim கோப்பு) இதே உள்ளடக்கத்தின் முழு சமீபத்திய பதிப்பை நீங்கள் பதிவிறக்க வேண்டும். பதிவிறக்கப் பிரிவு வழியாக நீங்கள் அதைச் செய்யலாம். அனைத்து கோப்புகளுக்கும் அனுமதி தேவை diff --git a/core/src/main/res/values-tn/strings.xml b/core/src/main/res/values-tn/strings.xml index 0b4ba57f35..b219e158d3 100644 --- a/core/src/main/res/values-tn/strings.xml +++ b/core/src/main/res/values-tn/strings.xml @@ -293,7 +293,6 @@ Tswala kgamelo A difaele tsa Zim ga di suoe? Ka ntlha ya melao ya Google Play mo Android 11 le go feta, app eno ya Google Store ga e kgone go bula difaele tsa ZIM tse di kwa thoko. O ka kgona go di kopa ka app kgotsa, go na le moo, tsenya version e e feletseng ya app ya kiwix go tswa mo webosaeteng ya rona ya semmuso %s - Go Tlhaloganngwa O ka kgona jang go ntšhafatsa tshedimosetso? Go tlhabololwa ga diteng (faele ya zim) o tlhoka go tsaya kgatiso e e feletseng ya bosheng ya diteng tse di tshwanang. O ka dira seo ka karolo ya download. Tetla ya difaele tsotlhe e ya tlhokega diff --git a/core/src/main/res/values-tr/strings.xml b/core/src/main/res/values-tr/strings.xml index 88b1aab3d5..956820b43e 100644 --- a/core/src/main/res/values-tr/strings.xml +++ b/core/src/main/res/values-tr/strings.xml @@ -309,7 +309,6 @@ Çekmeceyi Kapat Zim dosyaları gösterilmiyor mu? Android 11 ve sonraki sürümlerdeki Google Play politikaları nedeniyle bu Google Store uygulaması, dışarıdan yüklenen ZIM dosyalarını açamaz. Bunları uygulama aracılığıyla indirebilir veya bunun yerine kiwix uygulamasının tam sürümünü resmi web sitemiz %s yükleyebilirsiniz. - Anlaşıldı İçerik nasıl güncellenir? İçeriği (bir zim dosyası) güncellemek için, aynı içeriğin en son sürümünü indirmeniz gerekir. Bunu indirme bölümünden yapabilirsiniz. Tüm Dosyalar İzni Gereklidir diff --git a/core/src/main/res/values-yo/strings.xml b/core/src/main/res/values-yo/strings.xml index 3e96182ea3..b72ad2f947 100644 --- a/core/src/main/res/values-yo/strings.xml +++ b/core/src/main/res/values-yo/strings.xml @@ -297,7 +297,6 @@ Pa Drawer Awọn faili Zim ko ṣe afihan? Nitori awọn ilana Google Play lori Android 11 ati loke, ohun elo itaja Google yii ko le ṣii awọn faili ZIM ti o ni ẹgbe. O le ṣe igbasilẹ wọn nipasẹ ohun elo naa tabi, dipo, fi ẹya kikun ti kiwix app sori ẹrọ lati oju opo wẹẹbu osise wa %s - Oye Bawo ni lati ṣe imudojuiwọn akoonu? Lati ṣe imudojuiwọn akoonu (faili zim kan) o nilo lati ṣe igbasilẹ ẹya tuntun ni kikun ti akoonu kanna. O le ṣe bẹ nipasẹ apakan gbigba lati ayelujara. Gbogbo Gbigbanilaaye Awọn faili Nilo diff --git a/core/src/main/res/values-zh-rTW/strings.xml b/core/src/main/res/values-zh-rTW/strings.xml index 2ee0405d0e..d2590bac5c 100644 --- a/core/src/main/res/values-zh-rTW/strings.xml +++ b/core/src/main/res/values-zh-rTW/strings.xml @@ -327,7 +327,6 @@ 關閉抽屜 沒有看到 zim 檔案？ 出自於 Android 11（或更高階版本）的 Google Play 政策，此款 Google 商店應用程式無法開啟側載的 zim 檔案。您可以改由應用程式來下載，或是從我們的官方網站：%s 來安裝完整版的 kiwix 應用程式 - 明白了 準備拷貝/移動 拷貝 移動 diff --git a/core/src/main/res/values-zh/strings.xml b/core/src/main/res/values-zh/strings.xml index 0a2d313ec6..f7fe84e90c 100644 --- a/core/src/main/res/values-zh/strings.xml +++ b/core/src/main/res/values-zh/strings.xml @@ -344,7 +344,6 @@ 关闭绘画器 没看到Zim文件？ 根据Android11及以上版本的Google Play政策，您现在使用的版本无法侧载ZIM文件。但您可以在程序内下载ZIM文件，或者在我们的官网（%s）下载完整版的Kiwix。 - 明白了 准备复制/移动 复制 移动 diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 71612bcc61..9cabc60554 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -326,7 +326,6 @@ Close Drawer Zim files not showing? Due to Google Play policies on Android 11 and above, this Google Store app can\’t open sideloaded ZIM files. You can either download them through the app or, instead, install the full version of kiwix app from our official website %s - Understood Preparing for copy/move Copy Move diff --git a/custom/src/androidTest/java/org/kiwix/kiwixmobile/custom/search/SearchFragmentTestForCustomApp.kt b/custom/src/androidTest/java/org/kiwix/kiwixmobile/custom/search/SearchFragmentTestForCustomApp.kt index f0f91af830..aa3338d51f 100644 --- a/custom/src/androidTest/java/org/kiwix/kiwixmobile/custom/search/SearchFragmentTestForCustomApp.kt +++ b/custom/src/androidTest/java/org/kiwix/kiwixmobile/custom/search/SearchFragmentTestForCustomApp.kt @@ -96,7 +96,6 @@ class SearchFragmentTestForCustomApp { putBoolean(SharedPreferenceUtil.PREF_SHOW_INTRO, false) putBoolean(SharedPreferenceUtil.PREF_WIFI_ONLY, false) putBoolean(SharedPreferenceUtil.PREF_IS_TEST, true) - putBoolean(SharedPreferenceUtil.PREF_PLAY_STORE_RESTRICTION, false) putString(SharedPreferenceUtil.PREF_LANG, "en") putLong( SharedPreferenceUtil.PREF_LAST_DONATION_POPUP_SHOWN_IN_MILLISECONDS, From e2d86c33d5012121eebba86a70d27cd00a9ac7bd Mon Sep 17 00:00:00 2001 From: MohitMaliFtechiz Date: Mon, 30 Sep 2024 22:31:04 +0530 Subject: [PATCH 2/2] Updated the message regarding ZIM file scanning restrictions in the Play Store variant. Informed users that they can load existing ZIM files via the file picker. --- core/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 9cabc60554..1eaa58efc4 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -325,7 +325,7 @@ Open Drawer Close Drawer Zim files not showing? - Due to Google Play policies on Android 11 and above, this Google Store app can\’t open sideloaded ZIM files. You can either download them through the app or, instead, install the full version of kiwix app from our official website %s + Due to Google Play policies on Android 11 and above, this Google Store app can\’t automatically scan sideloaded ZIM files. However, you can use the file picker in the library screen to manually load your ZIM files. Alternatively, you can download the full version of the Kiwix app from our official website %s Preparing for copy/move Copy Move