kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-16 02:48:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: When we select any ZIM file using the file picker, it is not being added to the library screen.

Browse Source
This commit is contained in:
MohitMaliFtechiz 2024-01-03 18:44:11 +05:30 committed by Kelson
parent 37b20dffea
commit 17068b540e
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/LocalLibraryFragment.kt
View File

@ -69,8 +69,10 @@ import org.kiwix.kiwixmobile.core.extensions.setBottomMarginToFragmentContainerV
import org.kiwix.kiwixmobile.core.extensions.toast import org.kiwix.kiwixmobile.core.extensions.toast
import org.kiwix.kiwixmobile.core.main.CoreMainActivity import org.kiwix.kiwixmobile.core.main.CoreMainActivity
import org.kiwix.kiwixmobile.core.main.KIWIX_APK_WEBSITE_URL import org.kiwix.kiwixmobile.core.main.KIWIX_APK_WEBSITE_URL
import org.kiwix.kiwixmobile.core.main.MainRepositoryActions
import org.kiwix.kiwixmobile.core.navigateToAppSettings import org.kiwix.kiwixmobile.core.navigateToAppSettings
import org.kiwix.kiwixmobile.core.navigateToSettings import org.kiwix.kiwixmobile.core.navigateToSettings
import org.kiwix.kiwixmobile.core.reader.ZimFileReader
import org.kiwix.kiwixmobile.core.utils.LanguageUtils import org.kiwix.kiwixmobile.core.utils.LanguageUtils
import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil
import org.kiwix.kiwixmobile.core.utils.SimpleRecyclerViewScrollListener import org.kiwix.kiwixmobile.core.utils.SimpleRecyclerViewScrollListener
@ -82,6 +84,7 @@ import org.kiwix.kiwixmobile.core.utils.files.FileUtils
import org.kiwix.kiwixmobile.core.zim_manager.fileselect_view.adapter.BookOnDiskDelegate import org.kiwix.kiwixmobile.core.zim_manager.fileselect_view.adapter.BookOnDiskDelegate
import org.kiwix.kiwixmobile.core.zim_manager.fileselect_view.adapter.BooksOnDiskAdapter import org.kiwix.kiwixmobile.core.zim_manager.fileselect_view.adapter.BooksOnDiskAdapter
import org.kiwix.kiwixmobile.core.zim_manager.fileselect_view.adapter.BooksOnDiskListItem import org.kiwix.kiwixmobile.core.zim_manager.fileselect_view.adapter.BooksOnDiskListItem
import org.kiwix.kiwixmobile.core.zim_manager.fileselect_view.adapter.BooksOnDiskListItem.BookOnDisk
import org.kiwix.kiwixmobile.databinding.FragmentDestinationLibraryBinding import org.kiwix.kiwixmobile.databinding.FragmentDestinationLibraryBinding
import org.kiwix.kiwixmobile.zimManager.ZimManageViewModel import org.kiwix.kiwixmobile.zimManager.ZimManageViewModel
import org.kiwix.kiwixmobile.zimManager.ZimManageViewModel.FileSelectActions import org.kiwix.kiwixmobile.zimManager.ZimManageViewModel.FileSelectActions
@ -101,6 +104,8 @@ class LocalLibraryFragment : BaseFragment() {
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
@Inject lateinit var sharedPreferenceUtil: SharedPreferenceUtil @Inject lateinit var sharedPreferenceUtil: SharedPreferenceUtil
@Inject lateinit var dialogShower: DialogShower @Inject lateinit var dialogShower: DialogShower
@Inject lateinit var mainRepositoryActions: MainRepositoryActions
@Inject lateinit var zimReaderFactory: ZimFileReader.Factory
private var actionMode: ActionMode? = null private var actionMode: ActionMode? = null
private val disposable = CompositeDisposable() private val disposable = CompositeDisposable()
@ -364,6 +369,19 @@ class LocalLibraryFragment : BaseFragment() {
if (!file.canRead()) { if (!file.canRead()) {
activity.toast(R.string.unable_to_read_zim_file) activity.toast(R.string.unable_to_read_zim_file)
} else { } else {
// Save the ZIM file to the database to display it on the local library screen.
// This is particularly useful when storage is slow or contains a large number of files.
// In such cases, scanning may take some time to show all the files on the
// local library screen. Since our application is already aware of this opened ZIM file,
// we can directly add it to the database.
// See https://github.com/kiwix/kiwix-android/issues/3650
zimReaderFactory.create(file)
?.let { zimFileReader ->
BookOnDisk(file, zimFileReader).also {
mainRepositoryActions.saveBook(it)
zimFileReader.dispose()
}
}
activity?.navigate( activity?.navigate(
LocalLibraryFragmentDirections.actionNavigationLibraryToNavigationReader() LocalLibraryFragmentDirections.actionNavigationLibraryToNavigationReader()
.apply { zimFileUri = file.toUri().toString() } .apply { zimFileUri = file.toUri().toString() }
@ -403,6 +421,7 @@ class LocalLibraryFragment : BaseFragment() {
override fun onDestroyView() { override fun onDestroyView() {
super.onDestroyView() super.onDestroyView()
mainRepositoryActions.dispose()
actionMode = null actionMode = null
fragmentDestinationLibraryBinding?.zimfilelist?.adapter = null fragmentDestinationLibraryBinding?.zimfilelist?.adapter = null
fragmentDestinationLibraryBinding = null fragmentDestinationLibraryBinding = null