Merge remote-tracking branch 'upstream/dev' into refactor/avatar-cleanup

Author: jbsession

.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/src/main/java/org/session/libsession/avatars/AvatarCacheCleaner.kt

@@ -1,16 +1,13 @@
 package org.session.libsession.avatars
 
 import android.app.Application
-import com.bumptech.glide.Glide
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.recipients.RemoteFile
 import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.attachments.RemoteFileDownloadWorker
-import org.thoughtcrime.securesms.database.MmsSmsDatabase
 import org.thoughtcrime.securesms.database.RecipientSettingsDatabase
 import org.thoughtcrime.securesms.dependencies.ManagerScope
 import org.thoughtcrime.securesms.glide.RecipientAvatarDownloadManager
@@ -23,7 +20,6 @@ class AvatarCacheCleaner @Inject constructor(
     private val application: Application,
     private val recipientAvatarDownloadManager: RecipientAvatarDownloadManager,
     private val recipientSettingsDatabase: RecipientSettingsDatabase,
-    private val mmsSmsDatabase: MmsSmsDatabase,
     @param:ManagerScope private val coroutineScope: CoroutineScope
 ) {
 

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt

@@ -401,8 +401,8 @@ fun MessageProFeatures(
                 padding = PaddingValues(),
                 data = CTAFeature.Icon(
                     text = when(it){
-                        ProStatusManager.MessageProFeature.ProBadge -> Phrase.from(LocalContext.current, R.string.proBadge)
-                            .put(APP_PRO_KEY, NonTranslatableStringConstants.PRO)
+                        ProStatusManager.MessageProFeature.ProBadge -> Phrase.from(LocalContext.current, R.string.appProBadge)
+                            .put(APP_PRO_KEY, NonTranslatableStringConstants.APP_PRO)
                             .format()
                             .toString()
                         ProStatusManager.MessageProFeature.LongMessage -> stringResource(id = R.string.proIncreasedMessageLengthFeature)

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailsViewModel.kt

@@ -356,7 +356,7 @@ data class MessageDetailsState(
     val proBadgeClickable: Boolean = false,
 ) {
     val fromTitle = GetString(R.string.from)
-    val canReply: Boolean get() = !readOnly && record?.isOpenGroupInvitation != true
+    val canReply: Boolean get() = !readOnly && record?.isOpenGroupInvitation != true && error == null
     val canDelete: Boolean get() = !readOnly
 }
 

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/settings/ConversationSettingsScreen.kt

@@ -201,7 +201,6 @@ fun ConversationSettings(
                 Text(
                     modifier = Modifier
                         .qaTag(R.string.qa_conversation_settings_account_id)
-                        .safeContentWidth()
                         .pointerInput(Unit) {
                             detectTapGestures(
                                 onLongPress = { onLongPress() }
@@ -215,7 +214,7 @@ fun ConversationSettings(
                         },
                     text = data.displayAccountId,
                     textAlign = TextAlign.Center,
-                    style = LocalType.current.base.monospace(),
+                    style = LocalType.current.xl.monospace(),
                     color = LocalColors.current.text
                 )
             }

app/src/main/java/org/thoughtcrime/securesms/database/RecipientSettingsDatabase.kt

@@ -43,10 +43,7 @@ class RecipientSettingsDatabase @Inject constructor(
 
         // If nothing is updated, return early
         if (oldSettings == newSettings) {
-            Log.d(
-                TAG,
-                "No changes to settings for ${address.debugString}, old: $oldSettings, new: $newSettings"
-            )
+            Log.d(TAG, "No changes to settings for ${address.debugString}, old: $oldSettings, new: $newSettings")
             return
         }
 
@@ -83,11 +80,10 @@ class RecipientSettingsDatabase @Inject constructor(
     fun delete(address: Address) {
         cache.remove(address)
         if (writableDatabase.delete(
-                TABLE_NAME,
-                "$COL_ADDRESS = ?",
-                arrayOf(address.toString())
-            ) > 0
-        ) {
+            TABLE_NAME,
+            "$COL_ADDRESS = ?",
+            arrayOf(address.toString())
+        ) > 0) {
             mutableChangeNotification.tryEmit(address)
         }
     }
@@ -98,10 +94,7 @@ class RecipientSettingsDatabase @Inject constructor(
             return existing
         }
 
-        return readableDatabase.rawQuery(
-            "SELECT * FROM $TABLE_NAME WHERE $COL_ADDRESS = ?",
-            address.address
-        )
+        return readableDatabase.rawQuery("SELECT * FROM $TABLE_NAME WHERE $COL_ADDRESS = ?", address.address)
             .use { cursor ->
                 // If no settings are saved in the database, return the empty settings, and cache
                 // that as well so that we don't have to query the database again.
@@ -125,11 +118,7 @@ class RecipientSettingsDatabase @Inject constructor(
                 keyB64 = getString(getColumnIndexOrThrow(COL_PROFILE_PIC_KEY)),
                 url = getString(getColumnIndexOrThrow(COL_PROFILE_PIC_URL))
             ),
-            blocksCommunityMessagesRequests = getInt(
-                getColumnIndexOrThrow(
-                    COL_BLOCKS_COMMUNITY_MESSAGES_REQUESTS
-                )
-            ) == 1,
+            blocksCommunityMessagesRequests = getInt(getColumnIndexOrThrow(COL_BLOCKS_COMMUNITY_MESSAGES_REQUESTS)) == 1,
             name = getString(getColumnIndexOrThrow(COL_NAME)),
             proStatus = getString(getColumnIndexOrThrow(COL_PRO_STATUS))
                 ?.let {
@@ -250,15 +239,13 @@ class RecipientSettingsDatabase @Inject constructor(
         private const val COL_PROFILE_PIC_KEY = "profile_pic_key_b64"
         private const val COL_PROFILE_PIC_URL = "profile_pic_url"
         private const val COL_NAME = "name"
-        private const val COL_BLOCKS_COMMUNITY_MESSAGES_REQUESTS =
-            "blocks_community_messages_requests"
+        private const val COL_BLOCKS_COMMUNITY_MESSAGES_REQUESTS = "blocks_community_messages_requests"
         private const val COL_PRO_STATUS = "pro_status"
 
         // The time when the profile pic/name/is_pro was last updated, in epoch seconds.
         private const val COL_PROFILE_UPDATE_TIME = "profile_update_time"
 
-        val MIGRATION_CREATE_TABLE = arrayOf(
-            """
+        val MIGRATION_CREATE_TABLE = arrayOf("""
             CREATE TABLE recipient_settings (
                 $COL_ADDRESS TEXT NOT NULL PRIMARY KEY COLLATE NOCASE,
                 $COL_MUTE_UNTIL INTEGER NOT NULL DEFAULT 0,

app/src/main/java/org/thoughtcrime/securesms/groups/OpenGroupManager.kt

@@ -1,20 +1,15 @@
 package org.thoughtcrime.securesms.groups
 
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.mapNotNull
-import kotlinx.coroutines.launch
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
-import org.session.libsession.avatars.AvatarCacheCleaner
 import org.session.libsession.messaging.open_groups.OpenGroup
 import org.session.libsession.messaging.open_groups.OpenGroupApi
 import org.session.libsession.messaging.sending_receiving.pollers.OpenGroupPollerManager
 import org.session.libsession.snode.utilities.await
 import org.session.libsession.utilities.ConfigFactoryProtocol
 import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.database.LokiAPIDatabase
-import org.thoughtcrime.securesms.dependencies.ManagerScope
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -28,7 +23,6 @@ class OpenGroupManager @Inject constructor(
     private val configFactory: ConfigFactoryProtocol,
     private val pollerManager: OpenGroupPollerManager,
     private val lokiAPIDatabase: LokiAPIDatabase,
-    private val avatarCacheCleaner: AvatarCacheCleaner,
 ) {
     suspend fun add(server: String, room: String, publicKey: String) {
         // Fetch the server's capabilities upfront to see if this server is actually running

app/src/main/res/values-b+ja+JP/strings.xml

@@ -292,8 +292,7 @@
     <string name="creatingCall">通話を作成中</string>
     <string name="cut">切り取り</string>
     <string name="databaseErrorClearDataWarning">このデバイス上のすべてのメッセージ、添付ファイル、アカウントデータを削除し、新しいアカウントを作成してもよろしいですか？</string>
-    <string name="databaseErrorGeneric">データベースエラーが発生しました。\n\n
-トラブルシューティングのために、アプリのログをエクスポートして共有してください。この操作が失敗した場合は、{app_name} を再インストールし、アカウントを復元してください。</string>
+    <string name="databaseErrorGeneric">データベースエラーが発生しました。\n\nトラブルシューティングのために、アプリのログをエクスポートして共有してください。この操作が失敗した場合は、{app_name} を再インストールし、アカウントを復元してください。</string>
     <string name="databaseErrorRestoreDataWarning">このデバイス上のすべてのメッセージ、添付ファイル、アカウントデータを削除し、ネットワークからアカウントを復元してもよろしいですか？</string>
     <string name="databaseErrorTimeout">{app_name}が起動するのに時間がかかっていることを確認しました。\n\n引き続きお待ちいただくか、トラブルシューティングのためにデバイスログをエクスポートして共有するか、{app_name}を再起動してみてください。</string>
     <string name="databaseErrorUpdate">お使いのアプリデータベースはこのバージョンの {app_name} と互換性がありません。アプリを再インストールしてアカウントを復元し、新しいデータベースを生成して {app_name} を使用し続けてください。\n\n警告: これにより、2週間以上前のすべてのメッセージと添付ファイルが失われます。</string>

app/src/main/res/values/strings.xml

@@ -307,6 +307,7 @@
     <string name="create">Create</string>
     <string name="creatingCall">Creating Call</string>
     <string name="currentPassword">Current Password</string>
+    <string name="currentPlan">Current Plan</string>
     <string name="cut">Cut</string>
     <string name="darkMode">Dark Mode</string>
     <string name="databaseErrorClearDataWarning">Are you sure you want to delete all messages, attachments, and account data from this device and create a new account?</string>
@@ -835,8 +836,8 @@
     <string name="passwordSetShortDescription">Require password to unlock {app_name} on startup.</string>
     <string name="passwordStrengthCharLength">Longer than 12 characters</string>
     <string name="passwordStrengthIncludeNumber">Includes a number</string>
-    <string name="passwordStrengthIncludesLetter">Includes a letter</string>
     <string name="passwordStrengthIncludesLowercase">Includes a lowercase letter</string>
+    <string name="passwordStrengthIncludesSymbol">Includes a symbol</string>
     <string name="passwordStrengthIncludesUppercase">Includes a uppercase letter</string>
     <string name="passwordStrengthIndicator">Password Strength Indicator</string>
     <string name="passwordStrengthIndicatorDescription">Setting a strong password helps protect your messages and attachments if your device is ever lost or stolen.</string>
@@ -908,8 +909,7 @@
     <string name="proCallToActionLongerMessages">Want to send longer messages? Send more text and unlock premium features with {app_pro}</string>
     <string name="proCallToActionPinnedConversations">Want more pins? Organize your chats and unlock premium features with {app_pro}</string>
     <string name="proCallToActionPinnedConversationsMoreThan">Want more than 5 pins? Organize your chats and unlock premium features with {app_pro}</string>
-    <string name="proDiscountTooltip">Your current plan is already discounted by&amp;#13;
-{percent}% of the full {app_pro} price.</string>
+    <string name="proDiscountTooltip">Your current plan is already discounted by{percent}% of the full {app_pro} price.</string>
     <string name="proExpired">Expired</string>
     <string name="proExpiredDescription">Unfortunately, your {pro} plan has expired. Renew to keep accessing the exclusive perks and features of {app_pro}.</string>
     <string name="proExpiringSoon">Expiring Soon</string>
@@ -934,6 +934,7 @@
     <string name="proLongerMessagesDescription">You can send messages up to 10,000 characters in all conversations.</string>
     <string name="proLongerMessagesSent">{count} Longer Messages Sent</string>
     <string name="proMessageInfoFeatures">This message used the following {app_pro} features:</string>
+    <string name="proPercentOff">{percent}% Off</string>
     <string name="proPinnedConversations">{count} Pinned Conversations</string>
     <string name="proPlanActivatedAuto">Your {app_pro} plan is active!\n\nYour plan will automatically renew for another <b>{current_plan}</b> on <b>{date}</b>. Updates to your plan take effect when {pro} is next renewed.</string>
     <string name="proPlanActivatedAutoShort">Your {app_pro} plan is active!\n\nYour plan will automatically renew for another <b>{current_plan}</b> on <b>{date}</b>.</string>
@@ -953,9 +954,9 @@
     <string name="proPlanRestored">{pro} Plan Restored</string>
     <string name="proPlanRestoredDescription">A valid plan for {app_pro} was detected and your {pro} status has been restored!</string>
     <string name="proPlanSignUp">Because you originally signed up for {app_pro} via the {platform_store} Store, you\'ll need to use your {platform_account} to update your plan.</string>
-    <string name="proPriceOneMonth">1 Month - {monthlyPrice} / Month</string>
-    <string name="proPriceThreeMonths">3 Months - {monthlyPrice} / Month</string>
-    <string name="proPriceTwelveMonths">12 Months - {monthlyPrice} / Month</string>
+    <string name="proPriceOneMonth">1 Month - {monthly_price} / Month</string>
+    <string name="proPriceThreeMonths">3 Months - {monthly_price} / Month</string>
+    <string name="proPriceTwelveMonths">12 Months - {monthly_price} / Month</string>
     <string name="proRefundDescription">We’re sorry to see you go. Here\'s what you need to know before requesting a refund.</string>
     <string name="proRefundNextSteps">{platform_account} is now processing your refund request. This typically takes 24-48 hours. Depending on their decision, you may see your {pro} status change in {app_name}.</string>
     <string name="proRefundRequestSessionSupport">Your refund request will be handled by {app_name} Support.\n\nRequest a refund by hitting the button below and completing the refund request form.\n\nWhile {app_name} Support strives to process refund requests within 24-72 hours, processing may take longer during times of high request volume.</string>
@@ -969,9 +970,11 @@
     <string name="proStats">Your {pro} Stats</string>
     <string name="proStatsTooltip">{pro} stats reflect usage on this device and may appear differently on linked devices</string>
     <string name="proSupportDescription">Need help with your {pro} plan? Submit a request to the support team.</string>
-    <string name="proTosPrivacy">By updating, you agree to the {app_pro} <b>Terms of Service</b> and <b>Privacy Policy</b></string>
+    <string name="proTosPrivacy">By updating, you agree to the {app_pro} <b>Terms of Service</b> {icon} and <b>Privacy Policy</b> {icon}</string>
     <string name="proUnlimitedPins">Unlimited Pins</string>
     <string name="proUnlimitedPinsDescription">Organize all your chats with unlimited pinned conversations.</string>
+    <string name="proUpdatePlanDescription">You are currently on the <b>{current_plan} Plan</b>. Are you sure you want to switch to the <b>{selected_plan} Plan</b>?\n\nBy updating, your plan will automatically renew on <b>{date}</b> for an additional {selected_plan} of {pro} access.</string>
+    <string name="proUpdatePlanExpireDescription">Your plan will expire on <b>{date}</b>.\n\nBy updating, your plan will automatically renew on <b>{date}</b> for an additional {selected_plan} of Pro access.</string>
     <string name="proUserProfileModalCallToAction">Want to get more out of {app_name}? Upgrade to {app_pro} for a more powerful messaging experience.</string>
     <string name="processingRefundRequest">{platform_account} is processing your refund request</string>
     <string name="profile">Profile</string>

gradle.properties

@@ -13,13 +13,13 @@
 #Mon Jun 26 09:56:43 AEST 2023
 android.enableJetifier=false
 
-org.gradle.jvmargs=-Xmx3072m
+org.gradle.jvmargs=-Xmx4096m
 
 # Limit the worker threads to avoid consuming too much memory
 org.gradle.workers.max=4
 org.gradle.worker.heap.size=512m
 
-kotlin.daemon.jvmargs=-Xmx3072m
+kotlin.daemon.jvmargs=-Xmx4096m
 
 android.useAndroidX=true
 android.nonTransitiveRClass=false