Skip to content

Commit 2916e49

Browse files
SessionHero01SessionHero01
authored
Optimize config accessor (#1785)
1 parent 1a4a122 commit 2916e49

File tree

57 files changed

+258
-73
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+258
-73
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@ import org.session.libsession.messaging.utilities.MessageAuthentication.buildGro
2121
import org.session.libsession.snode.SnodeAPI
2222
import org.session.libsession.utilities.ConfigFactoryProtocol
2323
import org.session.libsession.utilities.getGroup
24-
import org.session.protos.SessionProtos.GroupUpdateInviteMessage
25-
import org.session.protos.SessionProtos.GroupUpdateMessage
24+
import org.session.libsession.utilities.withGroupConfigs
25+
import org.session.libsession.utilities.withMutableGroupConfigs
2626
import org.session.libsignal.utilities.AccountId
2727
import org.session.libsignal.utilities.Log
28+
import org.session.protos.SessionProtos.GroupUpdateInviteMessage
29+
import org.session.protos.SessionProtos.GroupUpdateMessage
2830

2931
class InviteContactsJob @AssistedInject constructor(
3032
@Assisted val groupSessionId: String,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import org.session.libsession.messaging.sending_receiving.MessageSender
2222
import org.session.libsession.messaging.utilities.Data
2323
import org.session.libsession.utilities.ConfigFactoryProtocol
2424
import org.session.libsession.utilities.ConfigUpdateNotification
25+
import org.session.libsession.utilities.withGroupConfigs
2526
import org.session.libsignal.utilities.AccountId
2627
import org.session.libsignal.utilities.HTTP
2728
import org.session.libsignal.utilities.Log

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package org.session.libsession.messaging.messages
22

33
import org.session.libsession.messaging.MessagingModuleConfiguration
44
import org.session.libsession.utilities.Address
5+
import org.session.libsession.utilities.withUserConfigs
56

67
sealed class Destination {
78

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ import org.session.libsession.utilities.Address
1212
import org.session.libsession.utilities.Address.Companion.toAddress
1313
import org.session.libsession.utilities.ConfigFactoryProtocol
1414
import org.session.libsession.utilities.updateContact
15-
import org.session.protos.SessionProtos
15+
import org.session.libsession.utilities.withMutableUserConfigs
1616
import org.session.libsignal.utilities.AccountId
1717
import org.session.libsignal.utilities.Log
18+
import org.session.protos.SessionProtos
1819
import org.thoughtcrime.securesms.database.BlindMappingRepository
1920
import org.thoughtcrime.securesms.database.RecipientRepository
2021
import org.thoughtcrime.securesms.database.RecipientSettingsDatabase

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ import org.session.libsession.snode.SnodeClock
2222
import org.session.libsession.utilities.Address
2323
import org.session.libsession.utilities.ConfigFactoryProtocol
2424
import org.session.libsession.utilities.TextSecurePreferences
25+
import org.session.libsession.utilities.withGroupConfigs
26+
import org.session.libsession.utilities.withUserConfigs
2527
import org.session.libsignal.exceptions.NonRetryableException
2628
import org.session.libsignal.utilities.AccountId
2729
import org.session.libsignal.utilities.Base64

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.session.libsession.messaging.sending_receiving
22

33
import network.loki.messenger.libsession_util.protocol.DecodedPro
4-
import network.loki.messenger.libsession_util.util.BitSet
54
import org.session.libsession.messaging.messages.Message
65
import org.session.libsession.messaging.messages.ProfileUpdateHandler
76
import org.session.libsession.messaging.messages.control.MessageRequestResponse
@@ -14,8 +13,10 @@ import org.session.libsession.utilities.ConfigFactoryProtocol
1413
import org.session.libsession.utilities.recipients.Recipient
1514
import org.session.libsession.utilities.updateContact
1615
import org.session.libsession.utilities.upsertContact
17-
import org.session.protos.SessionProtos
16+
import org.session.libsession.utilities.withMutableUserConfigs
17+
import org.session.libsession.utilities.withUserConfigs
1818
import org.session.libsignal.utilities.Log
19+
import org.session.protos.SessionProtos
1920
import org.thoughtcrime.securesms.database.BlindMappingRepository
2021
import org.thoughtcrime.securesms.database.MmsDatabase
2122
import org.thoughtcrime.securesms.database.RecipientRepository

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ import org.session.libsession.snode.SnodeClock
3333
import org.session.libsession.snode.SnodeMessage
3434
import org.session.libsession.utilities.Address
3535
import org.session.libsession.utilities.ConfigFactoryProtocol
36+
import org.session.libsession.utilities.withGroupConfigs
37+
import org.session.libsession.utilities.withMutableUserConfigs
38+
import org.session.libsession.utilities.withUserConfigs
3639
import org.session.libsignal.utilities.AccountId
3740
import org.session.libsignal.utilities.Base64
3841
import org.session.libsignal.utilities.Hex

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import org.session.libsession.utilities.UserConfigType
4040
import org.session.libsession.utilities.recipients.MessageType
4141
import org.session.libsession.utilities.recipients.Recipient
4242
import org.session.libsession.utilities.recipients.getType
43+
import org.session.libsession.utilities.withUserConfigs
4344
import org.session.libsignal.utilities.AccountId
4445
import org.session.libsignal.utilities.Log
4546
import org.session.protos.SessionProtos

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ import org.session.libsession.utilities.isGroupOrCommunity
2727
import org.session.libsession.utilities.recipients.RecipientData
2828
import org.session.libsession.utilities.updateContact
2929
import org.session.libsession.utilities.upsertContact
30-
import org.session.protos.SessionProtos
30+
import org.session.libsession.utilities.withMutableUserConfigs
31+
import org.session.libsession.utilities.withUserConfigs
3132
import org.session.libsignal.utilities.Log
3233
import org.session.libsignal.utilities.guava.Optional
34+
import org.session.protos.SessionProtos
3335
import org.thoughtcrime.securesms.database.Storage
3436
import org.thoughtcrime.securesms.database.model.MessageId
3537
import org.thoughtcrime.securesms.dependencies.ConfigFactory

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import org.session.libsession.database.StorageProtocol
2020
import org.session.libsession.messaging.jobs.JobQueue
2121
import org.session.libsession.messaging.jobs.OpenGroupDeleteJob
2222
import org.session.libsession.messaging.jobs.TrimThreadJob
23-
import org.session.libsession.messaging.messages.Message.Companion.senderOrSync
2423
import org.session.libsession.messaging.open_groups.Endpoint
2524
import org.session.libsession.messaging.open_groups.OpenGroupApi
2625
import org.session.libsession.messaging.open_groups.OpenGroupApi.BatchRequest
@@ -33,9 +32,8 @@ import org.session.libsession.messaging.open_groups.OpenGroupApi.parallelBatch
3332
import org.session.libsession.messaging.sending_receiving.MessageParser
3433
import org.session.libsession.messaging.sending_receiving.ReceivedMessageProcessor
3534
import org.session.libsession.utilities.Address
36-
import org.session.libsession.utilities.Address.Companion.toAddress
3735
import org.session.libsession.utilities.ConfigFactoryProtocol
38-
import org.session.libsignal.utilities.Base64
36+
import org.session.libsession.utilities.withUserConfigs
3937
import org.session.libsignal.utilities.HTTP.Verb.GET
4038
import org.session.libsignal.utilities.JsonUtil
4139
import org.session.libsignal.utilities.Log

0 commit comments

Comments
 (0)