Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed: Move canReadFile() method to IO thread. #4040

Merged
merged 16 commits into from
Oct 21, 2024
Merged

Fixed: Move canReadFile() method to IO thread. #4040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
33bd339
Fixed: Move `canReadFile()` method to IO thread.
MohitMaliDeveloper Oct 16, 2024
13014db
Fixed EncodedUrlTest, LibkiwixBookmarkTest, MimeTypeTest, and ZimFile…
MohitMaliDeveloper Oct 16, 2024
93a01e5
Fixed: NewBookDaoTest, and DonationDialogHandlerTest.
MohitMaliDeveloper Oct 16, 2024
01320a5
Improved the refreshing of bookmarks after adding, deleting.
MohitMaliDeveloper Oct 17, 2024
5c25b20
Fixed: DonationDialogHandlerTest.
MohitMaliDeveloper Oct 17, 2024
a7f662f
Fixed: The search fragment test was failing in both the custom and ap…
MohitMaliDeveloper Oct 17, 2024
656a64d
Improved the search functionality of our application:
MohitMaliDeveloper Oct 17, 2024
31bb875
Removed the unused `ZimReaderContainerUtils.kt` class.
MohitMaliDeveloper Oct 17, 2024
78e265b
Fixed an issue where bookmarks would not open for a ZIM file if anoth…
MohitMaliDeveloper Oct 17, 2024
22daa3d
Reintroduced the fallback method for searched items.
MohitMaliDeveloper Oct 17, 2024
c97cf07
Fixed: `test search cancellation` sometimes failing in CI.
MohitMaliDeveloper Oct 18, 2024
ecbf1b3
Fixed: `books deletes entities whose file does not exist` failing.
MohitMaliDeveloper Oct 18, 2024
c7f8d99
Fixed: Search was not working properly, it always showing the current…
MohitMaliDeveloper Oct 18, 2024
b834e62
Fixed: OpenSearchItemTest was failing after fixing the search functio…
MohitMaliDeveloper Oct 18, 2024
d46a850
Fixed: sometimes a native crash happens when opening new ZIM files in…
MohitMaliDeveloper Oct 21, 2024
9861133
Clearing the webView list to avoid loading previous ZIM file URLs if …
MohitMaliDeveloper Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/src/androidTest/java/org/kiwix/kiwixmobile/ObjectBoxToLibkiwixMigratorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ class ObjectBoxToLibkiwixMigratorTest : BaseActivityTest() {
putBoolean(SharedPreferenceUtil.PREF_IS_TEST, true)
putBoolean(SharedPreferenceUtil.IS_PLAY_STORE_BUILD, true)
putString(SharedPreferenceUtil.PREF_LANG, "en")
putLong(
SharedPreferenceUtil.PREF_LAST_DONATION_POPUP_SHOWN_IN_MILLISECONDS,
System.currentTimeMillis()
)
}
activityScenario = ActivityScenario.launch(KiwixMainActivity::class.java).apply {
moveToState(Lifecycle.State.RESUMED)
Expand Down
62 changes: 34 additions & 28 deletions app/src/androidTest/java/org/kiwix/kiwixmobile/mimetype/MimeTypeTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ package org.kiwix.kiwixmobile.mimetype
import androidx.core.content.ContextCompat
import androidx.core.content.edit
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope
import androidx.preference.PreferenceManager
import androidx.test.core.app.ActivityScenario
import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.uiautomator.UiDevice
import kotlinx.coroutines.launch
import org.junit.After
import org.junit.Assert
import org.junit.Before
Expand Down Expand Up @@ -87,37 +89,41 @@ class MimeTypeTest : BaseActivityTest() {
}
}
val zimSource = ZimReaderSource(zimFile)
val archive = zimSource.createArchive()
val zimFileReader = ZimFileReader(
zimSource,
archive!!,
DarkModeConfig(SharedPreferenceUtil(context), context),
SuggestionSearcher(archive)
)
zimFileReader.getRandomArticleUrl()?.let {
val mimeType = zimFileReader.getMimeTypeFromUrl(it)
if (mimeType?.contains("^([^ ]+).*$") == true || mimeType?.contains(";") == true) {
Assert.fail(
"Unable to get mime type from zim file. File = " +
" $zimFile and url of article = $it"
activityScenario.onActivity {
it.lifecycleScope.launch {
val archive = zimSource.createArchive()
val zimFileReader = ZimFileReader(
zimSource,
archive!!,
DarkModeConfig(SharedPreferenceUtil(context), context),
SuggestionSearcher(archive)
)
zimFileReader.getRandomArticleUrl()?.let { randomArticle ->
val mimeType = zimFileReader.getMimeTypeFromUrl(randomArticle)
if (mimeType?.contains("^([^ ]+).*$") == true || mimeType?.contains(";") == true) {
Assert.fail(
"Unable to get mime type from zim file. File = " +
" $zimFile and url of article = $randomArticle"
)
}
} ?: kotlin.run {
Assert.fail("Unable to get article from zim file $zimFile")
}
// test mimetypes for some actual url
Assert.assertEquals(
"text/html",
zimFileReader.getMimeTypeFromUrl("https://kiwix.app/A/index.html")
)
Assert.assertEquals(
"text/css",
zimFileReader.getMimeTypeFromUrl("https://kiwix.app/-/assets/style1.css")
)
// test mimetype for invalid url
Assert.assertEquals(null, zimFileReader.getMimeTypeFromUrl("https://kiwix.app/A/test.html"))
// dispose the ZimFileReader
zimFileReader.dispose()
}
} ?: kotlin.run {
Assert.fail("Unable to get article from zim file $zimFile")
}
// test mimetypes for some actual url
Assert.assertEquals(
"text/html",
zimFileReader.getMimeTypeFromUrl("https://kiwix.app/A/index.html")
)
Assert.assertEquals(
"text/css",
zimFileReader.getMimeTypeFromUrl("https://kiwix.app/-/assets/style1.css")
)
// test mimetype for invalid url
Assert.assertEquals(null, zimFileReader.getMimeTypeFromUrl("https://kiwix.app/A/test.html"))
// dispose the ZimFileReader
zimFileReader.dispose()
}

@After
Expand Down
7 changes: 5 additions & 2 deletions app/src/androidTest/java/org/kiwix/kiwixmobile/page/bookmarks/LibkiwixBookmarkTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import androidx.test.uiautomator.UiDevice
import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResultUtils.matchesCheck
import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResultUtils.matchesViews
import com.google.android.apps.common.testing.accessibility.framework.checks.TouchTargetSizeCheck
import kotlinx.coroutines.runBlocking
import org.hamcrest.Matchers.allOf
import org.junit.Before
import org.junit.Rule
Expand Down Expand Up @@ -186,8 +187,10 @@ class LibkiwixBookmarkTest : BaseActivityTest() {
coreReaderFragment.zimReaderContainer?.zimFileReader?.favicon,
coreReaderFragment.zimReaderContainer?.zimFileReader?.zimReaderSource
)
coreReaderFragment.libkiwixBookmarks?.saveBookmark(libkiwixItem).also {
bookmarkList.add(libkiwixItem)
runBlocking {
coreReaderFragment.libkiwixBookmarks?.saveBookmark(libkiwixItem).also {
bookmarkList.add(libkiwixItem)
}
}
}
bookmarks {
Expand Down
140 changes: 73 additions & 67 deletions app/src/androidTest/java/org/kiwix/kiwixmobile/reader/EncodedUrlTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ package org.kiwix.kiwixmobile.reader
import androidx.core.content.ContextCompat
import androidx.core.content.edit
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope
import androidx.preference.PreferenceManager
import androidx.test.core.app.ActivityScenario
import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.uiautomator.UiDevice
import kotlinx.coroutines.launch
import org.junit.After
import org.junit.Assert
import org.junit.Before
Expand Down Expand Up @@ -94,74 +96,78 @@ class EncodedUrlTest : BaseActivityTest() {
}
}
val zimReaderSource = ZimReaderSource(zimFile)
val archive = zimReaderSource.createArchive()
val zimFileReader = ZimFileReader(
zimReaderSource,
archive!!,
DarkModeConfig(SharedPreferenceUtil(context), context),
SuggestionSearcher(archive)
)
val encodedUrls = arrayOf(
EncodedUrl(
"https://kiwix.app/foo/part%2520with%2520space/bar%253Fkey%253Dvalue",
"https://kiwix.app/foo/part%2520with%2520space/bar%253Fkey%253Dvalue"
),
EncodedUrl(
"https://kiwix.app/foo/part%20with%20space/bar%3Fkey%3Dvalue",
"https://kiwix.app/foo/part%20with%20space/bar%3Fkey%3Dvalue"
),
EncodedUrl(
"https://kiwix.app/foo%2Fpart%20with%20space%2Fbar%3Fkey%3Dvalue",
"https://kiwix.app/foo%2Fpart%20with%20space%2Fbar%3Fkey%3Dvalue"
),
EncodedUrl(
"https://kiwix.app/foo/part%20with%20space/bar?key=value",
"https://kiwix.app/foo/part%20with%20space/bar?key=value"
),
EncodedUrl(
"https://kiwix.app/foo/part/file%20with%20%3F%20and%20+?who=Chip%26Dale&quer=Is%20" +
"there%20any%20%2B%20here%3F",
"https://kiwix.app/foo/part/file%20with%20%3F%20and%20+?who=Chip%26Dale&quer" +
"=Is%20there%20any%20%2B%20here%3F"
),
EncodedUrl(
"https://kiwix.app/foo/part/file%20with%20%253F%20and%20%2B%3Fwho%3DChip%2526Dale%26" +
"quer%3DIs%2520there%2520any%2520%252B%2520here%253F",
"https://kiwix.app/foo/part/file%20with%20%253F%20and%20%2B%3Fwho%3DChip" +
"%2526Dale%26quer%3DIs%2520there%2520any%2520%252B%2520here%253F"
),
EncodedUrl(
"https://kiwix.app/foo/part/file%20with%20%3F%20and%20%2B%3Fwho%3DChip%26Dale%26" +
"question%3DIt%20there%20any%20%2B%20here%3F",
"https://kiwix.app/foo/part/file%20with%20%3F%20and%20%2B%3Fwho%3DChip%26" +
"Dale%26question%3DIt%20there%20any%20%2B%20here%3F"
),
EncodedUrl(
"https://kiwix.app/foo/part/file%3Fquestion%3DIs%2520there%2520any" +
"%2520%252B%2520here%253F",
"https://kiwix.app/foo/part/file%3Fquestion%3DIs%2520there%2520" +
"any%2520%252B%2520here%253F"
),
EncodedUrl(
"https://kiwix.app/foo/part/file%3Fquestion%3DIs%2Bthere%2Bany%2B%252B%2Bhere%253F",
"https://kiwix.app/foo/part/file%3Fquestion%3DIs%2Bthere%2Bany%2B%252B%2B" +
"here%253F"
),
EncodedUrl(
"https://kiwix.app/%F0%9F%A5%B3%F0%9F%A5%B0%F0%9F%98%98%F0%9F%A4%A9%F0%9F%98%8D%F0%9F" +
"%A4%8D%F0%9F%8E%80%F0%9F%A7%B8%F0%9F%8C%B7%F0%9F%8D%AD",
"https://kiwix.app/%F0%9F%A5%B3%F0%9F%A5%B0%F0%9F%98%98%F0%9F%A4%A9%F0%9F%98%8D" +
"%F0%9F%A4%8D%F0%9F%8E%80%F0%9F%A7%B8%F0%9F%8C%B7%F0%9F%8D%AD"
)
)
encodedUrls.forEach {
Assert.assertEquals(
it.expectedUrl,
zimFileReader.getRedirect(it.url)
)
activityScenario.onActivity {
it.lifecycleScope.launch {
val archive = zimReaderSource.createArchive()
val zimFileReader = ZimFileReader(
zimReaderSource,
archive!!,
DarkModeConfig(SharedPreferenceUtil(context), context),
SuggestionSearcher(archive)
)
val encodedUrls = arrayOf(
EncodedUrl(
"https://kiwix.app/foo/part%2520with%2520space/bar%253Fkey%253Dvalue",
"https://kiwix.app/foo/part%2520with%2520space/bar%253Fkey%253Dvalue"
),
EncodedUrl(
"https://kiwix.app/foo/part%20with%20space/bar%3Fkey%3Dvalue",
"https://kiwix.app/foo/part%20with%20space/bar%3Fkey%3Dvalue"
),
EncodedUrl(
"https://kiwix.app/foo%2Fpart%20with%20space%2Fbar%3Fkey%3Dvalue",
"https://kiwix.app/foo%2Fpart%20with%20space%2Fbar%3Fkey%3Dvalue"
),
EncodedUrl(
"https://kiwix.app/foo/part%20with%20space/bar?key=value",
"https://kiwix.app/foo/part%20with%20space/bar?key=value"
),
EncodedUrl(
"https://kiwix.app/foo/part/file%20with%20%3F%20and%20+?who=Chip%26Dale&quer=Is%20" +
"there%20any%20%2B%20here%3F",
"https://kiwix.app/foo/part/file%20with%20%3F%20and%20+?who=Chip%26Dale&quer" +
"=Is%20there%20any%20%2B%20here%3F"
),
EncodedUrl(
"https://kiwix.app/foo/part/file%20with%20%253F%20and%20%2B%3Fwho%3DChip%2526Dale%26" +
"quer%3DIs%2520there%2520any%2520%252B%2520here%253F",
"https://kiwix.app/foo/part/file%20with%20%253F%20and%20%2B%3Fwho%3DChip" +
"%2526Dale%26quer%3DIs%2520there%2520any%2520%252B%2520here%253F"
),
EncodedUrl(
"https://kiwix.app/foo/part/file%20with%20%3F%20and%20%2B%3Fwho%3DChip%26Dale%26" +
"question%3DIt%20there%20any%20%2B%20here%3F",
"https://kiwix.app/foo/part/file%20with%20%3F%20and%20%2B%3Fwho%3DChip%26" +
"Dale%26question%3DIt%20there%20any%20%2B%20here%3F"
),
EncodedUrl(
"https://kiwix.app/foo/part/file%3Fquestion%3DIs%2520there%2520any" +
"%2520%252B%2520here%253F",
"https://kiwix.app/foo/part/file%3Fquestion%3DIs%2520there%2520" +
"any%2520%252B%2520here%253F"
),
EncodedUrl(
"https://kiwix.app/foo/part/file%3Fquestion%3DIs%2Bthere%2Bany%2B%252B%2Bhere%253F",
"https://kiwix.app/foo/part/file%3Fquestion%3DIs%2Bthere%2Bany%2B%252B%2B" +
"here%253F"
),
EncodedUrl(
"https://kiwix.app/%F0%9F%A5%B3%F0%9F%A5%B0%F0%9F%98%98%F0%9F%A4%A9%F0%9F%98%8D%F0%9F" +
"%A4%8D%F0%9F%8E%80%F0%9F%A7%B8%F0%9F%8C%B7%F0%9F%8D%AD",
"https://kiwix.app/%F0%9F%A5%B3%F0%9F%A5%B0%F0%9F%98%98%F0%9F%A4%A9%F0%9F%98%8D" +
"%F0%9F%A4%8D%F0%9F%8E%80%F0%9F%A7%B8%F0%9F%8C%B7%F0%9F%8D%AD"
)
)
encodedUrls.forEach { encodedUrl ->
Assert.assertEquals(
encodedUrl.expectedUrl,
zimFileReader.getRedirect(encodedUrl.url)
)
}
// dispose the ZimFileReader
zimFileReader.dispose()
}
}
// dispose the ZimFileReader
zimFileReader.dispose()
}

@After
Expand Down
4 changes: 2 additions & 2 deletions app/src/androidTest/java/org/kiwix/kiwixmobile/reader/KiwixReaderFragmentTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ import com.google.android.apps.common.testing.accessibility.framework.Accessibil
import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResultUtils.matchesViews
import com.google.android.apps.common.testing.accessibility.framework.checks.TouchTargetSizeCheck
import leakcanary.LeakAssertions
import okhttp3.OkHttpClient
import okhttp3.Request
import okhttp3.ResponseBody
import org.hamcrest.Matchers.allOf
Expand All @@ -50,6 +49,7 @@ import org.kiwix.kiwixmobile.nav.destination.library.LocalLibraryFragmentDirecti
import org.kiwix.kiwixmobile.testutils.RetryRule
import org.kiwix.kiwixmobile.testutils.TestUtils
import org.kiwix.kiwixmobile.testutils.TestUtils.closeSystemDialogs
import org.kiwix.kiwixmobile.testutils.TestUtils.getOkkHttpClientForTesting
import org.kiwix.kiwixmobile.testutils.TestUtils.isSystemUINotRespondingDialogVisible
import java.io.File
import java.io.FileOutputStream
Expand Down Expand Up @@ -147,7 +147,7 @@ class KiwixReaderFragmentTest : BaseActivityTest() {
kiwixMainActivity.navigate(R.id.libraryFragment)
}
val downloadingZimFile = getDownloadingZimFile()
OkHttpClient().newCall(downloadRequest()).execute().use { response ->
getOkkHttpClientForTesting().newCall(downloadRequest()).execute().use { response ->
if (response.isSuccessful) {
response.body?.let { responseBody ->
writeZimFileData(responseBody, downloadingZimFile)
Expand Down
24 changes: 15 additions & 9 deletions ...src/androidTest/java/org/kiwix/kiwixmobile/reader/ZimFileReaderWithSplittedZimFileTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import androidx.core.content.ContextCompat
import androidx.core.content.edit
import androidx.core.net.toUri
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope
import androidx.preference.PreferenceManager
import androidx.test.core.app.ActivityScenario
import androidx.test.espresso.accessibility.AccessibilityChecks
Expand All @@ -32,6 +33,7 @@ import androidx.test.uiautomator.UiDevice
import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResultUtils.matchesCheck
import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResultUtils.matchesViews
import com.google.android.apps.common.testing.accessibility.framework.checks.TouchTargetSizeCheck
import kotlinx.coroutines.launch
import org.hamcrest.Matchers.allOf
import org.junit.After
import org.junit.Assert
Expand Down Expand Up @@ -135,15 +137,19 @@ class ZimFileReaderWithSplittedZimFileTest : BaseActivityTest() {
createAndGetSplitedZimFile(true)?.let { zimFile ->
// test the articleCount and mediaCount of this zim file.
val zimReaderSource = ZimReaderSource(zimFile)
val archive = zimReaderSource.createArchive()
val zimFileReader = ZimFileReader(
zimReaderSource,
archive!!,
DarkModeConfig(SharedPreferenceUtil(context), context),
SuggestionSearcher(archive)
)
Assert.assertEquals(zimFileReader.mediaCount, 16)
Assert.assertEquals(zimFileReader.articleCount, 4)
activityScenario.onActivity {
it.lifecycleScope.launch {
val archive = zimReaderSource.createArchive()
val zimFileReader = ZimFileReader(
zimReaderSource,
archive!!,
DarkModeConfig(SharedPreferenceUtil(context), context),
SuggestionSearcher(archive)
)
Assert.assertEquals(zimFileReader.mediaCount, 16)
Assert.assertEquals(zimFileReader.articleCount, 4)
}
}
} ?: kotlin.run {
// error in creating the zim file chunk
fail("Couldn't create the zim file chunk")
Expand Down
6 changes: 3 additions & 3 deletions app/src/androidTest/java/org/kiwix/kiwixmobile/search/SearchFragmentTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import com.google.android.apps.common.testing.accessibility.framework.checks.Tou
import kotlinx.coroutines.delay
import kotlinx.coroutines.runBlocking
import leakcanary.LeakAssertions
import okhttp3.OkHttpClient
import okhttp3.Request
import okhttp3.ResponseBody
import org.hamcrest.Matchers.allOf
Expand All @@ -57,6 +56,7 @@ import org.kiwix.kiwixmobile.nav.destination.library.LocalLibraryFragmentDirecti
import org.kiwix.kiwixmobile.testutils.RetryRule
import org.kiwix.kiwixmobile.testutils.TestUtils
import org.kiwix.kiwixmobile.testutils.TestUtils.closeSystemDialogs
import org.kiwix.kiwixmobile.testutils.TestUtils.getOkkHttpClientForTesting
import org.kiwix.kiwixmobile.testutils.TestUtils.isSystemUINotRespondingDialogVisible
import java.io.File
import java.io.FileOutputStream
Expand Down Expand Up @@ -169,7 +169,7 @@ class SearchFragmentTest : BaseActivityTest() {
UiThreadStatement.runOnUiThread { kiwixMainActivity.navigate(R.id.libraryFragment) }
// test with a large ZIM file to properly test the scenario
downloadingZimFile = getDownloadingZimFile()
OkHttpClient().newCall(downloadRequest()).execute().use { response ->
getOkkHttpClientForTesting().newCall(downloadRequest()).execute().use { response ->
if (response.isSuccessful) {
response.body?.let { responseBody ->
writeZimFileData(responseBody, downloadingZimFile)
Expand Down Expand Up @@ -242,7 +242,7 @@ class SearchFragmentTest : BaseActivityTest() {
kiwixMainActivity.navigate(R.id.libraryFragment)
}
downloadingZimFile = getDownloadingZimFile()
OkHttpClient().newCall(downloadRequest()).execute().use { response ->
getOkkHttpClientForTesting().newCall(downloadRequest()).execute().use { response ->
if (response.isSuccessful) {
response.body?.let { responseBody ->
writeZimFileData(responseBody, downloadingZimFile)
Expand Down
Loading
Loading