kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-08-03 10:46:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: testOpeningFileWithFilePicker test intermittently fails on API level 34.

Browse Source 
* Fixed: Memory leaks in `OnlineLibraryFragment` that appeared after upgrading LeakCanary.
* Fixed: Memory leaks in `LocalFileTransferFragment` that appeared after upgrading LeakCanary.
* Fixed: A memory leak in `ZimManageViewModel` caused by `addNetworkInterceptor` holding a reference to progressListener.
This commit is contained in:
MohitMaliFtechiz 2025-03-24 17:58:22 +05:30
parent 6aa0980e4d
commit 4205fc41b7
6 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/androidTest/java/org/kiwix/kiwixmobile/localLibrary/OpeningFilesFromStorageTest.kt
View File

@ -117,7 +117,7 @@ class OpeningFilesFromStorageTest : BaseActivityTest() {
sharedPreferenceUtil.shouldShowStorageSelectionDialog = true
// open file picker to select a file to test the real scenario.
composeTestRule.onNodeWithTag(SELECT_FILE_BUTTON_TESTING_TAG).performClick()
uiDevice.findObject(By.textContains(fileName)).click()
TestUtils.testFlakyView(uiDevice.findObject(By.textContains(fileName))::click, 10)
copyMoveFileHandler {
assertCopyMoveDialogDisplayed()

1
app/src/main/java/org/kiwix/kiwixmobile/localFileTransfer/LocalFileTransferFragment.kt
View File

@ -533,6 +533,7 @@ class LocalFileTransferFragment :
override fun onDestroyView() {
wifiDirectManager.stopWifiDirectManager()
wifiDirectManager.callbacks = null
fragmentLocalFileTransferBinding?.root?.removeAllViews()
fragmentLocalFileTransferBinding = null
searchIconView = null
materialShowCaseSequence = null

21
app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/OnlineLibraryFragment.kt
View File

@ -227,13 +227,13 @@ class OnlineLibraryFragment : BaseFragment(), FragmentActivityExtensions {
setupMenu()
// hides keyboard when scrolled
fragmentDestinationDownloadBinding?.libraryList?.addOnScrollListener(
SimpleRecyclerViewScrollListener { _, newState ->
if (newState == RecyclerView.SCROLL_STATE_DRAGGING) {
fragmentDestinationDownloadBinding?.libraryList?.closeKeyboard()
}
}
)
fragmentDestinationDownloadBinding?.libraryList?.addOnScrollListener(simpleScrollListener)
}
private var simpleScrollListener = SimpleRecyclerViewScrollListener { _, newState ->
if (newState == RecyclerView.SCROLL_STATE_DRAGGING) {
fragmentDestinationDownloadBinding?.libraryList?.closeKeyboard()
}
}
private fun setupMenu() {
@ -373,7 +373,12 @@ class OnlineLibraryFragment : BaseFragment(), FragmentActivityExtensions {
override fun onDestroyView() {
super.onDestroyView()
fragmentDestinationDownloadBinding?.libraryList?.adapter = null
fragmentDestinationDownloadBinding?.apply {
librarySwipeRefresh.setOnRefreshListener(null)
libraryList.removeOnScrollListener(simpleScrollListener)
libraryList.adapter = null
root.removeAllViews()
}
fragmentDestinationDownloadBinding = null
}

7
app/src/main/java/org/kiwix/kiwixmobile/zimManager/ZimManageViewModel.kt
View File

@ -181,7 +181,7 @@ class ZimManageViewModel @Inject constructor(
.body(
ProgressResponseBody(
responseBody,
AppProgressListenerProvider(this),
appProgressListener,
contentLength
)
)
@ -195,6 +195,8 @@ class ZimManageViewModel @Inject constructor(
}
}
private var appProgressListener: AppProgressListenerProvider? = AppProgressListenerProvider(this)
private fun getContentLengthOfLibraryXmlFile(): Long {
val headRequest =
Request.Builder()
@ -218,7 +220,7 @@ class ZimManageViewModel @Inject constructor(
?: DEFAULT_INT_VALUE.toLong()
}
}
} catch (ignore: Exception) {
} catch (_: Exception) {
// do nothing
}
return DEFAULT_INT_VALUE.toLong()
@ -237,6 +239,7 @@ class ZimManageViewModel @Inject constructor(
fileSelectActions.onComplete()
requestDownloadLibrary.onComplete()
compositeDisposable = null
appProgressListener = null
super.onCleared()
}

4
core/src/main/java/org/kiwix/kiwixmobile/core/data/remote/ProgressResponseBody.kt
View File

@ -30,7 +30,7 @@ import org.kiwix.kiwixmobile.core.downloader.downloadManager.ZERO
class ProgressResponseBody(
private val responseBody: ResponseBody,
private val progressListener: OnlineLibraryProgressListener,
private val progressListener: OnlineLibraryProgressListener?,
private val contentLength: Long
) : ResponseBody() {
private lateinit var bufferedSource: BufferedSource
@ -51,7 +51,7 @@ class ProgressResponseBody(
override fun read(sink: Buffer, byteCount: Long): Long {
val bytesRead = super.read(sink, byteCount)
totalBytesRead += if (bytesRead != DEFAULT_INT_VALUE.toLong()) bytesRead else ZERO.toLong()
progressListener.onProgress(totalBytesRead, contentLength)
progressListener?.onProgress(totalBytesRead, contentLength)
return bytesRead
}
}

5
core/src/main/java/org/kiwix/kiwixmobile/core/page/PageFragment.kt
View File

@ -189,7 +189,10 @@ abstract class PageFragment : OnItemClickListener, BaseFragment(), FragmentActiv
override fun onDestroyView() {
super.onDestroyView()
compositeDisposable.clear()
fragmentPageBinding?.recyclerView?.adapter = null
fragmentPageBinding?.apply {
recyclerView.adapter = null
root.removeAllViews()
}
fragmentPageBinding = null
}