Do not merge if true counterpart differs

Stephen Paul Weber created 2 months ago

Change summary

src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 5 
1 file changed, 5 insertions(+)

Detailed changes

src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java

@@ -1776,6 +1776,11 @@ public class MessageAdapter extends ArrayAdapter<Message> {
                 return false;
             }
         }
+        final var trueCounterA = a.getTrueCounterpart();
+        final var trueCounterB = b.getTrueCounterpart();
+        if ((trueCounterA != null || trueCounterB != null) && (trueCounterA == null || !trueCounterA.equals(trueCounterB))) {
+            return false;
+        }
         return b.getTimeSent() - a.getTimeSent() <= Config.MESSAGE_MERGE_WINDOW;
     }