From 898669978cf043aba57c7f389e6bf978ba802229 Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Sat, 17 Aug 2019 19:17:48 +0200
Subject: [PATCH] Some fixes

---
 .../fedilab/android/drawers/StatusListAdapter.java   |  5 +++--
 .../fragments/DisplayNotificationsFragment.java      | 12 ++++++++++++
 .../android/fragments/DisplayStatusFragment.java     |  2 ++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
index 038f1364b..83e084617 100644
--- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
@@ -97,6 +97,8 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.varunest.sparkbutton.SparkButton;
 
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -245,9 +247,8 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
     private Handler mHandler = new Handler();
 
     @Override
-    public void onAttachedToRecyclerView(RecyclerView recyclerView) {
+    public void onAttachedToRecyclerView(@NotNull RecyclerView recyclerView) {
         super.onAttachedToRecyclerView(recyclerView);
-
         mRecyclerView = recyclerView;
     }
 
diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayNotificationsFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayNotificationsFragment.java
index aefe0739f..f983ba320 100644
--- a/app/src/main/java/app/fedilab/android/fragments/DisplayNotificationsFragment.java
+++ b/app/src/main/java/app/fedilab/android/fragments/DisplayNotificationsFragment.java
@@ -267,6 +267,18 @@ public class DisplayNotificationsFragment extends Fragment implements OnRetrieve
 
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        swipeRefreshLayout.setEnabled(true);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        swipeRefreshLayout.setEnabled(false);
+    }
+
     @Override
     public void onRetrieveNotifications(APIResponse apiResponse, Account account, boolean refreshData) {
         mainLoader.setVisibility(View.GONE);
diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java
index e5322fd65..37bde0459 100644
--- a/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java
+++ b/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java
@@ -411,6 +411,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
     @Override
     public void onPause(){
         super.onPause();
+        swipeRefreshLayout.setEnabled(false);
         //Store bookmark on pause
         if (context instanceof BaseMainActivity && type == RetrieveFeedsAsyncTask.Type.HOME) {
             SharedPreferences.Editor editor = sharedpreferences.edit();
@@ -662,6 +663,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
     @Override
     public void onResume(){
         super.onResume();
+        swipeRefreshLayout.setEnabled(true);
         boolean liveNotifications = sharedpreferences.getBoolean(Helper.SET_LIVE_NOTIFICATIONS, true);
         if (type == RetrieveFeedsAsyncTask.Type.HOME){
             if( getUserVisibleHint() ){