diff options
Diffstat (limited to 'app/src/main/java/de/danoeh/antennapod/fragment/preferences')
3 files changed, 4 insertions, 23 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/DownloadStatisticsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/DownloadStatisticsFragment.java index 3059d7ad2..ff94cc20c 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/DownloadStatisticsFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/DownloadStatisticsFragment.java @@ -17,7 +17,6 @@ import de.danoeh.antennapod.R; import de.danoeh.antennapod.adapter.DownloadStatisticsListAdapter; import de.danoeh.antennapod.core.storage.DBReader; import de.danoeh.antennapod.core.storage.StatisticsItem; -import de.danoeh.antennapod.core.util.comparator.CompareCompat; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.Disposable; @@ -75,7 +74,7 @@ public class DownloadStatisticsFragment extends Fragment { Observable.fromCallable(() -> { List<StatisticsItem> statisticsData = DBReader.getStatistics(); Collections.sort(statisticsData, (item1, item2) -> - CompareCompat.compareLong(item1.totalDownloadSize, item2.totalDownloadSize)); + Long.compare(item2.totalDownloadSize, item1.totalDownloadSize)); return statisticsData; }) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/ImportExportPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/ImportExportPreferencesFragment.java index b72d1eb32..5156de432 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/ImportExportPreferencesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/ImportExportPreferencesFragment.java @@ -8,9 +8,7 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.net.Uri; -import android.os.Build; import android.os.Bundle; -import android.os.Environment; import android.util.Log; import androidx.activity.result.ActivityResult; @@ -42,7 +40,6 @@ import io.reactivex.disposables.Disposable; import io.reactivex.schedulers.Schedulers; import java.io.File; -import java.io.FileOutputStream; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; @@ -169,21 +166,7 @@ public class ImportExportPreferencesFragment extends PreferenceFragmentCompat { } private void exportDatabase() { - if (Build.VERSION.SDK_INT >= 19) { - backupDatabaseLauncher.launch(dateStampFilename(DATABASE_EXPORT_FILENAME)); - } else { - File sd = Environment.getExternalStorageDirectory(); - File backupDB = new File(sd, dateStampFilename(DATABASE_EXPORT_FILENAME)); - progressDialog.show(); - disposable = Completable.fromAction(() -> - DatabaseExporter.exportToStream(new FileOutputStream(backupDB), getContext())) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(() -> { - Snackbar.make(getView(), R.string.export_success_title, Snackbar.LENGTH_LONG).show(); - progressDialog.dismiss(); - }, this::showExportErrorDialog); - } + backupDatabaseLauncher.launch(dateStampFilename(DATABASE_EXPORT_FILENAME)); } private void importDatabase() { diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/PlaybackStatisticsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/PlaybackStatisticsFragment.java index 04324f709..ba6164212 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/PlaybackStatisticsFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/PlaybackStatisticsFragment.java @@ -28,7 +28,6 @@ import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.storage.DBReader; import de.danoeh.antennapod.core.storage.DBWriter; import de.danoeh.antennapod.core.storage.StatisticsItem; -import de.danoeh.antennapod.core.util.comparator.CompareCompat; import io.reactivex.Completable; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; @@ -188,10 +187,10 @@ public class PlaybackStatisticsFragment extends Fragment { List<StatisticsItem> statisticsData = DBReader.getStatistics(); if (countAll) { Collections.sort(statisticsData, (item1, item2) -> - CompareCompat.compareLong(item1.timePlayedCountAll, item2.timePlayedCountAll)); + Long.compare(item2.timePlayedCountAll, item1.timePlayedCountAll)); } else { Collections.sort(statisticsData, (item1, item2) -> - CompareCompat.compareLong(item1.timePlayed, item2.timePlayed)); + Long.compare(item2.timePlayed, item1.timePlayed)); } return statisticsData; } |