Sulkta-OSS/straw
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Fix DB import/export issue

Browse source
This commit is contained in:
Isira Seneviratne 2025-07-07 07:53:20 +05:30 • committed by Aayush Gupta
parent 0d36977659
commit 923ebc723b
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/org/schabi/newpipe/settings/BackupRestoreSettingsFragment.java
View file

@ -16,7 +16,6 @@ import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts; import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceManager; import androidx.preference.PreferenceManager;
@ -39,7 +38,6 @@ import java.io.IOException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.Locale; import java.util.Locale;
import java.util.Objects;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
@ -69,8 +67,8 @@ public class BackupRestoreSettingsFragment extends BasePreferenceFragment {
@Override @Override
public void onCreatePreferences(@Nullable final Bundle savedInstanceState, public void onCreatePreferences(@Nullable final Bundle savedInstanceState,
@Nullable final String rootKey) { @Nullable final String rootKey) {
final var dbDir = Objects.requireNonNull(ContextCompat.getDataDir(requireContext())) final var dbDir = requireContext().getDatabasePath(BackupFileLocator.FILE_NAME_DB).toPath()
.toPath(); .getParent();
manager = new ImportExportManager(new BackupFileLocator(dbDir)); manager = new ImportExportManager(new BackupFileLocator(dbDir));
importExportDataPathKey = getString(R.string.import_export_data_path); importExportDataPathKey = getString(R.string.import_export_data_path);

8
app/src/main/java/org/schabi/newpipe/settings/export/ImportExportManager.kt
View file

@ -10,7 +10,7 @@ import java.io.IOException
import java.io.ObjectOutputStream import java.io.ObjectOutputStream
import java.util.zip.ZipOutputStream import java.util.zip.ZipOutputStream
import kotlin.io.path.createDirectories import kotlin.io.path.createDirectories
import kotlin.io.path.deleteExisting import kotlin.io.path.deleteIfExists
import org.schabi.newpipe.streams.io.SharpOutputStream import org.schabi.newpipe.streams.io.SharpOutputStream
import org.schabi.newpipe.streams.io.StoredFileHelper import org.schabi.newpipe.streams.io.StoredFileHelper
import org.schabi.newpipe.util.ZipHelper import org.schabi.newpipe.util.ZipHelper
@ -77,9 +77,9 @@ class ImportExportManager(private val fileLocator: BackupFileLocator) {
val success = ZipHelper.extractFileFromZip(file, name, fileLocator.db) val success = ZipHelper.extractFileFromZip(file, name, fileLocator.db)
if (success) { if (success) {
fileLocator.dbJournal.deleteExisting() fileLocator.dbJournal.deleteIfExists()
fileLocator.dbWal.deleteExisting() fileLocator.dbWal.deleteIfExists()
fileLocator.dbShm.deleteExisting() fileLocator.dbShm.deleteIfExists()
} }
return success return success