With support for bundled notifications

maskara · maskara · commit f34af1ee4bc6 · 2018-03-21T10:28:18.000+05:30
diff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java b/app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java
@@ -41,6 +41,7 @@
 import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.PageTitle;
 import fr.free.nrw.commons.notification.Notification;
+import fr.free.nrw.commons.notification.NotificationUtils;
 import in.yuvi.http.fluent.Http;
 import io.reactivex.Observable;
 import io.reactivex.Single;
@@ -50,6 +51,8 @@
 import static fr.free.nrw.commons.notification.NotificationType.UNKNOWN;
 import static fr.free.nrw.commons.notification.NotificationUtils.getNotificationFromApiResult;
 import static fr.free.nrw.commons.notification.NotificationUtils.getNotificationType;
+import static fr.free.nrw.commons.notification.NotificationUtils.getNotificationsFromBundle;
+import static fr.free.nrw.commons.notification.NotificationUtils.isBundledNotification;
 import static fr.free.nrw.commons.notification.NotificationUtils.isCommonsNotification;
 
 /**
@@ -447,23 +450,10 @@ public List<Notification> getNotifications() {
             return new ArrayList<>();
         }
 
-        List<Notification> notifications = new ArrayList<>();
-
         NodeList childNodes = notificationNode.getDocument().getChildNodes();
-
-        for (int i = 0; i < childNodes.getLength(); i++) {
-            Node node = childNodes.item(i);
-            if (isCommonsNotification(node)
-                    && !getNotificationType(node).equals(UNKNOWN)
-                    && !getNotificationType(node).equals(THANK_YOU_EDIT)) {
-                notifications.add(getNotificationFromApiResult(context, node));
-            }
-        }
-
-        return notifications;
+        return NotificationUtils.getNotificationsFromList(context, childNodes);
     }
 
-
     @Override
     public boolean existingFile(String fileSha1) throws IOException {
         return api.action("query")
diff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java b/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java
@@ -9,9 +9,12 @@
 import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.ProgressBar;
 
 import com.pedrogomez.renderers.RVRendererAdapter;
 
+import java.util.Collections;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -34,6 +37,8 @@ public class NotificationActivity extends NavigationBaseActivity {
     NotificationAdapterFactory notificationAdapterFactory;
 
     @BindView(R.id.listView) RecyclerView recyclerView;
+    @BindView(R.id.progressBar)
+    ProgressBar progressBar;
 
     @Inject NotificationController controller;
 
@@ -63,14 +68,21 @@ private void addNotifications() {
         Timber.d("Add notifications");
 
         if(mNotificationWorkerFragment == null){
-            Observable.fromCallable(() -> controller.getNotifications())
+            Observable.fromCallable(() -> {
+                progressBar.setVisibility(View.VISIBLE);
+                return controller.getNotifications();
+            })
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe(notificationList -> {
+                        Collections.reverse(notificationList);
                         Timber.d("Number of notifications is %d", notificationList.size());
-                        initializeAndSetNotificationList(notificationList);
                         setAdapter(notificationList);
-                    }, throwable -> Timber.e(throwable, "Error occurred while loading notifications"));
+                        progressBar.setVisibility(View.GONE);
+                    }, throwable -> {
+                        Timber.e(throwable, "Error occurred while loading notifications");
+                        progressBar.setVisibility(View.GONE);
+                    });
         } else {
             setAdapter(mNotificationWorkerFragment.getNotificationList());
         }
diff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificationUtils.java b/app/src/main/java/fr/free/nrw/commons/notification/NotificationUtils.java
@@ -2,16 +2,23 @@
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.support.annotation.NonNull;
 
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import javax.annotation.Nullable;
 
 import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.R;
 
+import static fr.free.nrw.commons.notification.NotificationType.THANK_YOU_EDIT;
+import static fr.free.nrw.commons.notification.NotificationType.UNKNOWN;
+
 public class NotificationUtils {
 
     private static final String COMMONS_WIKI = "commonswiki";
@@ -30,6 +37,56 @@ public static NotificationType getNotificationType(Node document) {
         return NotificationType.handledValueOf(type);
     }
 
+    public static List<Notification> getNotificationsFromBundle(Context context, Node document) {
+        Element bundledNotifications = getBundledNotifications(document);
+        NodeList childNodes = bundledNotifications.getChildNodes();
+
+        List<Notification> notifications = new ArrayList<>();
+        for (int i = 0; i < childNodes.getLength(); i++) {
+            Node node = childNodes.item(i);
+            if (isUsefulNotification(node)) {
+                notifications.add(getNotificationFromApiResult(context, node));
+            }
+        }
+        return notifications;
+    }
+
+    @NonNull
+    public static List<Notification> getNotificationsFromList(Context context, NodeList childNodes) {
+        List<Notification> notifications = new ArrayList<>();
+        for (int i = 0; i < childNodes.getLength(); i++) {
+            Node node = childNodes.item(i);
+            if (isUsefulNotification(node)) {
+                if (isBundledNotification(node)) {
+                    notifications.addAll(getNotificationsFromBundle(context, node));
+                } else {
+                    notifications.add(getNotificationFromApiResult(context, node));
+                }
+            }
+        }
+
+        return notifications;
+    }
+
+    private static boolean isUsefulNotification(Node node) {
+        return isCommonsNotification(node)
+                && !getNotificationType(node).equals(UNKNOWN)
+                && !getNotificationType(node).equals(THANK_YOU_EDIT);
+    }
+
+    public static boolean isBundledNotification(Node document) {
+        Element bundleElement = getBundledNotifications(document);
+        if (bundleElement == null) {
+            return false;
+        }
+
+        return bundleElement.getChildNodes().getLength() > 0;
+    }
+
+    private static Element getBundledNotifications(Node document) {
+        return (Element) getNode(document, "bundledNotifications");
+    }
+
     public static Notification getNotificationFromApiResult(Context context, Node document) {
         NotificationType type = getNotificationType(document);
 
@@ -43,7 +100,7 @@ public static Notification getNotificationFromApiResult(Context context, Node do
                 notificationText = context.getString(R.string.notifications_thank_you_edit);
                 break;
             case EDIT_USER_TALK:
-                notificationText = getNotificationHeader(document);
+                notificationText = getNotificationText(document);
                 break;
             case MENTION:
                 notificationText = getMentionMessage(context, document);
@@ -56,6 +113,14 @@ public static Notification getNotificationFromApiResult(Context context, Node do
         return new Notification(type, notificationText, getTimestamp(document), description, link, iconUrl);
     }
 
+    private static String getNotificationText(Node document) {
+        String notificationBody = getNotificationBody(document);
+        if (notificationBody == null || notificationBody.trim().equals("")) {
+            return getNotificationHeader(document);
+        }
+        return notificationBody;
+    }
+
     private static String getNotificationHeader(Node document) {
         Node body = getNode(getModel(document), "header");
         if (body != null) {
@@ -66,6 +131,16 @@ private static String getNotificationHeader(Node document) {
         }
     }
 
+    private static String getNotificationBody(Node document) {
+        Node body = getNode(getModel(document), "body");
+        if (body != null) {
+            String textContent = body.getTextContent();
+            return textContent.replace("<strong>", "").replace("</strong>", "");
+        } else {
+            return "";
+        }
+    }
+
     private static String getMentionDescription(Node document) {
         Node body = getNode(getModel(document), "body");
         return body != null ? body.getTextContent() : "";
diff --git a/app/src/main/res/layout/activity_notification.xml b/app/src/main/res/layout/activity_notification.xml
@@ -15,6 +15,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
+        <ProgressBar
+            android:id="@+id/progressBar"
+            android:layout_width="match_parent"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:layout_height="wrap_content" />
         <android.support.v7.widget.RecyclerView
             android:id="@+id/listView"
             android:layout_width="match_parent"
