TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-26 05:55:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lock the threadId during message send.

Browse Source 
Fixes #10659
This commit is contained in:
Greyson Parrelli
2021-01-15 12:15:07 -05:00
parent 562e608e1f
commit 1e2590af49
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

@@ -236,7 +236,6 @@ import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity;
import org.thoughtcrime.securesms.service.KeyCachingService; import org.thoughtcrime.securesms.service.KeyCachingService;
import org.thoughtcrime.securesms.sms.MessageSender; import org.thoughtcrime.securesms.sms.MessageSender;
import org.thoughtcrime.securesms.sms.OutgoingEncryptedMessage; import org.thoughtcrime.securesms.sms.OutgoingEncryptedMessage;
import org.thoughtcrime.securesms.sms.OutgoingEndSessionMessage;
import org.thoughtcrime.securesms.sms.OutgoingTextMessage; import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
import org.thoughtcrime.securesms.stickers.StickerKeyboardProvider; import org.thoughtcrime.securesms.stickers.StickerKeyboardProvider;
import org.thoughtcrime.securesms.stickers.StickerLocator; import org.thoughtcrime.securesms.stickers.StickerLocator;
@@ -1086,6 +1085,8 @@ public class ConversationActivity extends PassphraseRequiredActivity
return; return;
} }
final long thread = this.threadId;
ExpirationDialog.show(this, recipient.get().getExpireMessages(), ExpirationDialog.show(this, recipient.get().getExpireMessages(),
expirationTime -> expirationTime ->
SimpleTask.run( SimpleTask.run(
@@ -1101,7 +1102,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
} else { } else {
DatabaseFactory.getRecipientDatabase(ConversationActivity.this).setExpireMessages(recipient.getId(), expirationTime); DatabaseFactory.getRecipientDatabase(ConversationActivity.this).setExpireMessages(recipient.getId(), expirationTime);
OutgoingExpirationUpdateMessage outgoingMessage = new OutgoingExpirationUpdateMessage(getRecipient(), System.currentTimeMillis(), expirationTime * 1000L); OutgoingExpirationUpdateMessage outgoingMessage = new OutgoingExpirationUpdateMessage(getRecipient(), System.currentTimeMillis(), expirationTime * 1000L);
MessageSender.send(ConversationActivity.this, outgoingMessage, threadId, false, null); MessageSender.send(ConversationActivity.this, outgoingMessage, thread, false, null);
} }
return GroupChangeResult.SUCCESS; return GroupChangeResult.SUCCESS;
}, },
@@ -2644,13 +2645,14 @@ public class ConversationActivity extends PassphraseRequiredActivity
} }
private void sendMediaMessage(@NonNull MediaSendActivityResult result) { private void sendMediaMessage(@NonNull MediaSendActivityResult result) {
long thread = this.threadId;
long expiresIn = recipient.get().getExpireMessages() * 1000L; long expiresIn = recipient.get().getExpireMessages() * 1000L;
QuoteModel quote = result.isViewOnce() ? null : inputPanel.getQuote().orNull(); QuoteModel quote = result.isViewOnce() ? null : inputPanel.getQuote().orNull();
List<Mention> mentions = new ArrayList<>(result.getMentions()); List<Mention> mentions = new ArrayList<>(result.getMentions());
OutgoingMediaMessage message = new OutgoingMediaMessage(recipient.get(), new SlideDeck(), result.getBody(), System.currentTimeMillis(), -1, expiresIn, result.isViewOnce(), distributionType, quote, Collections.emptyList(), Collections.emptyList(), mentions); OutgoingMediaMessage message = new OutgoingMediaMessage(recipient.get(), new SlideDeck(), result.getBody(), System.currentTimeMillis(), -1, expiresIn, result.isViewOnce(), distributionType, quote, Collections.emptyList(), Collections.emptyList(), mentions);
OutgoingMediaMessage secureMessage = new OutgoingSecureMediaMessage(message); OutgoingMediaMessage secureMessage = new OutgoingSecureMediaMessage(message);
ApplicationDependencies.getTypingStatusSender().onTypingStopped(threadId); ApplicationDependencies.getTypingStatusSender().onTypingStopped(thread);
inputPanel.clearQuote(); inputPanel.clearQuote();
attachmentManager.clear(glideRequests, false); attachmentManager.clear(glideRequests, false);
@@ -2659,7 +2661,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
long id = fragment.stageOutgoingMessage(message); long id = fragment.stageOutgoingMessage(message);
SimpleTask.run(() -> { SimpleTask.run(() -> {
long resultId = MessageSender.sendPushWithPreUploadedMedia(this, secureMessage, result.getPreUploadResults(), threadId, () -> fragment.releaseOutgoingMessage(id)); long resultId = MessageSender.sendPushWithPreUploadedMedia(this, secureMessage, result.getPreUploadResults(), thread, () -> fragment.releaseOutgoingMessage(id));
int deleted = DatabaseFactory.getAttachmentDatabase(this).deleteAbandonedPreuploadedAttachments(); int deleted = DatabaseFactory.getAttachmentDatabase(this).deleteAbandonedPreuploadedAttachments();
Log.i(TAG, "Deleted " + deleted + " abandoned attachments."); Log.i(TAG, "Deleted " + deleted + " abandoned attachments.");
@@ -2704,6 +2706,8 @@ public class ConversationActivity extends PassphraseRequiredActivity
return new SettableFuture<>(null); return new SettableFuture<>(null);
} }
final long thread = this.threadId;
if (isSecureText && !forceSms) { if (isSecureText && !forceSms) {
MessageUtil.SplitResult splitMessage = MessageUtil.getSplitMessage(this, body, sendButton.getSelectedTransport().calculateCharacters(body).maxPrimaryMessageSize); MessageUtil.SplitResult splitMessage = MessageUtil.getSplitMessage(this, body, sendButton.getSelectedTransport().calculateCharacters(body).maxPrimaryMessageSize);
body = splitMessage.getBody(); body = splitMessage.getBody();
@@ -2722,7 +2726,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
if (isSecureText && !forceSms) { if (isSecureText && !forceSms) {
outgoingMessage = new OutgoingSecureMediaMessage(outgoingMessageCandidate); outgoingMessage = new OutgoingSecureMediaMessage(outgoingMessageCandidate);
ApplicationDependencies.getTypingStatusSender().onTypingStopped(threadId); ApplicationDependencies.getTypingStatusSender().onTypingStopped(thread);
} else { } else {
outgoingMessage = outgoingMessageCandidate; outgoingMessage = outgoingMessageCandidate;
} }
@@ -2741,7 +2745,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
final long id = fragment.stageOutgoingMessage(outgoingMessage); final long id = fragment.stageOutgoingMessage(outgoingMessage);
SimpleTask.run(() -> { SimpleTask.run(() -> {
return MessageSender.send(context, outgoingMessage, threadId, forceSms, () -> fragment.releaseOutgoingMessage(id)); return MessageSender.send(context, outgoingMessage, thread, forceSms, () -> fragment.releaseOutgoingMessage(id));
}, result -> { }, result -> {
sendComplete(result); sendComplete(result);
future.set(null); future.set(null);
@@ -2761,6 +2765,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
return; return;
} }
final long thread = this.threadId;
final Context context = getApplicationContext(); final Context context = getApplicationContext();
final String messageBody = getMessage(); final String messageBody = getMessage();
@@ -2768,7 +2773,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
if (isSecureText && !forceSms) { if (isSecureText && !forceSms) {
message = new OutgoingEncryptedMessage(recipient.get(), messageBody, expiresIn); message = new OutgoingEncryptedMessage(recipient.get(), messageBody, expiresIn);
ApplicationDependencies.getTypingStatusSender().onTypingStopped(threadId); ApplicationDependencies.getTypingStatusSender().onTypingStopped(thread);
} else { } else {
message = new OutgoingTextMessage(recipient.get(), messageBody, expiresIn, subscriptionId); message = new OutgoingTextMessage(recipient.get(), messageBody, expiresIn, subscriptionId);
} }
@@ -2784,7 +2789,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
new AsyncTask<OutgoingTextMessage, Void, Long>() { new AsyncTask<OutgoingTextMessage, Void, Long>() {
@Override @Override
protected Long doInBackground(OutgoingTextMessage... messages) { protected Long doInBackground(OutgoingTextMessage... messages) {
return MessageSender.send(context, messages[0], threadId, forceSms, () -> fragment.releaseOutgoingMessage(id)); return MessageSender.send(context, messages[0], thread, forceSms, () -> fragment.releaseOutgoingMessage(id));
} }
@Override @Override