From a09b9d3e4d78f2896d9d764bf496fd21acffc59f Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Tue, 24 Apr 2018 22:02:23 +0200
Subject: [PATCH] made items actually deltable

---
 .../list/search/SuggestionListAdapter.java    | 19 +++++-------------
 .../history/StatisticsPlaylistFragment.java   | 20 ++++++++++++++-----
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java
index 2fed3f8fb..7b5f72c53 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java
@@ -63,24 +63,15 @@ public class SuggestionListAdapter extends RecyclerView.Adapter<SuggestionListAd
     public void onBindViewHolder(SuggestionItemHolder holder, int position) {
         final SuggestionItem currentItem = getItem(position);
         holder.updateFrom(currentItem);
-        holder.queryView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (listener != null) listener.onSuggestionItemSelected(currentItem);
-            }
+        holder.queryView.setOnClickListener(v -> {
+            if (listener != null) listener.onSuggestionItemSelected(currentItem);
         });
-        holder.queryView.setOnLongClickListener(new View.OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View v) {
+        holder.queryView.setOnLongClickListener(v -> {
                 if (listener != null) listener.onSuggestionItemLongClick(currentItem);
                 return true;
-            }
         });
-        holder.insertView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (listener != null) listener.onSuggestionItemInserted(currentItem);
-            }
+        holder.insertView.setOnClickListener(v -> {
+            if (listener != null) listener.onSuggestionItemInserted(currentItem);
         });
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
index 4e449b51d..7136157a8 100644
--- a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
@@ -7,6 +7,7 @@ import android.os.Bundle;
 import android.os.Parcelable;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
 import android.support.design.widget.Snackbar;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -32,6 +33,8 @@ import java.util.List;
 
 import icepick.State;
 import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.disposables.Disposable;
 
 public abstract class StatisticsPlaylistFragment
         extends BaseLocalListFragment<List<StreamStatisticsEntry>, Void> {
@@ -46,6 +49,8 @@ public abstract class StatisticsPlaylistFragment
     /* Used for independent events */
     private Subscription databaseSubscription;
     private HistoryRecordManager recordManager;
+    private CompositeDisposable disposables = new CompositeDisposable();
+
 
     ///////////////////////////////////////////////////////////////////////////
     // Abstracts
@@ -288,11 +293,16 @@ public abstract class StatisticsPlaylistFragment
                 .get(index);
         if(infoItem instanceof StreamStatisticsEntry) {
             final StreamStatisticsEntry entry = (StreamStatisticsEntry) infoItem;
-            recordManager.deleteStreamHistory(entry.streamId);
-
-            Snackbar.make(getView(), R.string.one_item_deleted, Snackbar.LENGTH_SHORT)
-                    .show();
-            startLoading(true);
+            final Disposable onDelte = recordManager.deleteStreamHistory(entry.streamId)
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(
+                            howManyDelted -> Snackbar.make(getView(), R.string.one_item_deleted,
+                                    Snackbar.LENGTH_SHORT).show(),
+                            throwable -> showSnackBarError(throwable,
+                                    UserAction.SOMETHING_ELSE, "none",
+                                    "Deleting item failed", R.string.general_error));
+            
+            disposables.add(onDelte);
         }
     }