File tree Expand file tree Collapse file tree
app/src/main/java/org/schabi/newpipe/settings Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1717import androidx .activity .result .contract .ActivityResultContracts ;
1818import androidx .annotation .NonNull ;
1919import androidx .annotation .Nullable ;
20- import androidx .core .content .ContextCompat ;
2120import androidx .preference .Preference ;
2221import androidx .preference .PreferenceManager ;
2322
3938import java .text .SimpleDateFormat ;
4039import java .util .Date ;
4140import java .util .Locale ;
42- import java .util .Objects ;
4341
4442public class BackupRestoreSettingsFragment extends BasePreferenceFragment {
4543
@@ -60,8 +58,8 @@ public class BackupRestoreSettingsFragment extends BasePreferenceFragment {
6058 @ Override
6159 public void onCreatePreferences (@ Nullable final Bundle savedInstanceState ,
6260 @ Nullable final String rootKey ) {
63- final var dbDir = Objects . requireNonNull ( ContextCompat . getDataDir ( requireContext ()) )
64- .toPath ();
61+ final var dbDir = requireContext (). getDatabasePath ( BackupFileLocator . FILE_NAME_DB ). toPath ( )
62+ .getParent ();
6563 manager = new ImportExportManager (new BackupFileLocator (dbDir ));
6664
6765 importExportDataPathKey = getString (R .string .import_export_data_path );
Original file line number Diff line number Diff line change @@ -13,7 +13,7 @@ import java.io.IOException
1313import java.io.ObjectOutputStream
1414import java.util.zip.ZipOutputStream
1515import kotlin.io.path.createDirectories
16- import kotlin.io.path.deleteExisting
16+ import kotlin.io.path.deleteIfExists
1717
1818class ImportExportManager (private val fileLocator : BackupFileLocator ) {
1919 companion object {
@@ -77,9 +77,9 @@ class ImportExportManager(private val fileLocator: BackupFileLocator) {
7777 val success = ZipHelper .extractFileFromZip(file, name, fileLocator.db)
7878
7979 if (success) {
80- fileLocator.dbJournal.deleteExisting ()
81- fileLocator.dbWal.deleteExisting ()
82- fileLocator.dbShm.deleteExisting ()
80+ fileLocator.dbJournal.deleteIfExists ()
81+ fileLocator.dbWal.deleteIfExists ()
82+ fileLocator.dbShm.deleteIfExists ()
8383 }
8484
8585 return success
You can’t perform that action at this time.
0 commit comments