Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-25 19:29:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add more logging around threads in message sends.

Browse Source
This commit is contained in:
Greyson Parrelli
2021-03-08 15:27:10 -05:00
committed by Cody Henthorne
parent d1e0f3646a
commit 992b04f8c5
7 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2070,6 +2070,8 @@ public class ConversationActivity extends PassphraseRequiredActivity
distributionType = args.getDistributionType();
glideRequests = GlideApp.with(this);
Log.i(TAG, "[initializeResources] Recipient: " + recipient.getId() + ", Thread: " + threadId);
recipient.observe(this, this::onRecipientChanged);
}
@@ -2706,8 +2708,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
linkPreviewViewModel.hasLinkPreview() ||
needsSplit;
Log.i(TAG, "isManual Selection: " + sendButton.isManualSelection());
Log.i(TAG, "forceSms: " + forceSms);
Log.i(TAG, "[sendMessage] recipient: " + recipient.getId() + ", threadId: " + threadId + ", forceSms: " + forceSms + ", isManual: " + sendButton.isManualSelection());
if ((recipient.isMmsGroup() || recipient.getEmail().isPresent()) && !isMmsEnabled) {
handleManualMmsRequired();
@@ -2874,18 +2875,9 @@ public class ConversationActivity extends PassphraseRequiredActivity
silentlySetComposeText("");
final long id = fragment.stageOutgoingMessage(message);
new AsyncTask<OutgoingTextMessage, Void, Long>() {
@Override
protected Long doInBackground(OutgoingTextMessage... messages) {
return MessageSender.send(context, messages[0], thread, forceSms, () -> fragment.releaseOutgoingMessage(id));
}
@Override
protected void onPostExecute(Long result) {
sendComplete(result);
}
}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, message);
SimpleTask.run(() -> {
return MessageSender.send(context, message, thread, forceSms, () -> fragment.releaseOutgoingMessage(id));
}, this::sendComplete);
})
.execute();
}

7
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
View File

@@ -327,6 +327,8 @@ public class ConversationFragment extends LoggingFragment {
public void onActivityCreated(Bundle bundle) {
super.onActivityCreated(bundle);
Log.d(TAG, "[onActivityCreated]");
initializeScrollButtonAnimations();
initializeResources();
initializeMessageRequestViewModel();
@@ -377,6 +379,8 @@ public class ConversationFragment extends LoggingFragment {
}
public void onNewIntent() {
Log.d(TAG, "[onNewIntent]");
if (actionMode != null) {
actionMode.finish();
}
@@ -673,9 +677,12 @@ public class ConversationFragment extends LoggingFragment {
}
public void reload(Recipient recipient, long threadId) {
Log.d(TAG, "[reload] Recipient: " + recipient.getId() + ", ThreadId: " + threadId);
this.recipient = recipient.live();
if (this.threadId != threadId) {
Log.i(TAG, "ThreadId changed from " + this.threadId + " to " + threadId + ". Recipient was " + this.recipient.getId() + " and is now " + recipient.getId());
this.threadId = threadId;
messageRequestViewModel.setConversationInfo(recipient.getId(), threadId);

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationViewModel.java
View File

@@ -115,7 +115,7 @@ class ConversationViewModel extends ViewModel {
@MainThread
void onConversationDataAvailable(@NonNull RecipientId recipientId, long threadId, int startingPosition) {
Log.d(TAG, "[onConversationDataAvailable] threadId: " + threadId + ", startingPosition: " + startingPosition);
Log.d(TAG, "[onConversationDataAvailable] recipientId: " + recipientId + ", threadId: " + threadId + ", startingPosition: " + startingPosition);
this.jumpToPosition = startingPosition;
this.threadId.setValue(threadId);