some optimization around topic evictions processing

tinode · Oct 11, 2019 · da31054 · da31054
1 parent cda1359
commit da31054
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 20 deletions.
diff --git a/tinodesdk/src/main/java/co/tinode/tinodesdk/Tinode.java b/tinodesdk/src/main/java/co/tinode/tinodesdk/Tinode.java
@@ -558,24 +558,22 @@ private void dispatchPacket(String message) throws Exception {
                     }
                 }
             }
-            if (pkt.ctrl.code == 205 && "evicted".equals(pkt.ctrl.text)) {
-                Topic topic = getTopic(pkt.ctrl.topic);
-                if (topic != null) {
+            Topic topic = getTopic(pkt.ctrl.topic);
+            if (topic != null) {
+                if (pkt.ctrl.code == 205 && "evicted".equals(pkt.ctrl.text)) {
                     boolean unsub = pkt.ctrl.getBoolParam("unsub", false);
                     topic.topicLeft(unsub, pkt.ctrl.code, pkt.ctrl.text);
-                }
-            } else if ("data".equals(pkt.ctrl.getStringParam("what", null))) {
-                // All data has been delivered.
-                Topic topic = getTopic(pkt.ctrl.topic);
-                if (topic != null) {
-                    topic.allMessagesReceived(pkt.ctrl.getIntParam("count", 0));
-                }
-            }  else if ("sub".equals(pkt.ctrl.getStringParam("what", null))) {
-                // The topic has no subscriptions.
-                Topic topic = getTopic(pkt.ctrl.topic);
-                if (topic != null) {
-                    // Trigger Listener.onSubsUpdated.
-                    topic.routeMetaSub(null);
+                } else {
+                    String what = pkt.ctrl.getStringParam("what", null);
+                    if (what != null) {
+                        if ("data".equals(what)) {
+                            // All data has been delivered.
+                            topic.allMessagesReceived(pkt.ctrl.getIntParam("count", 0));
+                        } else if ("sub".equals(what)) {
+                            // The topic has no subscriptions. Trigger Listener.onSubsUpdated.
+                            topic.allSubsReceived();
+                        }
+                    }
                 }
             }
         } else if (pkt.meta != null) {

diff --git a/tinodesdk/src/main/java/co/tinode/tinodesdk/Topic.java b/tinodesdk/src/main/java/co/tinode/tinodesdk/Topic.java
@@ -1581,11 +1581,10 @@ protected void processSub(Subscription<SP, SR> newsub) {
     }
 
     protected void routeMetaSub(MsgServerMeta<DP, DR, SP, SR> meta) {
-        if (meta != null) {
-            for (Subscription<SP, SR> newsub : meta.sub) {
-                processSub(newsub);
-            }
+        for (Subscription<SP, SR> newsub : meta.sub) {
+            processSub(newsub);
         }
+
         if (mListener != null) {
             mListener.onSubsUpdated();
         }
@@ -1642,6 +1641,11 @@ protected void allMessagesReceived(Integer count) {
         }
     }
 
+    protected void allSubsReceived() {
+        if (mListener != null) {
+            mListener.onSubsUpdated();
+        }
+    }
     protected void routePres(MsgServerPres pres) {
         MsgServerPres.What what = MsgServerPres.parseWhat(pres.what);
         Subscription<SP, SR> sub;