From 3169093c50534c302ba7bdf94e9bb616af4ecdc4 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 19 Sep 2019 12:55:39 +0200 Subject: [PATCH] Quick fix on the no connection banner displayed when internet is available --- CHANGES.md | 3 ++- .../android/internal/network/NetworkConnectivityChecker.kt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index a5f2a24e12..ef90baca8d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -12,6 +12,7 @@ Other changes: Bugfix: - Fix characters erased from the Search field when the result are coming (#545) + - "No connection" banner was displayed by mistake Translations: - @@ -23,7 +24,7 @@ Changes in RiotX 0.5.0 (2019-09-17) =================================================== Features: - - Implementation of login to homeerver with SSO + - Implementation of login to homeserver with SSO - Handle M_CONSENT_NOT_GIVEN error (#64) - Auto configure homeserver and identity server URLs of LoginActivity with a magic link diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/NetworkConnectivityChecker.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/NetworkConnectivityChecker.kt index ed1702ec07..88229db325 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/NetworkConnectivityChecker.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/NetworkConnectivityChecker.kt @@ -18,6 +18,7 @@ package im.vector.matrix.android.internal.network import android.content.Context import com.novoda.merlin.Merlin +import com.novoda.merlin.MerlinsBeard import im.vector.matrix.android.internal.di.MatrixScope import timber.log.Timber import java.util.* @@ -36,7 +37,7 @@ internal class NetworkConnectivityChecker @Inject constructor(context: Context) private val listeners = Collections.synchronizedSet(LinkedHashSet()) // True when internet is available - var hasInternetAccess = false + var hasInternetAccess = MerlinsBeard.Builder().build(context).isConnected private set init {