kopia lustrzana https://github.com/ryukoposting/Signal-Android
Fix crash when reacting to release note channel messages.
rodzic
c547553770
commit
233ba03f73
|
@ -654,7 +654,7 @@ public final class ConversationReactionOverlay extends FrameLayout {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void handleUpEvent() {
|
private void handleUpEvent() {
|
||||||
if (selected != -1 && onReactionSelectedListener != null) {
|
if (selected != -1 && onReactionSelectedListener != null && backgroundView.getVisibility() == View.VISIBLE) {
|
||||||
if (selected == customEmojiIndex) {
|
if (selected == customEmojiIndex) {
|
||||||
onReactionSelectedListener.onCustomReactionSelected(messageRecord, emojiViews[selected].getTag() != null);
|
onReactionSelectedListener.onCustomReactionSelected(messageRecord, emojiViews[selected].getTag() != null);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -17,6 +17,7 @@ import org.thoughtcrime.securesms.groups.GroupId;
|
||||||
import org.thoughtcrime.securesms.jobmanager.Data;
|
import org.thoughtcrime.securesms.jobmanager.Data;
|
||||||
import org.thoughtcrime.securesms.jobmanager.Job;
|
import org.thoughtcrime.securesms.jobmanager.Job;
|
||||||
import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
|
import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
|
||||||
|
import org.thoughtcrime.securesms.keyvalue.SignalStore;
|
||||||
import org.thoughtcrime.securesms.messages.GroupSendUtil;
|
import org.thoughtcrime.securesms.messages.GroupSendUtil;
|
||||||
import org.thoughtcrime.securesms.net.NotPushRegisteredException;
|
import org.thoughtcrime.securesms.net.NotPushRegisteredException;
|
||||||
import org.thoughtcrime.securesms.recipients.Recipient;
|
import org.thoughtcrime.securesms.recipients.Recipient;
|
||||||
|
@ -150,6 +151,10 @@ public class ReactionSendJob extends BaseJob {
|
||||||
Recipient targetAuthor = message.isOutgoing() ? Recipient.self() : message.getIndividualRecipient();
|
Recipient targetAuthor = message.isOutgoing() ? Recipient.self() : message.getIndividualRecipient();
|
||||||
long targetSentTimestamp = message.getDateSent();
|
long targetSentTimestamp = message.getDateSent();
|
||||||
|
|
||||||
|
if (targetAuthor.getId().equals(SignalStore.releaseChannelValues().getReleaseChannelRecipientId())) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (!remove && !reactionDatabase.hasReaction(messageId, reaction)) {
|
if (!remove && !reactionDatabase.hasReaction(messageId, reaction)) {
|
||||||
Log.w(TAG, "Went to add a reaction, but it's no longer present on the message!");
|
Log.w(TAG, "Went to add a reaction, but it's no longer present on the message!");
|
||||||
return;
|
return;
|
||||||
|
|
Ładowanie…
Reference in New Issue