TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 17:27:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update comment

Browse Source
This commit is contained in:
nielsandriesse 2020-08-27 15:38:47 +10:00
parent 0234ddfd72
commit 6139e81799
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,11 +20,12 @@ import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Pair; import android.util.Pair;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.annimon.stream.Collectors; import com.annimon.stream.Collectors;
import com.annimon.stream.Stream; import com.annimon.stream.Stream;
import com.google.android.mms.pdu_alt.NotificationInd; import com.google.android.mms.pdu_alt.NotificationInd;
@ -840,13 +841,10 @@ 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);
// If the messages are from open groups, there will be a serverTimestamp, // In open groups messages should be sorted by their server timestamp
// we use current time like a sortId of iOS as the receive time. long receivedTimestamp = serverTimestamp;
// Since the messages has been sorted by server timestamp before they are processed, if (serverTimestamp == 0) { receivedTimestamp = retrieved.getSentTimeMillis(); }
// the order here by actual receiving time should be correct. contentValues.put(DATE_RECEIVED, receivedTimestamp); // Loki - This is important due to how we handle GIFs
long receiveTimestamp = serverTimestamp;
if (serverTimestamp == 0) { receiveTimestamp = retrieved.getSentTimeMillis(); }
contentValues.put(DATE_RECEIVED, receiveTimestamp); // 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());

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

@ -20,10 +20,11 @@ package org.thoughtcrime.securesms.database;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import androidx.annotation.NonNull;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Pair; import android.util.Pair;
import androidx.annotation.NonNull;
import com.annimon.stream.Stream; import com.annimon.stream.Stream;
import net.sqlcipher.database.SQLiteDatabase; import net.sqlcipher.database.SQLiteDatabase;
@ -625,13 +626,10 @@ 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());
// If the messages are from open groups, there will be a serverTimestamp, // In open groups messages should be sorted by their server timestamp
// we use current time like a sortId of iOS as the receive time. long receivedTimestamp = serverTimestamp;
// Since the messages has been sorted by server timestamp before they are processed, if (serverTimestamp == 0) { receivedTimestamp = message.getSentTimestampMillis(); }
// the order here by actual receiving time should be correct. values.put(DATE_RECEIVED, receivedTimestamp); // Loki - This is important due to how we handle GIFs
long receiveTimestamp = serverTimestamp;
if (serverTimestamp == 0) { receiveTimestamp = message.getSentTimestampMillis(); }
values.put(DATE_RECEIVED, receiveTimestamp); // 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);