Use notifyDataSetChanged in CalendarFragment

app/src/main/java/app/insti/fragment/CalendarFragment.java

@@ -16,6 +16,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.gson.Gson;
+import com.squareup.picasso.Picasso;
 
 import java.sql.Timestamp;
 import java.text.DateFormat;
@@ -46,9 +47,10 @@ public class CalendarFragment extends BaseFragment {
 
     FloatingActionButton fab;
     private View view;
-    private Toast toast;
+    private FeedAdapter feedAdapter = null;
     private List<Event> events;
 
+
     public CalendarFragment() {
         // Required empty public constructor
     }
@@ -165,9 +167,20 @@ public class CalendarFragment extends BaseFragment {
         }
 
         RecyclerView eventRecyclerView = (RecyclerView) getActivity().findViewById(R.id.calendar_event_card_recycler_view);
-        FeedAdapter eventAdapter = new FeedAdapter(filteredEvents, this);
-        eventRecyclerView.setAdapter(eventAdapter);
-        eventRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+
+        // Initialize or refresh adapter
+        if (feedAdapter == null) {
+            feedAdapter = new FeedAdapter(filteredEvents, this);
+        } else {
+            feedAdapter.setEvents(filteredEvents);
+            feedAdapter.notifyDataSetChanged();
+        }
+
+        // Initialize recycler view
+        if (eventRecyclerView.getAdapter() != feedAdapter) {
+            eventRecyclerView.setAdapter(feedAdapter);
+            eventRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+        }
 
         getActivity().findViewById(R.id.loadingPanel).setVisibility(View.GONE);
     }

app/src/main/java/app/insti/fragment/FeedFragment.java

@@ -162,25 +162,32 @@ public class FeedFragment extends BaseFragment {
         // Initialize adapter
         if (feedAdapter == null) {
             feedAdapter = new FeedAdapter(events, this);
-            getActivityBuffer().safely(new ActivityBuffer.IRunnable() {
-                @Override
-                public void run(Activity pActivity) {
-                    try {
-                        feedRecyclerView.setAdapter(feedAdapter);
-                        //feedRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-
-                    } catch (NullPointerException e) {
-                        e.printStackTrace();
-                    }
-                }
-            });
         } else {
             feedAdapter.setEvents(events);
             feedAdapter.notifyDataSetChanged();
         }
 
+        // Initialize adapter if necessary
+        if (feedRecyclerView.getAdapter() != feedAdapter) {
+            initRecyclerView();
+        }
+
         View view = getActivity().findViewById(R.id.loadingPanel);
         if (view != null)
             view.setVisibility(View.GONE);
     }
+
+    private void initRecyclerView() {
+        getActivityBuffer().safely(new ActivityBuffer.IRunnable() {
+            @Override
+            public void run(Activity pActivity) {
+                try {
+                    feedRecyclerView.setAdapter(feedAdapter);
+
+                } catch (NullPointerException e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
 }