TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-22 16:07:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve param naming for isPushEnabled

Browse Source
This commit is contained in:
andrew 2023-08-17 22:36:05 +09:30
parent 296c5d743f
commit 7861eb25c2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/PushRegistryV1.kt
View File

@ -28,12 +28,12 @@ object PushRegistryV1 {
fun register( fun register(
device: Device, device: Device,
isUsingFCM: Boolean = TextSecurePreferences.isPushEnabled(context), isPushEnabled: Boolean = TextSecurePreferences.isPushEnabled(context),
token: String? = TextSecurePreferences.getPushToken(context), token: String? = TextSecurePreferences.getPushToken(context),
publicKey: String? = TextSecurePreferences.getLocalNumber(context), publicKey: String? = TextSecurePreferences.getLocalNumber(context),
legacyGroupPublicKeys: Collection<String> = MessagingModuleConfiguration.shared.storage.getAllClosedGroupPublicKeys() legacyGroupPublicKeys: Collection<String> = MessagingModuleConfiguration.shared.storage.getAllClosedGroupPublicKeys()
): Promise<*, Exception> = when { ): Promise<*, Exception> = when {
isUsingFCM -> retryIfNeeded(maxRetryCount) { isPushEnabled -> retryIfNeeded(maxRetryCount) {
Log.d(TAG, "register() called") Log.d(TAG, "register() called")
doRegister(token, publicKey, device, legacyGroupPublicKeys) doRegister(token, publicKey, device, legacyGroupPublicKeys)
} fail { exception -> } fail { exception ->
@ -99,17 +99,17 @@ object PushRegistryV1 {
fun subscribeGroup( fun subscribeGroup(
closedGroupPublicKey: String, closedGroupPublicKey: String,
isUsingFCM: Boolean = TextSecurePreferences.isPushEnabled(context), isPushEnabled: Boolean = TextSecurePreferences.isPushEnabled(context),
publicKey: String = MessagingModuleConfiguration.shared.storage.getUserPublicKey()!! publicKey: String = MessagingModuleConfiguration.shared.storage.getUserPublicKey()!!
) = if (isUsingFCM) { ) = if (isPushEnabled) {
performGroupOperation("subscribe_closed_group", closedGroupPublicKey, publicKey) performGroupOperation("subscribe_closed_group", closedGroupPublicKey, publicKey)
} else emptyPromise() } else emptyPromise()
fun unsubscribeGroup( fun unsubscribeGroup(
closedGroupPublicKey: String, closedGroupPublicKey: String,
isUsingFCM: Boolean = TextSecurePreferences.isPushEnabled(context), isPushEnabled: Boolean = TextSecurePreferences.isPushEnabled(context),
publicKey: String = MessagingModuleConfiguration.shared.storage.getUserPublicKey()!! publicKey: String = MessagingModuleConfiguration.shared.storage.getUserPublicKey()!!
) = if (isUsingFCM) { ) = if (isPushEnabled) {
performGroupOperation("unsubscribe_closed_group", closedGroupPublicKey, publicKey) performGroupOperation("unsubscribe_closed_group", closedGroupPublicKey, publicKey)
} else emptyPromise() } else emptyPromise()