Merge branch 'dev' into feature/update-crowdin-translations

Author: ThomasSession

.github/workflows/build_and_test.yml

@@ -38,7 +38,7 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'gradle.properties') }}-${{ matrix.variant }}
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '21'

app/build.gradle.kts

@@ -352,6 +352,7 @@ dependencies {
     implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.fragment.ktx)
     implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.interpolator)
 
     // Add firebase dependencies to specific variants
     for (variant in firebaseEnabledVariants) {
@@ -378,8 +379,9 @@ dependencies {
     implementation(libs.android)
     implementation(libs.photoview)
     implementation(libs.glide)
-    implementation(libs.compose)
-    implementation(libs.eventbus)
+    implementation(libs.glide.compose)
+    implementation(libs.coil.compose)
+    implementation(libs.coil.gif)
     implementation(libs.android.image.cropper)
     implementation(libs.subsampling.scale.image.view) {
         exclude(group = "com.android.support", module = "support-annotations")

app/src/main/AndroidManifest.xml

@@ -399,14 +399,6 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_provider_paths" />
         </provider>
-        <provider
-            android:name="org.thoughtcrime.securesms.database.DatabaseContentProviders$Conversation"
-            android:authorities="network.loki.securesms.database.conversation${authority_postfix}"
-            android:exported="false" />
-        <provider
-            android:name="org.thoughtcrime.securesms.database.DatabaseContentProviders$ConversationList"
-            android:authorities="network.loki.securesms.database.conversationlist${authority_postfix}"
-            android:exported="false" />
         <provider
             android:name="org.thoughtcrime.securesms.database.DatabaseContentProviders$Attachment"
             android:authorities="network.loki.securesms.database.attachment${authority_postfix}"
@@ -419,10 +411,6 @@
             android:name="org.thoughtcrime.securesms.database.DatabaseContentProviders$StickerPack"
             android:authorities="network.loki.securesms.database.stickerpack${authority_postfix}"
             android:exported="false" />
-        <provider
-            android:name="org.thoughtcrime.securesms.database.DatabaseContentProviders$Recipient"
-            android:authorities="network.loki.securesms.database.recipient${authority_postfix}"
-            android:exported="false" />
 
         <receiver android:name="org.thoughtcrime.securesms.service.BootReceiver"
             android:exported="true">

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

@@ -19,6 +19,15 @@
 import java.util.LinkedList;
 import java.util.List;
 
+/**
+ * @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.glide.RecipientAvatarDownloadManager} for more information.
+ *
+ * Once the migration grace period is over, this class shall be removed.
+ */
+@Deprecated(forRemoval = true)
 public class AvatarHelper {
 
   private static final String AVATAR_DIRECTORY = "avatars";