From 243568c44341ed6a8c8d72fb951d52ac0c302e89 Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Wed, 11 Sep 2019 12:09:58 +0100 Subject: [PATCH] #1126 Even after deleting the library downloaded file it still remaining cache --- .../java/org/kiwix/kiwixmobile/data/ZimContentProvider.java | 3 ++- .../main/java/org/kiwix/kiwixmobile/main/MainActivity.java | 4 ++++ .../zim_manager/fileselect_view/effects/DeleteFiles.kt | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/data/ZimContentProvider.java b/app/src/main/java/org/kiwix/kiwixmobile/data/ZimContentProvider.java index a957306ce..f40329cb5 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/data/ZimContentProvider.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/data/ZimContentProvider.java @@ -28,6 +28,7 @@ import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor.AutoCloseOutputStream; import android.util.Log; import android.webkit.MimeTypeMap; +import androidx.annotation.NonNull; import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; @@ -94,7 +95,7 @@ public class ZimContentProvider extends ContentProvider { return file; } - public synchronized static String setZimFile(String fileName) { + public synchronized static String setZimFile(@NonNull String fileName) { if (!new File(fileName).exists()) { Log.e(TAG_KIWIX, "Unable to find the ZIM file " + fileName); zimFileName = null; diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java index f44f3bf37..4f37da0d2 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java @@ -1317,6 +1317,10 @@ public class MainActivity extends BaseActivity implements WebViewCallback, recreate(); } presenter.loadCurrentZimBookmarksUrl(); + if (ZimContentProvider.zimFileName == null && + !HOME_URL.equals(getCurrentWebView().getUrl())) { + showHomePage(); + } if (getResources().getConfiguration().orientation == ORIENTATION_LANDSCAPE) { if (menu != null) { menu.getItem(4).setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt index 078049acd..dfcdd4978 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt @@ -2,6 +2,7 @@ package org.kiwix.kiwixmobile.zim_manager.fileselect_view.effects import android.app.Activity import org.kiwix.kiwixmobile.R.string +import org.kiwix.kiwixmobile.data.ZimContentProvider import org.kiwix.kiwixmobile.database.newdb.dao.NewBookDao import org.kiwix.kiwixmobile.extensions.toast import org.kiwix.kiwixmobile.utils.DialogShower @@ -21,6 +22,9 @@ class DeleteFiles(private val booksOnDiskListItem: List) : booksOnDiskListItem.forEach { dialogShower.show(DeleteZim(it), { if (deleteSpecificZimFile(it)) { + if (it.file.absolutePath.equals(ZimContentProvider.zimFileName)) { + ZimContentProvider.setZimFile("") + } activity.toast(string.delete_specific_zim_toast) } else { activity.toast(string.delete_zim_failed)