~singpolyma/cheogram-android

75722c743b14791445de6164d4e914fe79d68b4a — Stephen Paul Weber 7 months ago c2b7568
Fix NPE
1 files changed, 1 insertions(+), 1 deletions(-)

M src/main/java/eu/siacs/conversations/entities/Message.java
M src/main/java/eu/siacs/conversations/entities/Message.java => src/main/java/eu/siacs/conversations/entities/Message.java +1 -1
@@ 1088,7 1088,7 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable 

    public boolean wasMergedIntoPrevious() {
        Message prev = this.prev();
        if (getModerated() != null && prev.getModerated() != null) return true;
        if (prev != null && getModerated() != null && prev.getModerated() != null) return true;
        return prev != null && prev.mergeable(this);
    }