Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

UnifiedPushGatewayResolver.getGateway cannot return null.

Browse source
This commit is contained in:
Benoit Marty 2024-05-22 09:25:57 +02:00
parent 39bb6d3ff3
commit 6dcc16fc6b
2 changed files with 13 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushGatewayResolver.kt
View file

@ -26,7 +26,7 @@ class UnifiedPushGatewayResolver @Inject constructor(
private val unifiedPushApiFactory: UnifiedPushApiFactory, private val unifiedPushApiFactory: UnifiedPushApiFactory,
private val coroutineDispatchers: CoroutineDispatchers, private val coroutineDispatchers: CoroutineDispatchers,
) { ) {
suspend fun getGateway(endpoint: String): String? { suspend fun getGateway(endpoint: String): String {
val gateway = UnifiedPushConfig.DEFAULT_PUSH_GATEWAY_HTTP_URL val gateway = UnifiedPushConfig.DEFAULT_PUSH_GATEWAY_HTTP_URL
try { try {
val url = URL(endpoint) val url = URL(endpoint)

34
libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/VectorUnifiedPushMessagingReceiver.kt
View file

@ -76,29 +76,19 @@ class VectorUnifiedPushMessagingReceiver : MessagingReceiver() {
coroutineScope.launch { coroutineScope.launch {
val gateway = unifiedPushGatewayResolver.getGateway(endpoint) val gateway = unifiedPushGatewayResolver.getGateway(endpoint)
unifiedPushStore.storePushGateway(gateway, instance) unifiedPushStore.storePushGateway(gateway, instance)
if (gateway == null) { val result = newGatewayHandler.handle(endpoint, gateway, instance)
Timber.tag(loggerTag.value).w("No gateway found for endpoint $endpoint") .onFailure {
endpointRegistrationHandler.registrationDone( Timber.tag(loggerTag.value).e(it, "Failed to handle new gateway")
RegistrationResult( }
clientSecret = instance, .onSuccess {
result = Result.failure(IllegalStateException("No gateway found for endpoint $endpoint")), unifiedPushStore.storeUpEndpoint(endpoint, instance)
) }
endpointRegistrationHandler.registrationDone(
RegistrationResult(
clientSecret = instance,
result = result,
) )
} else { )
val result = newGatewayHandler.handle(endpoint, gateway, instance)
.onFailure {
Timber.tag(loggerTag.value).e(it, "Failed to handle new gateway")
}
.onSuccess {
unifiedPushStore.storeUpEndpoint(endpoint, instance)
}
endpointRegistrationHandler.registrationDone(
RegistrationResult(
clientSecret = instance,
result = result,
)
)
}
} }
guardServiceStarter.stop() guardServiceStarter.stop()
} }