TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-03 15:05:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Addressed PR feedback

Browse Source
This commit is contained in:
alansley 2024-05-15 17:26:48 +10:00 committed by Andrew
parent 8c31c83fc5
commit b300b9a743
5 changed files with 22 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
View File

@ -299,11 +299,11 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
private val adapter by lazy {
// To prevent repeated attachment download jobs being spawned we'll keep a set of what
// attachmentId / mmsId pairs we've already attempted to download and only spawn the job
// if we haven't already done so. Without this then when the retry limit for a failed job
// hits another job is immediately spawned (endlessly).
var alreadyAttemptedAttachmentDownloadPairs = mutableSetOf<Pair<Long, Long>>()
// To prevent repeated attachment download jobs being spawned we'll keep track of the
// attachment Ids we've attempted to download, and only spawn job if we haven't already
// tried. Without this then when the retry limit for a failed job hits another job is
// immediately spawned (endlessly).
val alreadyAttemptedAttachmentDownloads = mutableSetOf<Long>()
val cursor = mmsSmsDb.getConversation(viewModel.threadId, reverseMessageList)
val adapter = ConversationAdapter(
@ -332,12 +332,9 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
}
},
onAttachmentNeedsDownload = { attachmentId, mmsId ->
// Keep track of this specific attachment so we don't download it again
val pair = Pair(attachmentId, mmsId)
if (!alreadyAttemptedAttachmentDownloadPairs.contains(pair)) {
alreadyAttemptedAttachmentDownloadPairs.add(pair)
// Start download (on IO thread)
alreadyAttemptedAttachmentDownloads.takeUnless { attachmentId in alreadyAttemptedAttachmentDownloads }.let {
alreadyAttemptedAttachmentDownloads += attachmentId
lifecycleScope.launch(Dispatchers.IO) {
JobQueue.shared.add(AttachmentDownloadJob(attachmentId, mmsId))
}

6
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
View File

@ -139,8 +139,7 @@ class ConversationAdapter(
senderId,
lastSeen.get(),
visibleMessageViewDelegate,
onAttachmentNeedsDownload,
lastSentMessageId
onAttachmentNeedsDownload
)
if (!message.isDeleted) {
@ -216,8 +215,7 @@ class ConversationAdapter(
if (cursorHasContent) {
val thisThreadId = cursor.getLong(4) // Column index 4 is "thread_id"
if (thisThreadId != -1L) {
val thisUsersSessionId = TextSecurePreferences.getLocalNumber(context)
return messageDB.getLastSentMessageFromSender(thisThreadId, thisUsersSessionId)
return messageDB.getLastOutgoingMessage(thisThreadId)
}
}
return -1L

6
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
View File

@ -134,8 +134,7 @@ class VisibleMessageView : LinearLayout {
senderSessionID: String,
lastSeen: Long,
delegate: VisibleMessageViewDelegate? = null,
onAttachmentNeedsDownload: (Long, Long) -> Unit,
lastSentMessageId: Long
onAttachmentNeedsDownload: (Long, Long) -> Unit
) {
replyDisabled = message.isOpenGroupInvitation
val threadID = message.threadId
@ -303,8 +302,7 @@ class VisibleMessageView : LinearLayout {
// --- If we got here then we know the message is outgoing ---
val thisUsersSessionId = TextSecurePreferences.getLocalNumber(context)
val lastSentMessageId = mmsSmsDb.getLastSentMessageFromSender(message.threadId, thisUsersSessionId)
val lastSentMessageId = mmsSmsDb.getLastOutgoingMessage(message.threadId)
val isLastSentMessage = lastSentMessageId == message.id
// ----- Case ii.) Message is outgoing but NOT scheduled to disappear -----

4
app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsColumns.java
View File

@ -9,7 +9,11 @@ public interface MmsSmsColumns {
public static final String THREAD_ID = "thread_id";
public static final String READ = "read";
public static final String BODY = "body";
// This is the address of the message recipient, which may be a single user, a group, or a community!
// It is NOT the address of the sender of any given message!
public static final String ADDRESS = "address";
public static final String ADDRESS_DEVICE_ID = "address_device_id";
public static final String DELIVERY_RECEIPT_COUNT = "delivery_receipt_count";
public static final String READ_RECEIPT_COUNT = "read_receipt_count";

24
app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
View File

@ -295,29 +295,19 @@ public class MmsSmsDatabase extends Database {
return identifiedMessages;
}
public long getLastSentMessageFromSender(long threadId, String serializedAuthor) {
// Early exit
boolean isOwnNumber = Util.isOwnNumber(context, serializedAuthor);
if (!isOwnNumber) {
Log.i(TAG, "Asked to find last sent message but sender isn't us - returning null.");
return -1;
}
public long getLastOutgoingMessage(long threadId) {
String order = MmsSmsColumns.NORMALIZED_DATE_SENT + " DESC";
String selection = MmsSmsColumns.THREAD_ID + " = " + threadId;
// As the MmsSmsDatabase.ADDRESS column never contains the sender address we have to get creative to filter down all the
// messages that have been sent without interrogating each MessageRecord returned by the cursor. One way to do this is
// via the fact that the `ADDRESS_DEVICE_ID` is always null for incoming messages, but always has a value (such as 1) for
// outgoing messages - so we'll filter our query for only records with non-null ADDRESS_DEVICE_IDs in the current thread.
String selection = MmsSmsColumns.THREAD_ID + " = " + threadId + " AND " + MmsSmsColumns.ADDRESS_DEVICE_ID + " IS NOT NULL";
// Try everything with resources so that they auto-close on end of scope
// Try everything with resources so that they auto-close on end of scope.
// Note: Do NOT call cursor.moveToFirst() once we have it, for reasons unknown to me it breaks the functionality. -AL
try (Cursor cursor = queryTables(PROJECTION, selection, order, null)) {
try (MmsSmsDatabase.Reader reader = readerFor(cursor)) {
MessageRecord messageRecord;
while ((messageRecord = reader.getNext()) != null) {
if (messageRecord.isOutgoing()) { return messageRecord.id; }
// Note: We rely on the message order to get us the most recent outgoing message - so we
// take the first outgoing message we find.
if (messageRecord.isOutgoing()) return messageRecord.id;
}
}
}