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

Remove const val PUSH_GATEWAY_PATH, it makes the code more complex for no added value.

Browse source
This commit is contained in:
Benoit Marty 2024-09-04 11:09:27 +02:00
parent 6eb5610bcc
commit 90352bd1ad
4 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushConfig.kt
View file

@ -17,13 +17,11 @@
package io.element.android.libraries.pushproviders.unifiedpush package io.element.android.libraries.pushproviders.unifiedpush
object UnifiedPushConfig { object UnifiedPushConfig {
const val PUSH_GATEWAY_PATH: String = "_matrix/push/v1/notify"
/** /**
* It is the push gateway for UnifiedPush. * It is the push gateway for UnifiedPush.
* Note: default_push_gateway_http_url should have path '/_matrix/push/v1/notify' * Note: default_push_gateway_http_url should have path '/_matrix/push/v1/notify'
*/ */
const val DEFAULT_PUSH_GATEWAY_HTTP_URL: String = "https://matrix.gateway.unifiedpush.org/$PUSH_GATEWAY_PATH" const val DEFAULT_PUSH_GATEWAY_HTTP_URL: String = "https://matrix.gateway.unifiedpush.org/_matrix/push/v1/notify"
const val UNIFIED_PUSH_DISTRIBUTORS_URL = "https://unifiedpush.org/users/distributors/" const val UNIFIED_PUSH_DISTRIBUTORS_URL = "https://unifiedpush.org/users/distributors/"

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

@ -46,7 +46,7 @@ class DefaultUnifiedPushGatewayResolver @Inject constructor(
} else { } else {
val port = if (url.port != -1) ":${url.port}" else "" val port = if (url.port != -1) ":${url.port}" else ""
val customBase = "${url.protocol}://${url.host}$port" val customBase = "${url.protocol}://${url.host}$port"
val customUrl = "$customBase/${UnifiedPushConfig.PUSH_GATEWAY_PATH}" val customUrl = "$customBase/_matrix/push/v1/notify"
Timber.i("Testing $customUrl") Timber.i("Testing $customUrl")
return withContext(coroutineDispatchers.io) { return withContext(coroutineDispatchers.io) {
val api = unifiedPushApiFactory.create(customBase) val api = unifiedPushApiFactory.create(customBase)

3
libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/network/UnifiedPushApi.kt
View file

@ -16,10 +16,9 @@
package io.element.android.libraries.pushproviders.unifiedpush.network package io.element.android.libraries.pushproviders.unifiedpush.network
import io.element.android.libraries.pushproviders.unifiedpush.UnifiedPushConfig
import retrofit2.http.GET import retrofit2.http.GET
interface UnifiedPushApi { interface UnifiedPushApi {
@GET(UnifiedPushConfig.PUSH_GATEWAY_PATH) @GET("_matrix/push/v1/notify")
suspend fun discover(): DiscoveryResponse suspend fun discover(): DiscoveryResponse
} }

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

@ -59,7 +59,7 @@ class UnifiedPushMatrixGatewayTest @Inject constructor(
status = NotificationTroubleshootTestState.Status.Failure(false) status = NotificationTroubleshootTestState.Status.Failure(false)
) )
} else { } else {
val gatewayBaseUrl = config.url.removeSuffix("/${UnifiedPushConfig.PUSH_GATEWAY_PATH}") val gatewayBaseUrl = config.url.removeSuffix("/_matrix/push/v1/notify")
// Checking if the gateway is a Matrix gateway // Checking if the gateway is a Matrix gateway
coroutineScope.launch(coroutineDispatchers.io) { coroutineScope.launch(coroutineDispatchers.io) {
val api = unifiedPushApiFactory.create(gatewayBaseUrl) val api = unifiedPushApiFactory.create(gatewayBaseUrl)