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 1616import androidx .activity .result .contract .ActivityResultContracts ;
1717import androidx .annotation .NonNull ;
1818import androidx .annotation .Nullable ;
19- import androidx .core .content .ContextCompat ;
2019import androidx .preference .Preference ;
2120import androidx .preference .PreferenceManager ;
2221
3938import java .text .SimpleDateFormat ;
4039import java .util .Date ;
4140import java .util .Locale ;
42- import java .util .Objects ;
4341import java .util .concurrent .ExecutorService ;
4442import java .util .concurrent .Executors ;
4543
@@ -69,8 +67,8 @@ public void onAttach(@NonNull final Context context) {
6967 @ Override
7068 public void onCreatePreferences (@ Nullable final Bundle savedInstanceState ,
7169 @ Nullable final String rootKey ) {
72- final var dbDir = Objects . requireNonNull ( ContextCompat . getDataDir ( requireContext ()) )
73- .toPath ();
70+ final var dbDir = requireContext (). getDatabasePath ( BackupFileLocator . FILE_NAME_DB ). toPath ( )
71+ .getParent ();
7472 manager = new ImportExportManager (new BackupFileLocator (dbDir ));
7573
7674 importExportDataPathKey = getString (R .string .import_export_data_path );
Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ import java.io.IOException
1010import java.io.ObjectOutputStream
1111import java.util.zip.ZipOutputStream
1212import kotlin.io.path.createDirectories
13- import kotlin.io.path.deleteExisting
13+ import kotlin.io.path.deleteIfExists
1414import org.schabi.newpipe.streams.io.SharpOutputStream
1515import org.schabi.newpipe.streams.io.StoredFileHelper
1616import org.schabi.newpipe.util.ZipHelper
@@ -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