Broadcasts now used everywhere for signalling to remove accounts' posts instead of listeners.

app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java

@@ -23,6 +23,7 @@ import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
 import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.TabLayout;
+import android.support.v4.content.LocalBroadcastManager;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
@@ -39,10 +40,11 @@ import com.keylesspalace.tusky.R;
 import com.keylesspalace.tusky.entity.Notification;
 import com.keylesspalace.tusky.entity.Status;
 import com.keylesspalace.tusky.interfaces.StatusActionListener;
-import com.keylesspalace.tusky.interfaces.StatusRemoveListener;
+import com.keylesspalace.tusky.receiver.TimelineReceiver;
 import com.keylesspalace.tusky.util.ThemeUtils;
 import com.keylesspalace.tusky.view.EndlessOnScrollListener;
 
+import java.sql.Time;
 import java.util.List;
 
 import retrofit2.Call;
@@ -50,8 +52,9 @@ import retrofit2.Callback;
 import retrofit2.Response;
 
 public class NotificationsFragment extends SFragment implements
-        SwipeRefreshLayout.OnRefreshListener, StatusActionListener, StatusRemoveListener,
-        NotificationsAdapter.NotificationActionListener, SharedPreferences.OnSharedPreferenceChangeListener {
+        SwipeRefreshLayout.OnRefreshListener, StatusActionListener,
+        NotificationsAdapter.NotificationActionListener,
+        SharedPreferences.OnSharedPreferenceChangeListener {
     private static final String TAG = "Notifications"; // logging tag
 
     private SwipeRefreshLayout swipeRefreshLayout;
@@ -62,6 +65,7 @@ public class NotificationsFragment extends SFragment implements
     private TabLayout.OnTabSelectedListener onTabSelectedListener;
     private Call<List<Notification>> listCall;
     private boolean hideFab;
+    private TimelineReceiver timelineReceiver;
 
     public static NotificationsFragment newInstance() {
         NotificationsFragment fragment = new NotificationsFragment();
@@ -110,6 +114,10 @@ public class NotificationsFragment extends SFragment implements
         };
         layout.addOnTabSelectedListener(onTabSelectedListener);
 
+        timelineReceiver = new TimelineReceiver(adapter);
+        LocalBroadcastManager.getInstance(context.getApplicationContext())
+                .registerReceiver(timelineReceiver, TimelineReceiver.getFilter(null));
+
         return rootView;
     }
 
@@ -168,6 +176,10 @@ public class NotificationsFragment extends SFragment implements
     public void onDestroyView() {
         TabLayout tabLayout = (TabLayout) getActivity().findViewById(R.id.tab_layout);
         tabLayout.removeOnTabSelectedListener(onTabSelectedListener);
+
+        LocalBroadcastManager.getInstance(getContext())
+                .unregisterReceiver(timelineReceiver);
+
         super.onDestroyView();
     }
 
@@ -205,10 +217,6 @@ public class NotificationsFragment extends SFragment implements
         sendFetchNotificationsRequest(null, null);
     }
 
-    public void removePostsByUser(String accountId) {
-        adapter.removeAllByAccountId(accountId);
-    }
-
     private static boolean findNotification(List<Notification> notifications, String id) {
         for (Notification notification : notifications) {
             if (notification.id.equals(id)) {

app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java

@@ -21,6 +21,7 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.FragmentTransaction;
+import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.widget.PopupMenu;
 import android.support.v7.widget.RecyclerView;
 import android.text.Spanned;
@@ -39,6 +40,7 @@ import com.keylesspalace.tusky.entity.Relationship;
 import com.keylesspalace.tusky.entity.Status;
 import com.keylesspalace.tusky.interfaces.AdapterItemRemover;
 import com.keylesspalace.tusky.network.MastodonAPI;
+import com.keylesspalace.tusky.receiver.TimelineReceiver;
 import com.keylesspalace.tusky.util.HtmlUtils;
 
 import java.util.ArrayList;
@@ -56,14 +58,9 @@ import retrofit2.Response;
  * overlap functionality. So, I'm momentarily leaving it and hopefully working on those will clear
  * up what needs to be where. */
 public abstract class SFragment extends BaseFragment {
-    public interface OnUserRemovedListener {
-        void onUserRemoved(String accountId);
-    }
-
     protected String loggedInAccountId;
     protected String loggedInUsername;
     protected MastodonAPI mastodonAPI;
-    protected OnUserRemovedListener userRemovedListener;
     protected static int COMPOSE_RESULT = 1;
 
     @Override
@@ -80,7 +77,6 @@ public abstract class SFragment extends BaseFragment {
         super.onActivityCreated(savedInstanceState);
         BaseActivity activity = (BaseActivity) getActivity();
         mastodonAPI = activity.mastodonAPI;
-        userRemovedListener = (OnUserRemovedListener) activity;
     }
 
     protected void reply(Status status) {
@@ -188,7 +184,10 @@ public abstract class SFragment extends BaseFragment {
             public void onFailure(Call<Relationship> call, Throwable t) {}
         });
         callList.add(call);
-        userRemovedListener.onUserRemoved(id);
+        Intent intent = new Intent(TimelineReceiver.Types.MUTE_ACCOUNT);
+        intent.putExtra("id", id);
+        LocalBroadcastManager.getInstance(getContext())
+                .sendBroadcast(intent);
     }
 
     private void block(String id) {
@@ -201,7 +200,10 @@ public abstract class SFragment extends BaseFragment {
             public void onFailure(Call<Relationship> call, Throwable t) {}
         });
         callList.add(call);
-        userRemovedListener.onUserRemoved(id);
+        Intent intent = new Intent(TimelineReceiver.Types.BLOCK_ACCOUNT);
+        intent.putExtra("id", id);
+        LocalBroadcastManager.getInstance(getContext())
+                .sendBroadcast(intent);
     }
 
     private void delete(String id) {

app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java

@@ -38,7 +38,6 @@ import com.keylesspalace.tusky.R;
 import com.keylesspalace.tusky.adapter.TimelineAdapter;
 import com.keylesspalace.tusky.entity.Status;
 import com.keylesspalace.tusky.interfaces.StatusActionListener;
-import com.keylesspalace.tusky.interfaces.StatusRemoveListener;
 import com.keylesspalace.tusky.receiver.TimelineReceiver;
 import com.keylesspalace.tusky.util.ThemeUtils;
 import com.keylesspalace.tusky.view.EndlessOnScrollListener;
@@ -53,7 +52,6 @@ import retrofit2.Response;
 public class TimelineFragment extends SFragment implements
         SwipeRefreshLayout.OnRefreshListener,
         StatusActionListener,
-        StatusRemoveListener,
         SharedPreferences.OnSharedPreferenceChangeListener {
     private static final String TAG = "Timeline"; // logging tag
 
@@ -128,7 +126,8 @@ public class TimelineFragment extends SFragment implements
         recyclerView.setAdapter(adapter);
 
         timelineReceiver = new TimelineReceiver(adapter);
-        LocalBroadcastManager.getInstance(context.getApplicationContext()).registerReceiver(timelineReceiver, TimelineReceiver.getFilter(kind));
+        LocalBroadcastManager.getInstance(context.getApplicationContext())
+                .registerReceiver(timelineReceiver, TimelineReceiver.getFilter(kind));
         return rootView;
     }
 
@@ -285,10 +284,6 @@ public class TimelineFragment extends SFragment implements
         listCall.enqueue(callback);
     }
 
-    public void removePostsByUser(String accountId) {
-        adapter.removeAllByAccountId(accountId);
-    }
-
     private static boolean findStatus(List<Status> statuses, String id) {
         for (Status status : statuses) {
             if (status.id.equals(id)) {

app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java

@@ -21,6 +21,7 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.design.widget.Snackbar;
 import android.support.v4.content.ContextCompat;
+import android.support.v4.content.LocalBroadcastManager;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
@@ -38,7 +39,7 @@ import com.keylesspalace.tusky.entity.StatusContext;
 import com.keylesspalace.tusky.network.MastodonAPI;
 import com.keylesspalace.tusky.R;
 import com.keylesspalace.tusky.interfaces.StatusActionListener;
-import com.keylesspalace.tusky.interfaces.StatusRemoveListener;
+import com.keylesspalace.tusky.receiver.TimelineReceiver;
 import com.keylesspalace.tusky.util.ThemeUtils;
 import com.keylesspalace.tusky.view.ConversationLineItemDecoration;
 
@@ -47,7 +48,7 @@ import retrofit2.Callback;
 import retrofit2.Response;
 
 public class ViewThreadFragment extends SFragment implements
-        SwipeRefreshLayout.OnRefreshListener, StatusActionListener, StatusRemoveListener {
+        SwipeRefreshLayout.OnRefreshListener, StatusActionListener {
     private static final String TAG = "ViewThreadFragment";
 
     private SwipeRefreshLayout swipeRefreshLayout;
@@ -55,6 +56,7 @@ public class ViewThreadFragment extends SFragment implements
     private ThreadAdapter adapter;
     private MastodonAPI mastodonApi;
     private String thisThreadsStatusId;
+    private TimelineReceiver timelineReceiver;
 
     public static ViewThreadFragment newInstance(String id) {
         Bundle arguments = new Bundle();
@@ -92,9 +94,20 @@ public class ViewThreadFragment extends SFragment implements
         mastodonApi = null;
         thisThreadsStatusId = null;
 
+        timelineReceiver = new TimelineReceiver(adapter);
+        LocalBroadcastManager.getInstance(context.getApplicationContext())
+                .registerReceiver(timelineReceiver, TimelineReceiver.getFilter(null));
+
         return rootView;
     }
 
+    @Override
+    public void onDestroyView() {
+        LocalBroadcastManager.getInstance(getContext())
+                .unregisterReceiver(timelineReceiver);
+        super.onDestroyView();
+    }
+
     @Override
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
@@ -169,11 +182,6 @@ public class ViewThreadFragment extends SFragment implements
         }
     }
 
-    @Override
-    public void removePostsByUser(String accountId) {
-        adapter.removeAllByAccountId(accountId);
-    }
-
     public void onRefresh() {
         sendStatusRequest(thisThreadsStatusId);
         sendThreadRequest(thisThreadsStatusId);