Properly display multiple sponsored messages + Sponsored messages bugfixes

Author: vkryl

app/src/main/java/org/thunderdog/challegram/component/chat/MessagesAdapter.java

@@ -25,6 +25,7 @@
 import org.drinkless.tdlib.TdApi;
 import org.thunderdog.challegram.Log;
 import org.thunderdog.challegram.U;
+import org.thunderdog.challegram.config.Config;
 import org.thunderdog.challegram.data.TGMessage;
 import org.thunderdog.challegram.data.TGMessageBotInfo;
 import org.thunderdog.challegram.data.TGMessageMedia;
@@ -39,6 +40,7 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import me.vkryl.core.lambda.Filter;
 import tgx.td.MessageId;
 
 public class MessagesAdapter extends RecyclerView.Adapter<MessagesHolder> {
@@ -203,6 +205,16 @@ public TGMessage getBottomMessage () {
     return getMessage(0);
   }
 
+  public TGMessage getBottomActiveMessage () {
+    int index = indexOfMessage(m -> !m.isSponsoredMessage());
+    return getMessage(index);
+  }
+
+  public TGMessage getTopActiveMessage () {
+    int index = indexOfMessageReverse(m -> !m.isSponsoredMessage());
+    return getMessage(index);
+  }
+
   public TGMessage getMessage (int index) {
     return items == null || index < 0 || index >= items.size() ? null : items.get(index);
   }
@@ -573,6 +585,43 @@ public void resetMessages (ArrayList<TGMessage> items) {
     U.notifyItemsReplaced(this, oldItemCount);
   }
 
+  public int countMessages (@NonNull Filter<TGMessage> filter) {
+    if (items != null) {
+      int count = 0;
+      for (TGMessage message : items) {
+        if (filter.accept(message)) {
+          count++;
+        }
+      }
+      return count;
+    }
+    return 0;
+  }
+
+  public int indexOfMessageReverse (@NonNull Filter<TGMessage> filter) {
+    if (items != null) {
+      for (int i = items.size() - 1; i >= 0; i--) {
+        TGMessage message = items.get(i);
+        if (filter.accept(message)) {
+          return i;
+        }
+      }
+    }
+    return -1;
+  }
+
+  public int indexOfMessage (@NonNull Filter<TGMessage> filter) {
+    if (items != null) {
+      for (int i = 0; i < items.size(); i++) {
+        TGMessage message = items.get(i);
+        if (filter.accept(message)) {
+          return i;
+        }
+      }
+    }
+    return -1;
+  }
+
   public void addMessages (List<TGMessage> items, boolean fromTop) {
     if (this.items == null) {
       this.items = new ArrayList<>(INITIAL_CAPACITY);
@@ -584,7 +633,7 @@ public void addMessages (List<TGMessage> items, boolean fromTop) {
       if (items.size() > count) {
         for (int i = items.size() - 1; i >= 0; i--) {
           TGMessage msg = items.get(i);
-          if (indexOfMessageContainer(msg.getId()) != -1) {
+          if ((!Config.TEST_MULTI_SPONSORED_MESSAGES || !msg.isSponsoredMessage()) && indexOfMessageContainer(msg.getId()) != -1) {
             items.remove(i);
             if (i > 0) {
               items.get(i - 1).mergeWith(items.size() > i ? items.get(i) : null, !fromTop && i - 1 == 0);
@@ -596,7 +645,7 @@ public void addMessages (List<TGMessage> items, boolean fromTop) {
         for (TGMessage item : this.items) {
           for (int i = items.size() - 1; i >= 0; i--) {
             TGMessage newItem = items.get(i);
-            if (item.isDescendantOrSelf(newItem.getId())) {
+            if ((!Config.TEST_MULTI_SPONSORED_MESSAGES || !newItem.isSponsoredMessage()) && item.isDescendantOrSelf(newItem.getId())) {
               items.remove(i);
               if (i > 0) {
                 items.get(i - 1).mergeWith(items.size() > i ? items.get(i) : null, !fromTop && i - 1 == 0);

app/src/main/java/org/thunderdog/challegram/component/chat/MessagesLoader.java

@@ -44,7 +44,6 @@
 import org.thunderdog.challegram.tool.Strings;
 import org.thunderdog.challegram.tool.UI;
 import org.thunderdog.challegram.unsorted.Settings;
-import org.thunderdog.challegram.util.CancellableResultHandler;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -111,7 +110,7 @@ public class MessagesLoader implements Client.ResultHandler {
   private @Nullable ThreadInfo messageThread;
   private @Nullable TdApi.MessageTopic topicId;
 
-  private CancellableResultHandler sponsoredResultHandler;
+  private Tdlib.CancellableResultHandler<TdApi.SponsoredMessages> sponsoredResultHandler;
   private final MessagesSearchManagerMiddleware searchManagerMiddleware;
 
   private long contextId;
@@ -120,36 +119,25 @@ private boolean canShowSponsoredMessage (long chatId) {
     return tdlib.isChannel(chatId) && !manager.controller().isInForceTouchMode() && !manager.controller().inPreviewMode() && !manager.controller().areScheduledOnly() && !manager.controller().arePinnedMessages();
   }
 
-  // Callback is called only on successful load
-  public void requestSponsoredMessage (long chatId, RunnableData<TdApi.SponsoredMessages> callback) {
+  public void requestSponsoredMessages (long chatId, RunnableData<TdApi.SponsoredMessages> callback) {
     if (!canShowSponsoredMessage(chatId) || isLoadingSponsoredMessage) {
       return;
     }
-
     isLoadingSponsoredMessage = true;
-    sponsoredResultHandler = new CancellableResultHandler() {
+    final long contextId = this.contextId;
+    sponsoredResultHandler = new Tdlib.CancellableResultHandler<>() {
       @Override
-      public void processResult (TdApi.Object object) {
+      public void act (TdApi.SponsoredMessages sponsoredMessages, @Nullable TdApi.Error error) {
         UI.post(() -> {
           isLoadingSponsoredMessage = false;
           sponsoredResultHandler = null;
-
-          TdApi.SponsoredMessages message;
-
-          if (object.getConstructor() == TdApi.SponsoredMessages.CONSTRUCTOR) {
-            message = ((TdApi.SponsoredMessages) object);
-          } else {
-            message = null;
-          }
-
-          if (chatId == getChatId()) {
-            callback.runWithData(message);
+          if (chatId == getChatId() && MessagesLoader.this.contextId == contextId) {
+            callback.runWithData(sponsoredMessages);
           }
         });
       }
     };
-
-    tdlib.client().send(new TdApi.GetChatSponsoredMessages(chatId), sponsoredResultHandler);
+    tdlib.send(new TdApi.GetChatSponsoredMessages(chatId), sponsoredResultHandler);
   }
 
   public MessagesLoader (MessagesManager manager, MessagesSearchManagerMiddleware searchMiddleware) {
@@ -569,6 +557,7 @@ public void reuse () {
 
     if (sponsoredResultHandler != null) {
       sponsoredResultHandler.cancel();
+      sponsoredResultHandler = null;
     }
 
     synchronized (lock) {
@@ -1774,13 +1763,13 @@ public boolean canLoadTop () {
 
   @Nullable
   private MessageId getStartBottom () {
-    TGMessage msg = manager.getAdapter().getBottomMessage();
+    TGMessage msg = manager.getAdapter().getBottomActiveMessage();
     return msg != null ? new MessageId(msg.getChatId(), msg.getBiggestId()) : null;
   }
 
   @Nullable
   private MessageId getStartTop () {
-    TGMessage msg = manager.getAdapter().getTopMessage();
+    TGMessage msg = manager.getAdapter().getTopActiveMessage();
     return msg != null ? new MessageId(msg.getChatId(), msg.getSmallestId()) : null;
   }