Optimize config accessor

app/src/main/java/org/session/libsession/messaging/jobs/InviteContactsJob.kt

@@ -21,10 +21,12 @@ import org.session.libsession.messaging.utilities.MessageAuthentication.buildGro
 import org.session.libsession.snode.SnodeAPI
 import org.session.libsession.utilities.ConfigFactoryProtocol
 import org.session.libsession.utilities.getGroup
-import org.session.protos.SessionProtos.GroupUpdateInviteMessage
-import org.session.protos.SessionProtos.GroupUpdateMessage
+import org.session.libsession.utilities.withGroupConfigs
+import org.session.libsession.utilities.withMutableGroupConfigs
 import org.session.libsignal.utilities.AccountId
 import org.session.libsignal.utilities.Log
+import org.session.protos.SessionProtos.GroupUpdateInviteMessage
+import org.session.protos.SessionProtos.GroupUpdateMessage
 
 class InviteContactsJob @AssistedInject constructor(
     @Assisted val groupSessionId: String,

app/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt

@@ -22,6 +22,7 @@ import org.session.libsession.messaging.sending_receiving.MessageSender
 import org.session.libsession.messaging.utilities.Data
 import org.session.libsession.utilities.ConfigFactoryProtocol
 import org.session.libsession.utilities.ConfigUpdateNotification
+import org.session.libsession.utilities.withGroupConfigs
 import org.session.libsignal.utilities.AccountId
 import org.session.libsignal.utilities.HTTP
 import org.session.libsignal.utilities.Log

app/src/main/java/org/session/libsession/messaging/messages/Destination.kt

@@ -2,6 +2,7 @@ package org.session.libsession.messaging.messages
 
 import org.session.libsession.messaging.MessagingModuleConfiguration
 import org.session.libsession.utilities.Address
+import org.session.libsession.utilities.withUserConfigs
 
 sealed class Destination {
 

app/src/main/java/org/session/libsession/messaging/messages/ProfileUpdateHandler.kt

@@ -12,9 +12,10 @@ import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.Address.Companion.toAddress
 import org.session.libsession.utilities.ConfigFactoryProtocol
 import org.session.libsession.utilities.updateContact
-import org.session.protos.SessionProtos
+import org.session.libsession.utilities.withMutableUserConfigs
 import org.session.libsignal.utilities.AccountId
 import org.session.libsignal.utilities.Log
+import org.session.protos.SessionProtos
 import org.thoughtcrime.securesms.database.BlindMappingRepository
 import org.thoughtcrime.securesms.database.RecipientRepository
 import org.thoughtcrime.securesms.database.RecipientSettingsDatabase

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

@@ -22,6 +22,8 @@ import org.session.libsession.snode.SnodeClock
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.ConfigFactoryProtocol
 import org.session.libsession.utilities.TextSecurePreferences
+import org.session.libsession.utilities.withGroupConfigs
+import org.session.libsession.utilities.withUserConfigs
 import org.session.libsignal.exceptions.NonRetryableException
 import org.session.libsignal.utilities.AccountId
 import org.session.libsignal.utilities.Base64

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

@@ -1,7 +1,6 @@
 package org.session.libsession.messaging.sending_receiving
 
 import network.loki.messenger.libsession_util.protocol.DecodedPro
-import network.loki.messenger.libsession_util.util.BitSet
 import org.session.libsession.messaging.messages.Message
 import org.session.libsession.messaging.messages.ProfileUpdateHandler
 import org.session.libsession.messaging.messages.control.MessageRequestResponse
@@ -14,8 +13,10 @@ import org.session.libsession.utilities.ConfigFactoryProtocol
 import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsession.utilities.updateContact
 import org.session.libsession.utilities.upsertContact
-import org.session.protos.SessionProtos
+import org.session.libsession.utilities.withMutableUserConfigs
+import org.session.libsession.utilities.withUserConfigs
 import org.session.libsignal.utilities.Log
+import org.session.protos.SessionProtos
 import org.thoughtcrime.securesms.database.BlindMappingRepository
 import org.thoughtcrime.securesms.database.MmsDatabase
 import org.thoughtcrime.securesms.database.RecipientRepository

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

@@ -33,6 +33,9 @@ import org.session.libsession.snode.SnodeClock
 import org.session.libsession.snode.SnodeMessage
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.ConfigFactoryProtocol
+import org.session.libsession.utilities.withGroupConfigs
+import org.session.libsession.utilities.withMutableUserConfigs
+import org.session.libsession.utilities.withUserConfigs
 import org.session.libsignal.utilities.AccountId
 import org.session.libsignal.utilities.Base64
 import org.session.libsignal.utilities.Hex

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

@@ -40,6 +40,7 @@ import org.session.libsession.utilities.UserConfigType
 import org.session.libsession.utilities.recipients.MessageType
 import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsession.utilities.recipients.getType
+import org.session.libsession.utilities.withUserConfigs
 import org.session.libsignal.utilities.AccountId
 import org.session.libsignal.utilities.Log
 import org.session.protos.SessionProtos

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

@@ -27,9 +27,11 @@ import org.session.libsession.utilities.isGroupOrCommunity
 import org.session.libsession.utilities.recipients.RecipientData
 import org.session.libsession.utilities.updateContact
 import org.session.libsession.utilities.upsertContact
-import org.session.protos.SessionProtos
+import org.session.libsession.utilities.withMutableUserConfigs
+import org.session.libsession.utilities.withUserConfigs
 import org.session.libsignal.utilities.Log
 import org.session.libsignal.utilities.guava.Optional
+import org.session.protos.SessionProtos
 import org.thoughtcrime.securesms.database.Storage
 import org.thoughtcrime.securesms.database.model.MessageId
 import org.thoughtcrime.securesms.dependencies.ConfigFactory

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

@@ -20,7 +20,6 @@ import org.session.libsession.database.StorageProtocol
 import org.session.libsession.messaging.jobs.JobQueue
 import org.session.libsession.messaging.jobs.OpenGroupDeleteJob
 import org.session.libsession.messaging.jobs.TrimThreadJob
-import org.session.libsession.messaging.messages.Message.Companion.senderOrSync
 import org.session.libsession.messaging.open_groups.Endpoint
 import org.session.libsession.messaging.open_groups.OpenGroupApi
 import org.session.libsession.messaging.open_groups.OpenGroupApi.BatchRequest
@@ -33,9 +32,8 @@ import org.session.libsession.messaging.open_groups.OpenGroupApi.parallelBatch
 import org.session.libsession.messaging.sending_receiving.MessageParser
 import org.session.libsession.messaging.sending_receiving.ReceivedMessageProcessor
 import org.session.libsession.utilities.Address
-import org.session.libsession.utilities.Address.Companion.toAddress
 import org.session.libsession.utilities.ConfigFactoryProtocol
-import org.session.libsignal.utilities.Base64
+import org.session.libsession.utilities.withUserConfigs
 import org.session.libsignal.utilities.HTTP.Verb.GET
 import org.session.libsignal.utilities.JsonUtil
 import org.session.libsignal.utilities.Log

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

@@ -17,6 +17,7 @@ import kotlinx.coroutines.sync.Semaphore
 import org.session.libsession.utilities.ConfigFactoryProtocol
 import org.session.libsession.utilities.UserConfigType
 import org.session.libsession.utilities.userConfigsChanged
+import org.session.libsession.utilities.withUserConfigs
 import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.auth.LoginStateRepository
 import org.thoughtcrime.securesms.dependencies.ManagerScope

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

@@ -40,6 +40,7 @@ import org.session.libsession.utilities.ConfigFactoryProtocol
 import org.session.libsession.utilities.ConfigMessage
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsession.utilities.UserConfigType
+import org.session.libsession.utilities.withUserConfigs
 import org.session.libsignal.database.LokiAPIDatabaseProtocol
 import org.session.libsignal.utilities.Log
 import org.session.libsignal.utilities.Snode

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

@@ -34,11 +34,56 @@ import java.time.Instant
 interface ConfigFactoryProtocol {
     val configUpdateNotifications: Flow<ConfigUpdateNotification>
 
-    fun <T> withUserConfigs(cb: (UserConfigs) -> T): T
-    fun <T> withMutableUserConfigs(cb: (MutableUserConfigs) -> T): T
-    fun mergeUserConfigs(userConfigType: UserConfigType, messages: List<ConfigMessage>)
+    /**
+     * Dangerously access the user configs. You must call the returned release function
+     * to release the lock after you are done with the configs.
+     *
+     * **Warning:** Improper use of this function may lead to deadlocks or data corruption.
+     * It's better to use [withUserConfigs] instead.
+     *
+     * @return A pair of the user configs and a release function.
+     */
+    fun dangerouslyAccessUserConfigs(): Pair<UserConfigs, () -> Unit>
+
+    /**
+     * Dangerously access the mutable user configs. You must call the returned release function
+     * to release the lock after you are done with the configs. The release function must be called
+     * as soon as possible and must be called in the same thread as this function.
+     *
+     * **Warning:** Improper use of this function may lead to deadlocks or data corruption.
+     * It's better to use [withMutableUserConfigs] instead.
+     *
+     * @return A pair of the mutable user configs and a release function.
+     */
+    fun dangerouslyAccessMutableUserConfigs(): Pair<MutableUserConfigs, () -> Unit>
+
+    /**
+     * Dangerously access the group configs for the given group ID. You must call the returned
+     * release function to release the lock after you are done with the configs. The release
+     * function must be called as soon as possible and must be called in the same thread as
+     * this function.
+     *
+     * **Warning:** Improper use of this function may lead to deadlocks or data corruption.
+     * It's better to use [withGroupConfigs] instead.
+     *
+     * @return A pair of the group configs and a release function.
+     */
+    fun dangerouslyAccessGroupConfigs(groupId: AccountId): Pair<GroupConfigs, () -> Unit>
+
+    /**
+     * Dangerously access the mutable group configs for the given group ID. You must call the
+     * returned release function to release the lock after you are done with the configs. The
+     * release function must be called as soon as possible and must be called in the same thread
+     * as this function.
+     *
+     * **Warning:** Improper use of this function may lead to deadlocks or data corruption.
+     * It's better to use [withMutableGroupConfigs] instead.
+     *
+     * @return A pair of the mutable group configs and a release function.
+     */
+    fun dangerouslyAccessMutableGroupConfigs(groupId: AccountId): Pair<MutableGroupConfigs, () -> Unit>
 
-    fun <T> withGroupConfigs(groupId: AccountId, cb: (GroupConfigs) -> T): T
+    fun mergeUserConfigs(userConfigType: UserConfigType, messages: List<ConfigMessage>)
 
     /**
      * Create a new group config instance. Note this does not save the group configs to the database.
@@ -54,11 +99,6 @@ interface ConfigFactoryProtocol {
      */
     fun saveGroupConfigs(groupId: AccountId, groupConfigs: MutableGroupConfigs)
 
-    /**
-     * @param recreateConfigInstances If true, the group configs will be recreated before calling the callback. This is useful when you have received an admin key or otherwise.
-     */
-    fun <T> withMutableGroupConfigs(groupId: AccountId, cb: (MutableGroupConfigs) -> T): T
-
     fun canPerformChange(variant: String, publicKey: String, changeTimestampMs: Long): Boolean
 
     fun getConfigTimestamp(userConfigType: UserConfigType, publicKey: String): Long
@@ -114,6 +154,42 @@ enum class UserConfigType(val namespace: Int) {
     USER_GROUPS(Namespace.USER_GROUPS()),
 }
 
+inline fun <T> ConfigFactoryProtocol.withUserConfigs(cb: (UserConfigs) -> T): T {
+    val (configs, release) = dangerouslyAccessUserConfigs()
+    return try {
+        cb(configs)
+    } finally {
+        release()
+    }
+}
+
+inline fun <T> ConfigFactoryProtocol.withMutableUserConfigs(cb: (MutableUserConfigs) -> T): T {
+    val (configs, release) = dangerouslyAccessMutableUserConfigs()
+    return try {
+        cb(configs)
+    } finally {
+        release()
+    }
+}
+
+inline fun <T> ConfigFactoryProtocol.withGroupConfigs(groupId: AccountId, cb: (GroupConfigs) -> T): T {
+    val (configs, release) = dangerouslyAccessGroupConfigs(groupId)
+    return try {
+        cb(configs)
+    } finally {
+        release()
+    }
+}
+
+inline fun <T> ConfigFactoryProtocol.withMutableGroupConfigs(groupId: AccountId, cb: (MutableGroupConfigs) -> T): T {
+    val (configs, release) = dangerouslyAccessMutableGroupConfigs(groupId)
+    return try {
+        cb(configs)
+    } finally {
+        release()
+    }
+}
+
 val ConfigFactoryProtocol.currentUserName: String get() = withUserConfigs { it.userProfile.getName().orEmpty() }
 val ConfigFactoryProtocol.currentUserProfile: UserPic? get() = withUserConfigs { configs ->
     configs.userProfile.getPic().takeIf { it.url.isNotBlank() }

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

@@ -17,6 +17,8 @@ import org.session.libsession.utilities.Address.Companion.toAddress
 import org.session.libsession.utilities.ConfigFactoryProtocol
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsession.utilities.recipients.RemoteFile
+import org.session.libsession.utilities.withGroupConfigs
+import org.session.libsession.utilities.withUserConfigs
 import org.session.libsignal.exceptions.NonRetryableException
 import org.session.libsignal.utilities.AccountId
 import org.session.libsignal.utilities.ByteArraySlice

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

@@ -26,6 +26,7 @@ import org.session.libsession.snode.OnionRequestAPI
 import org.session.libsession.utilities.ConfigFactoryProtocol
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsession.utilities.recipients.RemoteFile.Companion.toRemoteFile
+import org.session.libsession.utilities.withUserConfigs
 import org.session.libsignal.exceptions.NonRetryableException
 import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.debugmenu.DebugLogGroup

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

@@ -15,6 +15,7 @@ import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsession.utilities.Util
 import org.session.libsession.utilities.recipients.RemoteFile
 import org.session.libsession.utilities.recipients.RemoteFile.Companion.toRemoteFile
+import org.session.libsession.utilities.withMutableUserConfigs
 import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.auth.AuthAwareComponent
 import org.thoughtcrime.securesms.auth.LoggedInState

app/src/main/java/org/thoughtcrime/securesms/configs/ConfigToDatabaseSync.kt

@@ -26,19 +26,20 @@ import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.Address.Companion.fromSerialized
 import org.session.libsession.utilities.Address.Companion.toAddress
 import org.session.libsession.utilities.ConfigFactoryProtocol
-import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsession.utilities.UserConfigType
 import org.session.libsession.utilities.allConfigAddresses
 import org.session.libsession.utilities.getGroup
 import org.session.libsession.utilities.userConfigsChanged
+import org.session.libsession.utilities.withGroupConfigs
+import org.session.libsession.utilities.withMutableUserConfigs
+import org.session.libsession.utilities.withUserConfigs
 import org.session.libsignal.crypto.ecc.DjbECPrivateKey
 import org.session.libsignal.crypto.ecc.DjbECPublicKey
 import org.session.libsignal.crypto.ecc.ECKeyPair
 import org.session.libsignal.utilities.AccountId
 import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.auth.AuthAwareComponent
 import org.thoughtcrime.securesms.auth.LoggedInState
-import org.thoughtcrime.securesms.auth.LoginStateRepository
 import org.thoughtcrime.securesms.database.CommunityDatabase
 import org.thoughtcrime.securesms.database.DraftDatabase
 import org.thoughtcrime.securesms.database.GroupDatabase
@@ -53,7 +54,6 @@ import org.thoughtcrime.securesms.database.SmsDatabase
 import org.thoughtcrime.securesms.database.ThreadDatabase
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
 import org.thoughtcrime.securesms.dependencies.ManagerScope
-import org.thoughtcrime.securesms.dependencies.OnAppStartupComponent
 import org.thoughtcrime.securesms.repository.ConversationRepository
 import org.thoughtcrime.securesms.util.SessionMetaProtocol
 import org.thoughtcrime.securesms.util.castAwayType

app/src/main/java/org/thoughtcrime/securesms/configs/ConfigUploader.kt

@@ -35,6 +35,9 @@ import org.session.libsession.utilities.MutableGroupConfigs
 import org.session.libsession.utilities.UserConfigType
 import org.session.libsession.utilities.getGroup
 import org.session.libsession.utilities.userConfigsChanged
+import org.session.libsession.utilities.withMutableGroupConfigs
+import org.session.libsession.utilities.withMutableUserConfigs
+import org.session.libsession.utilities.withUserConfigs
 import org.session.libsignal.utilities.AccountId
 import org.session.libsignal.utilities.Base64
 import org.session.libsignal.utilities.Log

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

@@ -114,6 +114,7 @@ import org.session.libsession.utilities.getColorFromAttr
 import org.session.libsession.utilities.isBlinded
 import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsession.utilities.recipients.displayName
+import org.session.libsession.utilities.withUserConfigs
 import org.session.libsignal.crypto.MnemonicCodec
 import org.session.libsignal.utilities.ListenableFuture
 import org.session.libsignal.utilities.Log

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

@@ -77,6 +77,8 @@ import org.session.libsession.utilities.recipients.repeatedWithEffectiveNotifyTy
 import org.session.libsession.utilities.toGroupString
 import org.session.libsession.utilities.upsertContact
 import org.session.libsession.utilities.userConfigsChanged
+import org.session.libsession.utilities.withMutableUserConfigs
+import org.session.libsession.utilities.withUserConfigs
 import org.session.libsignal.utilities.AccountId
 import org.session.libsignal.utilities.Hex
 import org.session.libsignal.utilities.IdPrefix

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

@@ -46,6 +46,8 @@ import org.session.libsession.utilities.recipients.RecipientData
 import org.session.libsession.utilities.recipients.displayName
 import org.session.libsession.utilities.updateContact
 import org.session.libsession.utilities.upsertContact
+import org.session.libsession.utilities.withMutableUserConfigs
+import org.session.libsession.utilities.withUserConfigs
 import org.session.libsignal.utilities.AccountId
 import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2

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

@@ -11,9 +11,9 @@ import kotlinx.coroutines.flow.stateIn
 import network.loki.messenger.libsession_util.util.BaseCommunityInfo
 import network.loki.messenger.libsession_util.util.BlindKeyAPI
 import org.session.libsession.utilities.Address
-import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsession.utilities.UserConfigType
 import org.session.libsession.utilities.userConfigsChanged
+import org.session.libsession.utilities.withUserConfigs
 import org.session.libsignal.utilities.AccountId
 import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.auth.LoginStateRepository

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

@@ -48,6 +48,8 @@ import org.session.libsession.utilities.recipients.RemoteFile.Companion.toRemote
 import org.session.libsession.utilities.toBlinded
 import org.session.libsession.utilities.toGroupString
 import org.session.libsession.utilities.userConfigsChanged
+import org.session.libsession.utilities.withGroupConfigs
+import org.session.libsession.utilities.withUserConfigs
 import org.session.libsignal.utilities.AccountId
 import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.auth.LoginStateRepository

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

@@ -57,6 +57,10 @@ import org.session.libsession.utilities.isCommunityInbox
 import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsession.utilities.recipients.RecipientData
 import org.session.libsession.utilities.upsertContact
+import org.session.libsession.utilities.withGroupConfigs
+import org.session.libsession.utilities.withMutableGroupConfigs
+import org.session.libsession.utilities.withMutableUserConfigs
+import org.session.libsession.utilities.withUserConfigs
 import org.session.libsignal.crypto.ecc.DjbECPublicKey
 import org.session.libsignal.crypto.ecc.ECKeyPair
 import org.session.libsignal.messages.SignalServiceAttachmentPointer