TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-22 04:38:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Debug

Browse Source
This commit is contained in:
nielsandriesse 2020-05-12 11:32:00 +10:00
parent b9d8d100d9
commit 0a5d12cbc3
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/thoughtcrime/securesms/jobs/TypingSendJob.java
View File

@ -21,9 +21,7 @@ import org.whispersystems.signalservice.api.messages.SignalServiceTypingMessage.
import org.whispersystems.signalservice.api.push.SignalServiceAddress; import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import javax.inject.Inject; import javax.inject.Inject;
@ -86,11 +84,11 @@ public class TypingSendJob extends BaseJob implements InjectableType {
throw new IllegalStateException("Tried to send a typing indicator to a non-existent thread."); throw new IllegalStateException("Tried to send a typing indicator to a non-existent thread.");
} }
Set<Recipient> recipients = new HashSet<>(Collections.singletonList(recipient)); List<Recipient> recipients = Collections.singletonList(recipient);
Optional<byte[]> groupId = Optional.absent(); Optional<byte[]> groupId = Optional.absent();
if (recipient.isGroupRecipient()) { if (recipient.isGroupRecipient()) {
recipients = new HashSet<>(DatabaseFactory.getGroupDatabase(context).getGroupMembers(recipient.getAddress().toGroupString(), false)); recipients = DatabaseFactory.getGroupDatabase(context).getGroupMembers(recipient.getAddress().toGroupString(), false);
groupId = Optional.of(GroupUtil.getDecodedId(recipient.getAddress().toGroupString())); groupId = Optional.of(GroupUtil.getDecodedId(recipient.getAddress().toGroupString()));
} }

3
src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
View File

@ -77,9 +77,10 @@ public class MarkReadReceiver extends BroadcastReceiver {
for (MarkedMessageInfo messageInfo : markedReadMessages) { for (MarkedMessageInfo messageInfo : markedReadMessages) {
scheduleDeletion(context, messageInfo.getExpirationInfo()); scheduleDeletion(context, messageInfo.getExpirationInfo());
if (!SyncMessagesProtocol.shouldSyncReadReceipt(messageInfo.getSyncMessageId().getAddress())) { continue; } if (SyncMessagesProtocol.shouldSyncReadReceipt(messageInfo.getSyncMessageId().getAddress())) {
syncMessageIds.add(messageInfo.getSyncMessageId()); syncMessageIds.add(messageInfo.getSyncMessageId());
} }
}
ApplicationContext.getInstance(context) ApplicationContext.getInstance(context)
.getJobManager() .getJobManager()