From 4f2bb1abce775166c3e44d4b90c1c7078c594ef4 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO Date: Wed, 23 Sep 2020 17:21:35 +1000 Subject: [PATCH 1/3] fix open group message date issue for media messages --- src/org/thoughtcrime/securesms/database/MmsDatabase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/thoughtcrime/securesms/database/MmsDatabase.java b/src/org/thoughtcrime/securesms/database/MmsDatabase.java index 97a59c5007..eccb3600cb 100644 --- a/src/org/thoughtcrime/securesms/database/MmsDatabase.java +++ b/src/org/thoughtcrime/securesms/database/MmsDatabase.java @@ -914,7 +914,7 @@ public class MmsDatabase extends MessagingDatabase { type |= Types.EXPIRATION_TIMER_UPDATE_BIT; } - return insertMessageInbox(retrieved, "", threadId, type, 0); + return insertMessageInbox(retrieved, "", threadId, type, serverTimestamp); } public Optional insertSecureDecryptedMessageInbox(IncomingMediaMessage retrieved, long threadId) From b2b2c36ecbd54648f5bd52a8a5a845402dd848c5 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Thu, 24 Sep 2020 09:43:18 +1000 Subject: [PATCH 2/3] Hopefully fix crash --- src/org/thoughtcrime/securesms/ApplicationContext.java | 4 +++- .../thoughtcrime/securesms/loki/activities/HomeActivity.kt | 1 + .../thoughtcrime/securesms/loki/activities/PNModeActivity.kt | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java index 11d4dc48d4..29a668776d 100644 --- a/src/org/thoughtcrime/securesms/ApplicationContext.java +++ b/src/org/thoughtcrime/securesms/ApplicationContext.java @@ -216,7 +216,9 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc resubmitProfilePictureIfNeeded(); publicChatManager = new PublicChatManager(this); updateOpenGroupProfilePicturesIfNeeded(); - registerForFCMIfNeeded(false); + if (userPublicKey != null) { + registerForFCMIfNeeded(false); + } // Set application UI mode (day/night theme) to the user selected one. UiModeUtilities.setupUiModeToUserSelected(this); // ======== diff --git a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt index e0bba59ccf..5c81027f7d 100644 --- a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt +++ b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt @@ -172,6 +172,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe SessionManagementProtocol.configureIfNeeded(sessionResetImpl, sskDatabase, application) MultiDeviceProtocol.configureIfNeeded(apiDB) IP2Country.configureIfNeeded(this) + application.registerForFCMIfNeeded(false) // Preload device links to make message sending quicker val publicKeys = ContactUtilities.getAllContacts(this).filter { contact -> !contact.recipient.isGroupRecipient && !contact.isOurDevice && !contact.isSlave diff --git a/src/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt index 75102938b9..03e0dec356 100644 --- a/src/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt +++ b/src/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt @@ -158,7 +158,6 @@ class PNModeActivity : BaseActionBarActivity() { val application = ApplicationContext.getInstance(this) application.setUpStorageAPIIfNeeded() application.setUpP2PAPIIfNeeded() - application.registerForFCMIfNeeded(true) val intent = Intent(this, HomeActivity::class.java) intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK show(intent) From 4ae89f3bc0ec5207f1d48bafb041594bfa0cd2de Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Thu, 24 Sep 2020 09:45:00 +1000 Subject: [PATCH 3/3] Update build number --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d672194cc2..8f4512531f 100644 --- a/build.gradle +++ b/build.gradle @@ -181,7 +181,7 @@ dependencies { testImplementation 'org.robolectric:shadows-multidex:4.2' } -def canonicalVersionCode = 98 +def canonicalVersionCode = 99 def canonicalVersionName = "1.5.4" def postFixSize = 10