Merge pull request #1647 from session-foundation/merge-1.29.0

Bring 1.29.0 to dev

Author: SessionHero01

app/build.gradle.kts

@@ -26,7 +26,7 @@ configurations.configureEach {
     exclude(module = "commons-logging")
 }
 
-val canonicalVersionCode = 429
+val canonicalVersionCode = 430
 val canonicalVersionName = "1.30.0"
 
 val postFixSize = 10

app/src/firebaseCommon/kotlin/org/thoughtcrime/securesms/notifications/FirebaseTokenFetcher.kt

@@ -12,6 +12,10 @@ class FirebaseTokenFetcher @Inject constructor(): TokenFetcher {
     override val token = MutableStateFlow<String?>(null)
 
     init {
+        fetchToken()
+    }
+
+    private fun fetchToken() {
         FirebaseMessaging.getInstance()
             .token
             .addOnSuccessListener(this::onNewToken)
@@ -23,5 +27,6 @@ class FirebaseTokenFetcher @Inject constructor(): TokenFetcher {
 
     override suspend fun resetToken() {
         FirebaseMessaging.getInstance().deleteToken().await()
+        fetchToken()
     }
 }

app/src/main/java/org/session/libsession/avatars/AvatarCacheCleaner.kt

@@ -7,7 +7,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.session.libsession.utilities.recipients.RemoteFile
 import org.session.libsignal.utilities.Log
-import org.thoughtcrime.securesms.attachments.RemoteFileDownloadWorker
+import org.thoughtcrime.securesms.attachments.AvatarDownloadManager
 import org.thoughtcrime.securesms.database.RecipientSettingsDatabase
 import org.thoughtcrime.securesms.dependencies.ManagerScope
 import org.thoughtcrime.securesms.glide.RecipientAvatarDownloadManager
@@ -47,11 +47,11 @@ class AvatarCacheCleaner @Inject constructor(
 
         // 4) Map to actual files (same hashing/location as downloader)
         val wantedFiles: Set<File> = filesToKeep
-            .map { RemoteFileDownloadWorker.computeFileName(application, it) }
+            .map { AvatarDownloadManager.computeFileName(application, it) }
             .toSet()
 
         // 5) Delete everything not wanted in cache/remote_files
-        val files = RemoteFileDownloadWorker.listDownloadedFiles(application)
+        val files = AvatarDownloadManager.listDownloadedFiles(application)
         var deleted = 0
         for (file in files) {
             if (file !in wantedFiles && file.delete()) deleted++

app/src/main/java/org/session/libsession/avatars/AvatarHelper.java

@@ -8,7 +8,6 @@
 import com.annimon.stream.Stream;
 
 import org.session.libsession.utilities.Address;
-import org.session.libsignal.utilities.Log;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -22,7 +21,7 @@
 /**
  * @deprecated We no longer use these address-based avatars. All avatars are now stored as sha256 of
  * urls encrypted locally. Look at {@link org.thoughtcrime.securesms.attachments.LocalEncryptedFileOutputStream},
- * {@link org.thoughtcrime.securesms.attachments.RemoteFileDownloadWorker},
+ * {@link org.thoughtcrime.securesms.attachments.AvatarDownloadWorker},
  * {@link org.thoughtcrime.securesms.glide.RecipientAvatarDownloadManager} for more information.
  *
  * Once the migration grace period is over, this class shall be removed.

app/src/main/java/org/session/libsession/database/MessageDataProvider.kt

@@ -30,7 +30,7 @@ interface MessageDataProvider {
     fun getAttachmentStream(attachmentId: Long): SessionServiceAttachmentStream?
     fun getAttachmentPointer(attachmentId: Long): SessionServiceAttachmentPointer?
     fun getSignalAttachmentStream(attachmentId: Long): SignalServiceAttachmentStream?
-    fun getScaledSignalAttachmentStream(attachmentId: Long): SignalServiceAttachmentStream?
+    suspend fun getScaledSignalAttachmentStream(attachmentId: Long): SignalServiceAttachmentStream?
     fun getSignalAttachmentPointer(attachmentId: Long): SignalServiceAttachmentPointer?
     fun setAttachmentState(attachmentState: AttachmentState, attachmentId: AttachmentId, messageID: Long)
     fun insertAttachment(messageId: Long, attachmentId: AttachmentId, stream : InputStream)

app/src/main/java/org/session/libsession/database/StorageProtocol.kt

@@ -93,6 +93,8 @@ interface StorageProtocol {
     fun removeReceivedMessageTimestamps(timestamps: Set<Long>)
     fun getAttachmentsForMessage(mmsMessageId: Long): List<DatabaseAttachment>
     fun getMessageBy(threadId: Long, timestamp: Long, author: String): MessageRecord?
+    @Deprecated("We shouldn't be querying messages by timestamp alone. Use `getMessageBy` when possible ")
+    fun getMessageByTimestamp(timestamp: Long, author: String, getQuote: Boolean): MessageRecord?
     fun updateSentTimestamp(messageId: MessageId, newTimestamp: Long)
     fun markAsResyncing(messageId: MessageId)
     fun markAsSyncing(messageId: MessageId)
@@ -182,6 +184,14 @@ interface StorageProtocol {
         runThreadUpdate: Boolean
     ): MessageId?
     fun markConversationAsRead(threadId: Long, lastSeenTime: Long, force: Boolean = false, updateNotification: Boolean = true)
+
+    /**
+     * Marks the conversation as read up to and including the message with [messageId]. It will
+     * take the reactions associated with messages prior to and including that message into account.
+     *
+     * It will not do anything if the last seen of this thread is already set in the future.
+     */
+    fun markConversationAsReadUpToMessage(messageId: MessageId)
     fun markConversationAsUnread(threadId: Long)
     fun getLastSeen(threadId: Long): Long
     fun ensureMessageHashesAreSender(hashes: Set<String>, sender: String, closedGroupId: String): Boolean

app/src/main/java/org/session/libsession/messaging/file_server/FileServer.kt

@@ -0,0 +1,18 @@
+package org.session.libsession.messaging.file_server
+
+import kotlinx.serialization.Serializable
+import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import org.session.libsession.utilities.serializable.HttpSerializer
+
+@Serializable
+data class FileServer(
+    @Serializable(with = HttpSerializer::class)
+    val url: HttpUrl,
+    val ed25519PublicKeyHex: String
+) {
+    constructor(url: String, ed25519PublicKeyHex: String) : this(url.toHttpUrl(), ed25519PublicKeyHex)
+}
+
+val HttpUrl.isOfficial: Boolean
+    get() = host.endsWith(".getsession.org", ignoreCase = true)