From 31248b835c03611c194822d070d899ccf495bb1b Mon Sep 17 00:00:00 2001 From: Grisha Kruglov Date: Fri, 10 Jul 2020 17:41:45 -0700 Subject: [PATCH] Synced Tabs: make sure to stop 'loading' when we encounter an error --- app/src/main/java/org/mozilla/fenix/sync/SyncedTabsLayout.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/java/org/mozilla/fenix/sync/SyncedTabsLayout.kt b/app/src/main/java/org/mozilla/fenix/sync/SyncedTabsLayout.kt index 1f2fd9a91..ba3db15fb 100644 --- a/app/src/main/java/org/mozilla/fenix/sync/SyncedTabsLayout.kt +++ b/app/src/main/java/org/mozilla/fenix/sync/SyncedTabsLayout.kt @@ -34,6 +34,9 @@ class SyncedTabsLayout @JvmOverloads constructor( } override fun onError(error: SyncedTabsView.ErrorType) { + // We may still be displaying a "loading" spinner, hide it. + stopLoading() + val stringResId = when (error) { SyncedTabsView.ErrorType.MULTIPLE_DEVICES_UNAVAILABLE -> R.string.synced_tabs_connect_another_device SyncedTabsView.ErrorType.SYNC_ENGINE_UNAVAILABLE -> R.string.synced_tabs_enable_tab_syncing