Add option in history settings to delete playback positions
This commit is contained in:
parent
cbdfb15117
commit
7cd5af5e72
|
@ -19,6 +19,7 @@ import io.reactivex.disposables.Disposable;
|
||||||
public class HistorySettingsFragment extends BasePreferenceFragment {
|
public class HistorySettingsFragment extends BasePreferenceFragment {
|
||||||
private String cacheWipeKey;
|
private String cacheWipeKey;
|
||||||
private String viewsHistoryClearKey;
|
private String viewsHistoryClearKey;
|
||||||
|
private String playbackStatesClearKey;
|
||||||
private String searchHistoryClearKey;
|
private String searchHistoryClearKey;
|
||||||
private HistoryRecordManager recordManager;
|
private HistoryRecordManager recordManager;
|
||||||
private CompositeDisposable disposables;
|
private CompositeDisposable disposables;
|
||||||
|
@ -28,6 +29,7 @@ public class HistorySettingsFragment extends BasePreferenceFragment {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
cacheWipeKey = getString(R.string.metadata_cache_wipe_key);
|
cacheWipeKey = getString(R.string.metadata_cache_wipe_key);
|
||||||
viewsHistoryClearKey = getString(R.string.clear_views_history_key);
|
viewsHistoryClearKey = getString(R.string.clear_views_history_key);
|
||||||
|
playbackStatesClearKey = getString(R.string.clear_playback_states_key);
|
||||||
searchHistoryClearKey = getString(R.string.clear_search_history_key);
|
searchHistoryClearKey = getString(R.string.clear_search_history_key);
|
||||||
recordManager = new HistoryRecordManager(getActivity());
|
recordManager = new HistoryRecordManager(getActivity());
|
||||||
disposables = new CompositeDisposable();
|
disposables = new CompositeDisposable();
|
||||||
|
@ -63,7 +65,7 @@ public class HistorySettingsFragment extends BasePreferenceFragment {
|
||||||
ErrorActivity.ErrorInfo.make(
|
ErrorActivity.ErrorInfo.make(
|
||||||
UserAction.DELETE_FROM_HISTORY,
|
UserAction.DELETE_FROM_HISTORY,
|
||||||
"none",
|
"none",
|
||||||
"Delete view history",
|
"Delete playback states",
|
||||||
R.string.general_error)));
|
R.string.general_error)));
|
||||||
|
|
||||||
final Disposable onDelete = recordManager.deleteWholeStreamHistory()
|
final Disposable onDelete = recordManager.deleteWholeStreamHistory()
|
||||||
|
@ -101,6 +103,33 @@ public class HistorySettingsFragment extends BasePreferenceFragment {
|
||||||
.show();
|
.show();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (preference.getKey().equals(playbackStatesClearKey)) {
|
||||||
|
new AlertDialog.Builder(getActivity())
|
||||||
|
.setTitle(R.string.delete_playback_states_alert)
|
||||||
|
.setNegativeButton(R.string.cancel, ((dialog, which) -> dialog.dismiss()))
|
||||||
|
.setPositiveButton(R.string.delete, ((dialog, which) -> {
|
||||||
|
|
||||||
|
final Disposable onDeletePlaybackStates = recordManager.deleteCompelteStreamStateHistory()
|
||||||
|
.observeOn(AndroidSchedulers.mainThread())
|
||||||
|
.subscribe(
|
||||||
|
howManyDeleted -> Toast.makeText(getActivity(),
|
||||||
|
R.string.watch_history_states_deleted,
|
||||||
|
Toast.LENGTH_SHORT).show(),
|
||||||
|
throwable -> ErrorActivity.reportError(getContext(),
|
||||||
|
throwable,
|
||||||
|
SettingsActivity.class, null,
|
||||||
|
ErrorActivity.ErrorInfo.make(
|
||||||
|
UserAction.DELETE_FROM_HISTORY,
|
||||||
|
"none",
|
||||||
|
"Delete playback states",
|
||||||
|
R.string.general_error)));
|
||||||
|
|
||||||
|
disposables.add(onDeletePlaybackStates);
|
||||||
|
}))
|
||||||
|
.create()
|
||||||
|
.show();
|
||||||
|
}
|
||||||
|
|
||||||
if (preference.getKey().equals(searchHistoryClearKey)) {
|
if (preference.getKey().equals(searchHistoryClearKey)) {
|
||||||
new AlertDialog.Builder(getActivity())
|
new AlertDialog.Builder(getActivity())
|
||||||
.setTitle(R.string.delete_search_history_alert)
|
.setTitle(R.string.delete_search_history_alert)
|
||||||
|
|
|
@ -160,6 +160,7 @@
|
||||||
|
|
||||||
<string name="metadata_cache_wipe_key" translatable="false">cache_wipe_key</string>
|
<string name="metadata_cache_wipe_key" translatable="false">cache_wipe_key</string>
|
||||||
<string name="clear_views_history_key" translatable="false">clear_play_history</string>
|
<string name="clear_views_history_key" translatable="false">clear_play_history</string>
|
||||||
|
<string name="clear_playback_states_key" translatable="false">clear_playback_states</string>
|
||||||
<string name="clear_search_history_key" translatable="false">clear_search_history</string>
|
<string name="clear_search_history_key" translatable="false">clear_search_history</string>
|
||||||
|
|
||||||
<string name="downloads_storage_ask" translatable="false">downloads_storage_ask</string>
|
<string name="downloads_storage_ask" translatable="false">downloads_storage_ask</string>
|
||||||
|
|
|
@ -171,9 +171,12 @@
|
||||||
<string name="import_data_summary">Overrides your current history and subscriptions</string>
|
<string name="import_data_summary">Overrides your current history and subscriptions</string>
|
||||||
<string name="export_data_summary">Export history, subscriptions and playlists</string>
|
<string name="export_data_summary">Export history, subscriptions and playlists</string>
|
||||||
<string name="clear_views_history_title">Clear watch history</string>
|
<string name="clear_views_history_title">Clear watch history</string>
|
||||||
<string name="clear_views_history_summary">Deletes the history of played streams</string>
|
<string name="clear_views_history_summary">Deletes the history of played streams and the playback positions</string>
|
||||||
<string name="delete_view_history_alert">Delete entire watch history?</string>
|
<string name="delete_view_history_alert">Delete entire watch history?</string>
|
||||||
<string name="watch_history_deleted">Watch history deleted.</string>
|
<string name="watch_history_deleted">Watch history deleted.</string>
|
||||||
|
<string name="clear_playback_states_title">Delete playback positions</string>
|
||||||
|
<string name="clear_playback_states_summary">Deletes all playback positions</string>
|
||||||
|
<string name="delete_playback_states_alert">Delete all playback positions?</string>
|
||||||
<string name="watch_history_states_deleted">Playback positions deleted.</string>
|
<string name="watch_history_states_deleted">Playback positions deleted.</string>
|
||||||
<string name="clear_search_history_title">Clear search history</string>
|
<string name="clear_search_history_title">Clear search history</string>
|
||||||
<string name="clear_search_history_summary">Deletes history of search keywords</string>
|
<string name="clear_search_history_summary">Deletes history of search keywords</string>
|
||||||
|
|
|
@ -51,6 +51,12 @@
|
||||||
android:title="@string/clear_views_history_title"
|
android:title="@string/clear_views_history_title"
|
||||||
app:iconSpaceReserved="false" />
|
app:iconSpaceReserved="false" />
|
||||||
|
|
||||||
|
<Preference
|
||||||
|
android:key="@string/clear_playback_states_key"
|
||||||
|
android:summary="@string/clear_playback_states_summary"
|
||||||
|
android:title="@string/clear_playback_states_title"
|
||||||
|
app:iconSpaceReserved="false" />
|
||||||
|
|
||||||
<Preference
|
<Preference
|
||||||
android:key="@string/clear_search_history_key"
|
android:key="@string/clear_search_history_key"
|
||||||
android:summary="@string/clear_search_history_summary"
|
android:summary="@string/clear_search_history_summary"
|
||||||
|
|
Loading…
Reference in New Issue