From 6a167459201ae6402e8bd55c6fade30601b18d06 Mon Sep 17 00:00:00 2001 From: MohitMaliFtechiz Date: Mon, 29 Jul 2024 18:21:17 +0530 Subject: [PATCH] Fixed: zim file was not opening when clicking on the notification after the zim file downloaded --- .../main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt | 2 +- .../src/main/java/org/kiwix/kiwixmobile/core/dao/NewBookDao.kt | 2 +- .../downloader/downloadManager/DownloadNotificationManager.kt | 3 ++- .../core/downloader/fetch/FetchDownloadNotificationManager.kt | 3 +-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt index a39306f6f..ed2432bd1 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt @@ -38,7 +38,7 @@ import org.kiwix.kiwixmobile.BuildConfig import org.kiwix.kiwixmobile.R import org.kiwix.kiwixmobile.core.base.FragmentActivityExtensions import org.kiwix.kiwixmobile.core.dao.NewBookDao -import org.kiwix.kiwixmobile.core.downloader.fetch.DOWNLOAD_NOTIFICATION_TITLE +import org.kiwix.kiwixmobile.core.downloader.downloadManager.DOWNLOAD_NOTIFICATION_TITLE import org.kiwix.kiwixmobile.core.main.CoreMainActivity import org.kiwix.kiwixmobile.core.utils.EXTERNAL_SELECT_POSITION import org.kiwix.kiwixmobile.core.utils.INTERNAL_SELECT_POSITION diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/dao/NewBookDao.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/dao/NewBookDao.kt index b01e22ee3..1a7ee1968 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/dao/NewBookDao.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/dao/NewBookDao.kt @@ -90,7 +90,7 @@ class NewBookDao @Inject constructor(private val box: Box) { fun bookMatching(downloadTitle: String) = box.query { endsWith( - BookOnDiskEntity_.file, downloadTitle, + BookOnDiskEntity_.title, downloadTitle, QueryBuilder.StringOrder.CASE_INSENSITIVE ) }.findFirst() diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/downloader/downloadManager/DownloadNotificationManager.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/downloader/downloadManager/DownloadNotificationManager.kt index 742f6f843..56ec5bb93 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/downloader/downloadManager/DownloadNotificationManager.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/downloader/downloadManager/DownloadNotificationManager.kt @@ -29,13 +29,14 @@ import androidx.annotation.RequiresApi import androidx.core.app.NotificationCompat import org.kiwix.kiwixmobile.core.Intents import org.kiwix.kiwixmobile.core.R -import org.kiwix.kiwixmobile.core.downloader.fetch.DOWNLOAD_NOTIFICATION_TITLE import org.kiwix.kiwixmobile.core.downloader.model.Seconds import org.kiwix.kiwixmobile.core.main.CoreMainActivity import org.kiwix.kiwixmobile.core.utils.DEFAULT_NOTIFICATION_TIMEOUT_AFTER import org.kiwix.kiwixmobile.core.utils.DEFAULT_NOTIFICATION_TIMEOUT_AFTER_RESET import javax.inject.Inject +const val DOWNLOAD_NOTIFICATION_TITLE = "OPEN_ZIM_FILE" + class DownloadNotificationManager @Inject constructor( private val context: Context, private val notificationManager: NotificationManager diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/downloader/fetch/FetchDownloadNotificationManager.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/downloader/fetch/FetchDownloadNotificationManager.kt index cabf8c54b..9cdfc3254 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/downloader/fetch/FetchDownloadNotificationManager.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/downloader/fetch/FetchDownloadNotificationManager.kt @@ -50,10 +50,9 @@ import org.kiwix.kiwixmobile.core.Intents import org.kiwix.kiwixmobile.core.R import org.kiwix.kiwixmobile.core.R.string import org.kiwix.kiwixmobile.core.dao.FetchDownloadDao +import org.kiwix.kiwixmobile.core.downloader.downloadManager.DOWNLOAD_NOTIFICATION_TITLE import org.kiwix.kiwixmobile.core.main.CoreMainActivity -const val DOWNLOAD_NOTIFICATION_TITLE = "OPEN_ZIM_FILE" - class FetchDownloadNotificationManager( private val context: Context, private val fetchDownloadDao: FetchDownloadDao