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

Fix message ordering

Browse Source
This commit is contained in:
Niels Andriesse 2019-09-18 14:43:02 +10:00
parent 8a16fd2a97
commit cc7f93688f
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
View File

@ -509,7 +509,7 @@ public class ConversationFragment extends Fragment
builder.setMessage(getActivity().getResources().getQuantityString(R.plurals.ConversationFragment_this_will_permanently_delete_all_n_selected_messages, messagesCount, messagesCount)); builder.setMessage(getActivity().getResources().getQuantityString(R.plurals.ConversationFragment_this_will_permanently_delete_all_n_selected_messages, messagesCount, messagesCount));
builder.setCancelable(true); builder.setCancelable(true);
// Loki - The delete option is only visible to the user in a group chat if it's the Loki public chat // Loki - The delete option is only visible to the user in a group chat if it's the Loki Public Chat
boolean isLokiPublicChat = this.recipient.isGroupRecipient(); boolean isLokiPublicChat = this.recipient.isGroupRecipient();
builder.setPositiveButton(R.string.delete, new DialogInterface.OnClickListener() { builder.setPositiveButton(R.string.delete, new DialogInterface.OnClickListener() {

2
src/org/thoughtcrime/securesms/database/MmsDatabase.java
View File

@ -802,7 +802,7 @@ public class MmsDatabase extends MessagingDatabase {
contentValues.put(THREAD_ID, threadId); contentValues.put(THREAD_ID, threadId);
contentValues.put(CONTENT_LOCATION, contentLocation); contentValues.put(CONTENT_LOCATION, contentLocation);
contentValues.put(STATUS, Status.DOWNLOAD_INITIALIZED); contentValues.put(STATUS, Status.DOWNLOAD_INITIALIZED);
contentValues.put(DATE_RECEIVED, generatePduCompatTimestamp()); contentValues.put(DATE_RECEIVED, retrieved.getSentTimeMillis()); // Loki - This is important due to how we handle GIFs
contentValues.put(PART_COUNT, retrieved.getAttachments().size()); contentValues.put(PART_COUNT, retrieved.getAttachments().size());
contentValues.put(SUBSCRIPTION_ID, retrieved.getSubscriptionId()); contentValues.put(SUBSCRIPTION_ID, retrieved.getSubscriptionId());
contentValues.put(EXPIRES_IN, retrieved.getExpiresIn()); contentValues.put(EXPIRES_IN, retrieved.getExpiresIn());

2
src/org/thoughtcrime/securesms/database/SmsDatabase.java
View File

@ -577,7 +577,7 @@ public class SmsDatabase extends MessagingDatabase {
ContentValues values = new ContentValues(6); ContentValues values = new ContentValues(6);
values.put(ADDRESS, message.getSender().serialize()); values.put(ADDRESS, message.getSender().serialize());
values.put(ADDRESS_DEVICE_ID, message.getSenderDeviceId()); values.put(ADDRESS_DEVICE_ID, message.getSenderDeviceId());
values.put(DATE_RECEIVED, System.currentTimeMillis()); values.put(DATE_RECEIVED, message.getSentTimestampMillis()); // Loki - This is important due to how we handle GIFs
values.put(DATE_SENT, message.getSentTimestampMillis()); values.put(DATE_SENT, message.getSentTimestampMillis());
values.put(PROTOCOL, message.getProtocol()); values.put(PROTOCOL, message.getProtocol());
values.put(READ, unread ? 0 : 1); values.put(READ, unread ? 0 : 1);

2
src/org/thoughtcrime/securesms/loki/LokiGroupChatPoller.kt
View File

@ -162,7 +162,7 @@ class LokiGroupChatPoller(private val context: Context, private val group: LokiG
} }
} }
api.getMessages(group.serverID, group.server).success { messages -> api.getMessages(group.serverID, group.server).success { messages ->
messages.reversed().forEach { message -> messages.forEach { message ->
if (message.hexEncodedPublicKey != userHexEncodedPublicKey) { if (message.hexEncodedPublicKey != userHexEncodedPublicKey) {
processIncomingMessage(message) processIncomingMessage(message)
} else { } else {