From 3e106b5e4feea5c3b54a3df06188507c4e10a329 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Mon, 7 Jul 2025 07:53:20 +0530
Subject: [PATCH] Fix DB import/export issue

---
 .../newpipe/settings/BackupRestoreSettingsFragment.java   | 6 ++----
 .../schabi/newpipe/settings/export/ImportExportManager.kt | 8 ++++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/settings/BackupRestoreSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/BackupRestoreSettingsFragment.java
index cc93e9227..fca158c28 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/BackupRestoreSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/BackupRestoreSettingsFragment.java
@@ -17,7 +17,6 @@ import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceManager;
 
@@ -39,7 +38,6 @@ import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
-import java.util.Objects;
 
 public class BackupRestoreSettingsFragment extends BasePreferenceFragment {
 
@@ -60,8 +58,8 @@ public class BackupRestoreSettingsFragment extends BasePreferenceFragment {
     @Override
     public void onCreatePreferences(@Nullable final Bundle savedInstanceState,
                                     @Nullable final String rootKey) {
-        final var dbDir = Objects.requireNonNull(ContextCompat.getDataDir(requireContext()))
-                .toPath();
+        final var dbDir = requireContext().getDatabasePath(BackupFileLocator.FILE_NAME_DB).toPath()
+                .getParent();
         manager = new ImportExportManager(new BackupFileLocator(dbDir));
 
         importExportDataPathKey = getString(R.string.import_export_data_path);
diff --git a/app/src/main/java/org/schabi/newpipe/settings/export/ImportExportManager.kt b/app/src/main/java/org/schabi/newpipe/settings/export/ImportExportManager.kt
index 04562bc77..6b0eb7eb9 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/export/ImportExportManager.kt
+++ b/app/src/main/java/org/schabi/newpipe/settings/export/ImportExportManager.kt
@@ -13,7 +13,7 @@ import java.io.IOException
 import java.io.ObjectOutputStream
 import java.util.zip.ZipOutputStream
 import kotlin.io.path.createDirectories
-import kotlin.io.path.deleteExisting
+import kotlin.io.path.deleteIfExists
 
 class ImportExportManager(private val fileLocator: BackupFileLocator) {
     companion object {
@@ -77,9 +77,9 @@ class ImportExportManager(private val fileLocator: BackupFileLocator) {
         val success = ZipHelper.extractFileFromZip(file, name, fileLocator.db)
 
         if (success) {
-            fileLocator.dbJournal.deleteExisting()
-            fileLocator.dbWal.deleteExisting()
-            fileLocator.dbShm.deleteExisting()
+            fileLocator.dbJournal.deleteIfExists()
+            fileLocator.dbWal.deleteIfExists()
+            fileLocator.dbShm.deleteIfExists()
         }
 
         return success