~singpolyma/cheogram-android

6defd00b67eae4dabb44376734b5a61b8cca19c2 — Stephen Paul Weber 3 months ago fe262c4
Fix NPE
1 files changed, 1 insertions(+), 1 deletions(-)

M src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
M src/main/java/eu/siacs/conversations/ui/ConversationFragment.java => src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +1 -1
@@ 2658,7 2658,7 @@ public class ConversationFragment extends XmppFragment
                    }
                }
                if (message != null) {
                    while (message.next() != null && message.next().wasMergedIntoPrevious(activity.xmppConnectionService)) {
                    while (message.next() != null && message.next().wasMergedIntoPrevious(activity == null ? null : activity.xmppConnectionService)) {
                        message = message.next();
                    }
                    return message;