filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix an issue with empty endpoint. It can happen if the endpoint is manually removed from the distributor.

This commit is contained in:
Benoit Marty 2022-06-02 15:28:27 +02:00 committed by Benoit Marty
parent 87087197e5
commit a139756dbc
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt
View File

@ -253,7 +253,7 @@ class UnifiedPushHelper @Inject constructor(
fun getPrivacyFriendlyUpEndpoint(): String? { fun getPrivacyFriendlyUpEndpoint(): String? {
val endpoint = unifiedPushStore.getEndpointOrToken() val endpoint = unifiedPushStore.getEndpointOrToken()
if (endpoint.isNullOrEmpty()) return endpoint if (endpoint.isNullOrEmpty()) return null
if (isEmbeddedDistributor()) { if (isEmbeddedDistributor()) {
return endpoint return endpoint
} }

9
vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestUnifiedPushEndpoint.kt
View File

@ -30,13 +30,10 @@ class TestUnifiedPushEndpoint @Inject constructor(
override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) { override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
val endpoint = unifiedPushHelper.getPrivacyFriendlyUpEndpoint() val endpoint = unifiedPushHelper.getPrivacyFriendlyUpEndpoint()
endpoint?.let { if (endpoint != null) {
description = stringProvider.getString( description = stringProvider.getString(R.string.settings_troubleshoot_test_current_endpoint_success, endpoint)
R.string.settings_troubleshoot_test_current_endpoint_success,
unifiedPushHelper.getPrivacyFriendlyUpEndpoint()
)
status = TestStatus.SUCCESS status = TestStatus.SUCCESS
} ?: run { } else {
description = stringProvider.getString(R.string.settings_troubleshoot_test_current_endpoint_failed) description = stringProvider.getString(R.string.settings_troubleshoot_test_current_endpoint_failed)
status = TestStatus.FAILED status = TestStatus.FAILED
} }