Fix pull to refresh for notifications

2 files changed, 11 insertions, 17 deletions

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveMissingNotificationsAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveMissingNotificationsAsyncTask.java
index e2b04db7e..05d830fad 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveMissingNotificationsAsyncTask.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveMissingNotificationsAsyncTask.java
@@ -16,8 +16,8 @@ package fr.gouv.etalab.mastodon.asynctasks;
 
 import android.content.Context;
 import android.os.AsyncTask;
+
 import java.lang.ref.WeakReference;
-import java.util.ArrayList;
 import java.util.List;
 
 import fr.gouv.etalab.mastodon.activities.MainActivity;
@@ -37,8 +37,8 @@ public class RetrieveMissingNotificationsAsyncTask extends AsyncTask<Void, Void,
 
     private String since_id;
     private OnRetrieveMissingNotificationsInterface listener;
-    private List<Notification> notifications = new ArrayList<>();
     private WeakReference<Context> contextReference;
+    private List<Notification> notifications;
 
     public RetrieveMissingNotificationsAsyncTask(Context context, String since_id, OnRetrieveMissingNotificationsInterface onRetrieveMissingNotifications){
         this.contextReference = new WeakReference<>(context);
@@ -49,20 +49,10 @@ public class RetrieveMissingNotificationsAsyncTask extends AsyncTask<Void, Void,
 
     @Override
     protected Void doInBackground(Void... params) {
-        int loopInc = 0;
         API api = new API(this.contextReference.get());
-        List<Notification> tempNotifications;
-        while (loopInc < 10){
-            APIResponse apiResponse = api.getNotificationsSince(since_id, 40, false);
-            String max_id = apiResponse.getMax_id();
-            since_id = apiResponse.getSince_id();
-            tempNotifications = apiResponse.getNotifications();
-            if( notifications != null && tempNotifications != null)
-                notifications.addAll(0, tempNotifications);
-            loopInc++;
-            if( max_id == null || max_id.equals(since_id))
-                break;
-        }
+        APIResponse apiResponse = api.getNotificationsSince(since_id, 40, false);
+        since_id = apiResponse.getSince_id();
+        notifications = apiResponse.getNotifications();
         if( notifications != null && notifications.size() > 0) {
             MainActivity.lastNotificationId = notifications.get(0).getId();
         }
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java
index 4df037ccc..33a385e92 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java
@@ -133,8 +133,11 @@ public class DisplayNotificationsFragment extends Fragment implements OnRetrieve
                 flag_loading = true;
                 swiped = true;
                 MainActivity.countNewNotifications = 0;
+                String sinceId = null;
+                if( notifications != null && notifications.size() > 0 )
+                    sinceId = notifications.get(0).getId();
                 if( context != null)
-                    asyncTask = new RetrieveNotificationsAsyncTask(context, true, null, null, DisplayNotificationsFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+                    asyncTask = new RetrieveMissingNotificationsAsyncTask(context, sinceId, DisplayNotificationsFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
             }
         });
         SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
@@ -317,7 +320,8 @@ public class DisplayNotificationsFragment extends Fragment implements OnRetrieve
 
     @Override
     public void onRetrieveMissingNotifications(List<Notification> notifications) {
-
+        flag_loading = false;
+        swipeRefreshLayout.setRefreshing(false);
         if( notifications != null && notifications.size() > 0) {
             for (int i = notifications.size()-1 ; i >= 0 ; i--) {
                 if (this.notifications.size() == 0 ||