[SES-4634] - File server change

app/build.gradle.kts

@@ -408,6 +408,7 @@ dependencies {
     implementation(libs.opencsv)
     implementation(libs.androidx.work.runtime.ktx)
     implementation(libs.rxbinding)
+    implementation(libs.gif.encoder)
 
     if (hasIncludedLibSessionUtilProject) {
         implementation(

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.AvatarDownloadWorker
 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 { AvatarDownloadWorker.computeFileName(application, it) }
             .toSet()
 
         // 5) Delete everything not wanted in cache/remote_files
-        val files = RemoteFileDownloadWorker.listDownloadedFiles(application)
+        val files = AvatarDownloadWorker.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/messaging/file_server/FileServer.kt

@@ -0,0 +1,15 @@
+package org.session.libsession.messaging.file_server
+
+import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrl
+
+data class FileServer(
+    val url: HttpUrl,
+    val publicKeyHex: String
+) {
+    constructor(url: String, publicKeyHex: String) : this(url.toHttpUrl(), publicKeyHex)
+
+}
+
+val HttpUrl.isOfficial: Boolean
+    get() = host.endsWith(".getsession.org", ignoreCase = true)