Merge 1.28.2 into dev

app/build.gradle.kts

@@ -26,8 +26,8 @@ configurations.configureEach {
     exclude(module = "commons-logging")
 }
 
-val canonicalVersionCode = 426
-val canonicalVersionName = "1.28.1"
+val canonicalVersionCode = 427
+val canonicalVersionName = "1.28.2"
 
 val postFixSize = 10
 val abiPostFix = mapOf(
@@ -402,6 +402,7 @@ dependencies {
     implementation(libs.phrase)
     implementation(libs.copper.flow)
     implementation(libs.kotlinx.coroutines.android)
+    implementation(libs.kotlinx.coroutines.guava)
     implementation(libs.kovenant)
     implementation(libs.kovenant.android)
     implementation(libs.opencsv)

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

@@ -39,9 +39,8 @@ interface MessageDataProvider {
     fun isDeletedMessage(id: MessageId): Boolean
     fun handleSuccessfulAttachmentUpload(attachmentId: Long, attachmentStream: SignalServiceAttachmentStream, attachmentKey: ByteArray, uploadResult: UploadResult)
     fun handleFailedAttachmentUpload(attachmentId: Long)
-    fun getMessageForQuote(timestamp: Long, author: Address): Triple<Long, Boolean, String>?
+    fun getMessageForQuote(threadId: Long, timestamp: Long, author: Address): Triple<Long, Boolean, String>?
     fun getAttachmentsAndLinkPreviewFor(mmsId: Long): List<Attachment>
-    fun getMessageBodyFor(timestamp: Long, author: String): String
     fun getAttachmentIDsFor(mmsMessageId: Long): List<Long>
     fun getLinkPreviewAttachmentIDFor(mmsMessageId: Long): Long?
 }

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

@@ -92,7 +92,7 @@ interface StorageProtocol {
     fun addReceivedMessageTimestamp(timestamp: Long)
     fun removeReceivedMessageTimestamps(timestamps: Set<Long>)
     fun getAttachmentsForMessage(mmsMessageId: Long): List<DatabaseAttachment>
-    fun getMessageBy(timestamp: Long, author: String): MessageRecord?
+    fun getMessageBy(threadId: Long, timestamp: Long, author: String): MessageRecord?
     fun updateSentTimestamp(messageId: MessageId, newTimestamp: Long)
     fun markAsResyncing(messageId: MessageId)
     fun markAsSyncing(messageId: MessageId)

app/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt

@@ -71,7 +71,6 @@ import org.thoughtcrime.securesms.database.model.MessageId
 import org.thoughtcrime.securesms.database.model.ReactionRecord
 import org.thoughtcrime.securesms.dependencies.ManagerScope
 import org.thoughtcrime.securesms.pro.ProStatusManager
-import org.thoughtcrime.securesms.repository.ConversationRepository
 import org.thoughtcrime.securesms.sskenvironment.ReadReceiptManager
 import java.security.SignatureException
 import javax.inject.Inject
@@ -244,7 +243,8 @@ class ReceivedMessageHandler @Inject constructor(
 
         val timestamp = message.timestamp ?: return null
         val author = message.author ?: return null
-        val messageToDelete = storage.getMessageBy(timestamp, author) ?: return null
+        val threadId = message.threadID ?: return null
+        val messageToDelete = storage.getMessageBy(threadId, timestamp, author) ?: return null
         val messageIdToDelete = messageToDelete.messageId
         val messageType = messageToDelete.individualRecipient?.getType()
 
@@ -326,7 +326,7 @@ class ReceivedMessageHandler @Inject constructor(
                 Address.fromSerialized(quote.author)
             }
 
-            val messageInfo = messageDataProvider.getMessageForQuote(quote.id, author)
+            val messageInfo = messageDataProvider.getMessageForQuote(context.threadId, quote.id, author)
             quoteMessageBody = messageInfo?.third
             quoteModel = if (messageInfo != null) {
                 val attachments = if (messageInfo.second) messageDataProvider.getAttachmentsAndLinkPreviewFor(messageInfo.first) else ArrayList()

app/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt

@@ -60,6 +60,8 @@ object OnionRequestAPI {
         .map { it.isNotEmpty() }
         .stateIn(GlobalScope, SharingStarted.Eagerly, paths.value.isNotEmpty())
 
+    private val NON_PENALIZING_STATUSES = setOf(403, 404, 406, 425)
+
     init {
         // Listen for the changes in paths and persist it to the db
         GlobalScope.launch {
@@ -410,12 +412,20 @@ object OnionRequestAPI {
                     } else {
                         handleUnspecificError()
                     }
-                } else if (destination is Destination.Server && exception.statusCode == 400) {
-                    Log.d("Loki","Destination server returned code ${exception.statusCode} with message: $message")
+                } else if(exception.statusCode in NON_PENALIZING_STATUSES){
+                    // error codes that shouldn't penalize our path or drop snodes
+                    // 404 is probably file server missing a file, don't rebuild path or mark a snode as bad here
+                    Log.d("Loki","Request returned a non penalizing code ${exception.statusCode} with message: $message")
+                }
+                // we do not want to penalize the path/nodes when:
+                // - the exit node reached the server but the destination returned 5xx or 400
+                // - the exit node couldn't reach its destination with a 5xx or 400, but the destination was a community (which we can know from the server's name being in the error message)
+                else if (destination is Destination.Server &&
+                    (exception.statusCode in 500..504 || exception.statusCode == 400) &&
+                    (exception is HTTPRequestFailedAtDestinationException || exception.body?.contains(destination.host) == true)) {
+                    Log.d("Loki","Destination server error - Non path penalizing. Request returned code ${exception.statusCode} with message: $message")
                 } else if (message == "Loki Server error") {
                     Log.d("Loki", "message was $message")
-                } else if (exception.statusCode == 404) {
-                    // 404 is probably file server missing a file, don't rebuild path or mark a snode as bad here
                 } else { // Only drop snode/path if not receiving above two exception cases
                     handleUnspecificError()
                 }

app/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt

@@ -938,12 +938,6 @@ interface TextSecurePreferences {
             setBooleanPreference(context, FINGERPRINT_KEY_GENERATED, true)
         }
 
-        @JvmStatic
-        fun clearAll(context: Context) {
-            getDefaultSharedPreferences(context).edit().clear().commit()
-        }
-
-
         // ----- Get / set methods for if we have already warned the user that saving attachments will allow other apps to access them -----
         // Note: We only ever show the warning dialog about this ONCE - when the user accepts this fact we write true to the flag & never show again.
         @JvmStatic
@@ -1680,8 +1674,16 @@ class AppTextSecurePreferences @Inject constructor(
         return getBooleanPreference(AUTOPLAY_AUDIO_MESSAGES, false)
     }
 
+    /**
+     * Clear all prefs and reset our observables
+     */
     override fun clearAll() {
-        getDefaultSharedPreferences(context).edit().clear().commit()
+        pushEnabled.update { false }
+        localNumberState.update { null }
+        postProLaunchState.update { false }
+        hiddenPasswordState.update { false }
+
+        getDefaultSharedPreferences(context).edit(commit = true) { clear() }
     }
 
     override fun getHidePassword() = getBooleanPreference(HIDE_PASSWORD, false)

app/src/main/java/org/session/libsignal/utilities/HTTP.kt

@@ -73,7 +73,8 @@ object HTTP {
 
     open class HTTPRequestFailedException(
         val statusCode: Int,
-        val json: Map<*, *>?,
+        val json: Map<*, *>? = null,
+        val body: String? = null,
         message: String = "HTTP request failed with status code $statusCode"
     ) : kotlin.Exception(message)
     class HTTPNoNetworkException : HTTPRequestFailedException(0, null, "No network connection")
@@ -131,10 +132,10 @@ object HTTP {
                 else -> defaultConnection
             }.newCall(request.build()).await().use { response ->
                 when (val statusCode = response.code) {
-                    200 -> response.body!!.bytes()
+                    in 200..299 -> response.body.bytes()
                     else -> {
                         Log.d("Loki", "${verb.rawValue} request to $url failed with status code: $statusCode.")
-                        throw HTTPRequestFailedException(statusCode, null)
+                        throw HTTPRequestFailedException(statusCode, body = response.body.string())
                     }
                 }
             }
@@ -143,8 +144,16 @@ object HTTP {
 
             if (!isConnectedToNetwork()) { throw HTTPNoNetworkException() }
 
-            // Override the actual error so that we can correctly catch failed requests in OnionRequestAPI
-            throw HTTPRequestFailedException(0, null, "HTTP request failed due to: ${exception.message}")
+            if (exception !is HTTPRequestFailedException) {
+
+                // Override the actual error so that we can correctly catch failed requests in OnionRequestAPI
+                throw HTTPRequestFailedException(
+                    statusCode = 0,
+                    message = "HTTP request failed due to: ${exception.message}"
+                )
+            } else {
+                throw exception
+            }
         }
     }
 

app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.kt

@@ -143,7 +143,6 @@ class MediaPreviewActivity : ScreenLockActionBarActivity(),
     private var albumRailAdapter: MediaRailAdapter? = null
 
     private var windowInsetBottom = 0
-    private var railHeight = 0
 
     @OptIn(ExperimentalCoroutinesApi::class)
     override fun onCreate(bundle: Bundle?, ready: Boolean) {
@@ -172,7 +171,7 @@ class MediaPreviewActivity : ScreenLockActionBarActivity(),
             windowInsetBottom = insets.bottom
 
             binding.toolbar.updatePadding(top = insets.top)
-            binding.mediaPreviewAlbumRailContainer.updatePadding(bottom = max(insets.bottom, binding.mediaPreviewAlbumRailContainer.paddingBottom))
+            binding.mediaPreviewAlbumRailContainer.updatePadding(bottom = insets.bottom)
 
             updateControlsPosition()
 
@@ -213,12 +212,9 @@ class MediaPreviewActivity : ScreenLockActionBarActivity(),
      * Updates the media controls' position based on the rail's position
      */
     private fun updateControlsPosition() {
-        // the ypos of the controls is either the window bottom inset, or the rail height if there is a rail
-        // since the rail height takes the window inset into account with its padding
-        val totalBottomPadding = max(
-            windowInsetBottom,
-            railHeight + resources.getDimensionPixelSize(R.dimen.medium_spacing)
-        )
+        val totalBottomPadding = windowInsetBottom +
+                binding.mediaPreviewAlbumRail.height+
+                resources.getDimensionPixelSize(R.dimen.medium_spacing)
 
         adapter?.setControlsYPosition(totalBottomPadding)
     }
@@ -431,7 +427,7 @@ class MediaPreviewActivity : ScreenLockActionBarActivity(),
                                 binding.mediaPreviewAlbumRailContainer.viewTreeObserver.removeOnGlobalLayoutListener(
                                     this
                                 )
-                                railHeight = binding.mediaPreviewAlbumRailContainer.height
+
                                 updateControlsPosition()
                             }
                         }

app/src/main/java/org/thoughtcrime/securesms/ShareScreen.kt

@@ -31,6 +31,7 @@ import org.thoughtcrime.securesms.groups.compose.MemberItem
 import org.thoughtcrime.securesms.ui.SearchBar
 import org.thoughtcrime.securesms.ui.components.BackAppBar
 import org.thoughtcrime.securesms.ui.components.CircularProgressIndicator
+import org.thoughtcrime.securesms.ui.components.SmallCircularProgressIndicator
 import org.thoughtcrime.securesms.ui.qaTag
 import org.thoughtcrime.securesms.ui.theme.LocalColors
 import org.thoughtcrime.securesms.ui.theme.LocalDimensions
@@ -66,7 +67,7 @@ fun ShareScreen(
 fun ShareList(
     state: ShareViewModel.UIState,
     contacts: List<ConversationItem>,
-    hasConversations: Boolean,
+    hasConversations: Boolean?,
     onContactItemClicked: (address: Address) -> Unit,
     searchQuery: String,
     onSearchQueryChanged: (String) -> Unit,
@@ -116,29 +117,41 @@ fun ShareList(
 
                     Spacer(modifier = Modifier.height(LocalDimensions.current.smallSpacing))
 
-                    if (!hasConversations) {
-                        Text(
-                            text = stringResource(id = R.string.conversationsNone),
-                            modifier = Modifier.padding(top = LocalDimensions.current.spacing)
-                                .align(Alignment.CenterHorizontally),
-                            style = LocalType.current.base.copy(color = LocalColors.current.textSecondary)
-                        )
-                    } else {
-                        LazyColumn(
-                            state = scrollState,
-                            contentPadding = PaddingValues(bottom = paddings.calculateBottomPadding()),
-                        ) {
-
-                            items(contacts) { contacts ->
-                                // Each member's view
-                                MemberItem(
-                                    address = contacts.address,
-                                    onClick = onContactItemClicked,
-                                    title = contacts.name,
-                                    showProBadge = contacts.showProBadge,
-                                    showAsAdmin = false,
-                                    avatarUIData = contacts.avatarUIData
-                                )
+                    when(hasConversations){
+                        // null means we don't yet have a result, so show a loader
+                        null -> {
+                            SmallCircularProgressIndicator(
+                                modifier = Modifier.padding(top = LocalDimensions.current.spacing)
+                                    .align(Alignment.CenterHorizontally),
+                            )
+                        }
+
+                        false -> {
+                            Text(
+                                text = stringResource(id = R.string.conversationsNone),
+                                modifier = Modifier.padding(top = LocalDimensions.current.spacing)
+                                    .align(Alignment.CenterHorizontally),
+                                style = LocalType.current.base.copy(color = LocalColors.current.textSecondary)
+                            )
+                        }
+
+                        true -> {
+                            LazyColumn(
+                                state = scrollState,
+                                contentPadding = PaddingValues(bottom = paddings.calculateBottomPadding()),
+                            ) {
+
+                                items(contacts) { contacts ->
+                                    // Each member's view
+                                    MemberItem(
+                                        address = contacts.address,
+                                        onClick = onContactItemClicked,
+                                        title = contacts.name,
+                                        showProBadge = contacts.showProBadge,
+                                        showAsAdmin = false,
+                                        avatarUIData = contacts.avatarUIData
+                                    )
+                                }
                             }
                         }
                     }
@@ -201,6 +214,25 @@ private fun PreviewSelectEmptyContacts() {
     }
 }
 
+@Preview
+@Composable
+private fun PreviewSelectFetchingContacts() {
+    val contacts = emptyList<ConversationItem>()
+
+    PreviewTheme {
+        ShareList(
+            state = ShareViewModel.UIState(false),
+            contacts = contacts,
+            hasConversations = null,
+            onContactItemClicked = {},
+            searchQuery = "",
+            onSearchQueryChanged = {},
+            onSearchQueryClear = {},
+            onBack = {},
+        )
+    }
+}
+
 @Preview
 @Composable
 private fun PreviewSelectEmptyContactsWithSearch() {

app/src/main/java/org/thoughtcrime/securesms/ShareViewModel.kt

@@ -71,10 +71,10 @@ class ShareViewModel @Inject constructor(
          ::filterContacts
     ).stateIn(viewModelScope, SharingStarted.Lazily, emptyList())
 
-    val hasAnyConversations: StateFlow<Boolean> =
+    val hasAnyConversations: StateFlow<Boolean?> =
         conversationRepository.observeConversationList()
             .map { it.isNotEmpty() }
-            .stateIn(viewModelScope, SharingStarted.Eagerly, false)
+            .stateIn(viewModelScope, SharingStarted.Eagerly, null)
 
     private val _uiEvents = MutableSharedFlow<ShareUIEvent>(extraBufferCapacity = 1)
     val uiEvents: SharedFlow<ShareUIEvent> get() = _uiEvents

app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt

@@ -74,21 +74,16 @@ class DatabaseAttachmentProvider(context: Context, helper: Provider<SQLCipherOpe
         attachmentDatabase.setTransferState(attachmentId, attachmentState.value)
     }
 
-    override fun getMessageForQuote(timestamp: Long, author: Address): Triple<Long, Boolean, String>? {
+    override fun getMessageForQuote(threadId: Long, timestamp: Long, author: Address): Triple<Long, Boolean, String>? {
         val messagingDatabase = DatabaseComponent.get(context).mmsSmsDatabase()
-        val message = messagingDatabase.getMessageFor(timestamp, author)
+        val message = messagingDatabase.getMessageFor(threadId, timestamp, author)
         return if (message != null) Triple(message.id, message.isMms, message.body) else null
     }
 
     override fun getAttachmentsAndLinkPreviewFor(mmsId: Long): List<Attachment> {
         return DatabaseComponent.get(context).attachmentDatabase().getAttachmentsForMessage(mmsId)
     }
 
-    override fun getMessageBodyFor(timestamp: Long, author: String): String {
-        val messagingDatabase = DatabaseComponent.get(context).mmsSmsDatabase()
-        return messagingDatabase.getMessageFor(timestamp, author)!!.body
-    }
-
     override fun getAttachmentIDsFor(mmsMessageId: Long): List<Long> {
         return DatabaseComponent.get(context)
             .attachmentDatabase()

app/src/main/java/org/thoughtcrime/securesms/attachments/RemoteFileDownloadWorker.kt

@@ -288,10 +288,6 @@ class RemoteFileDownloadWorker @AssistedInject constructor(
             return File(downloadsDirectory(context), remote.sha256Hash())
         }
 
-        fun cancelAll(context: Context) {
-            WorkManager.getInstance(context).cancelAllWorkByTag(TAG)
-        }
-
         private fun uniqueWorkName(remote: RemoteFile): String {
             return "download-remote-file-${remote.sha256Hash()}"
         }