ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-03 16:10:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fallback to the default push gateway on error (#5742)

Browse Source 
* Add more HTTP response code returning NoMatrixGateway

Fix Push notifications with Mozilla's autopush that returns 406

* Update gateway resolver tests to match new known errors

* Use default gateway on error if no gateway is recorded yet

* Update gateway resolver tests to return default gateway on error
This commit is contained in:
S1m
2026-06-04 16:19:52 +02:00
committed by GitHub
parent 0c5c2dc10b
commit 25264dd3e3
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushGatewayUrlResolver.kt
+3 -2
View File
@@ -29,8 +29,9 @@ class DefaultUnifiedPushGatewayUrlResolver(
): String { ): String {
return when (gatewayResult) { return when (gatewayResult) {
is UnifiedPushGatewayResolverResult.Error -> { is UnifiedPushGatewayResolverResult.Error -> {
// Use previous gateway if any, or the provided one // Use previous gateway if any, or the default one
unifiedPushStore.getPushGateway(instance) ?: gatewayResult.gateway unifiedPushStore.getPushGateway(instance)
?: defaultPushGatewayHttpUrlProvider.provide()
} }
UnifiedPushGatewayResolverResult.ErrorInvalidUrl, UnifiedPushGatewayResolverResult.ErrorInvalidUrl,
UnifiedPushGatewayResolverResult.NoMatrixGateway -> { UnifiedPushGatewayResolverResult.NoMatrixGateway -> {
libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnifiedPushGatewayUrlResolverTest.kt
+2 -2
View File
@@ -60,7 +60,7 @@ class DefaultUnifiedPushGatewayUrlResolverTest {
} }
@Test @Test
fun `resolve Error returns the url if no current url is available`() { fun `resolve Error returns the default gateway url if no current url is available`() {
val sut = createDefaultUnifiedPushGatewayUrlResolver( val sut = createDefaultUnifiedPushGatewayUrlResolver(
unifiedPushStore = FakeUnifiedPushStore( unifiedPushStore = FakeUnifiedPushStore(
getPushGatewayResult = { instance -> getPushGatewayResult = { instance ->
@@ -73,7 +73,7 @@ class DefaultUnifiedPushGatewayUrlResolverTest {
gatewayResult = UnifiedPushGatewayResolverResult.Error("aUrl"), gatewayResult = UnifiedPushGatewayResolverResult.Error("aUrl"),
instance = "instance", instance = "instance",
) )
assertThat(result).isEqualTo("aUrl") assertThat(result).isEqualTo(FakeDefaultPushGatewayHttpUrlProvider().provide())
} }
private fun createDefaultUnifiedPushGatewayUrlResolver( private fun createDefaultUnifiedPushGatewayUrlResolver(