No issue: add isSyncActive method to FxaAccountManager

This got removed as part of #3579
... but we actually need it for the UIs!

components/service/firefox-accounts/src/main/java/mozilla/components/service/fxa/manager/FxaAccountManager.kt

@@ -339,6 +339,11 @@ open class FxaAccountManager(
         Unit
     }
 
+    /**
+     * Indicates if sync is currently running.
+     */
+    fun isSyncActive() = syncManager?.isSyncActive() ?: false
+
     /**
      * Call this after registering your observers, and before interacting with this class.
      */

components/service/firefox-accounts/src/main/java/mozilla/components/service/fxa/sync/SyncManager.kt

@@ -107,6 +107,11 @@ abstract class SyncManager(
     // Currently the interfaces are the same, hence the name "pass-through".
     private val dispatcherStatusObserver = PassThroughSyncStatusObserver(syncStatusObserverRegistry)
 
+    /**
+     * Indicates if sync is currently running.
+     */
+    internal fun isSyncActive() = syncDispatcher?.isSyncActive() ?: false
+
     internal fun registerSyncStatusObserver(observer: SyncStatusObserver) {
         syncStatusObserverRegistry.register(observer)
     }

components/service/firefox-accounts/src/test/java/mozilla/components/service/fxa/FxaAccountManagerTest.kt

@@ -275,6 +275,9 @@ class FxaAccountManagerTest {
 
         manager.initAsync().await()
 
+        // Can check if sync is running (it's not!), even if we don't have sync configured.
+        assertFalse(manager.isSyncActive())
+
         val syncStatusObserver = TestSyncStatusObserver()
         val lifecycleOwner: LifecycleOwner = mock()
         val lifecycle: Lifecycle = mock()
@@ -312,6 +315,7 @@ class FxaAccountManagerTest {
         verify(latestSyncManager!!.dispatcher.inner, times(1)).syncNow(anyBoolean())
 
         // Make sure sync status listeners are working.
+        // TODO fix these tests.
 //        // Test dispatcher -> sync manager -> account manager -> our test observer.
 //        latestSyncManager!!.dispatcherRegistry.notifyObservers { onStarted() }
 //        assertEquals(1, syncStatusObserver.onStartedCount)
@@ -401,6 +405,7 @@ class FxaAccountManagerTest {
         manager.syncNowAsync(startup = true).await()
         verify(latestSyncManager!!.dispatcher.inner, times(3)).syncNow(anyBoolean())
 
+        // TODO fix these tests
 //        assertEquals(0, syncStatusObserver.onStartedCount)
 //        assertEquals(0, syncStatusObserver.onIdleCount)
 //        assertEquals(0, syncStatusObserver.onErrorCount)
@@ -426,6 +431,14 @@ class FxaAccountManagerTest {
         verify(latestSyncManager!!.dispatcher.inner, times(2)).syncNow(anyBoolean())
         manager.syncNowAsync(startup = true).await()
         verify(latestSyncManager!!.dispatcher.inner, times(3)).syncNow(anyBoolean())
+
+        // Pretend sync is running.
+        `when`(latestSyncManager!!.dispatcher.inner.isSyncActive()).thenReturn(true)
+        assertTrue(manager.isSyncActive())
+
+        // Pretend sync is not running.
+        `when`(latestSyncManager!!.dispatcher.inner.isSyncActive()).thenReturn(false)
+        assertFalse(manager.isSyncActive())
     }
 
     @Test

docs/changelog.md

@@ -43,6 +43,9 @@ permalink: /changelog/
 * **browser-icons**
   * Changed the maximum size for decoded icons. Icons are now scaled to the target size to save memory.
 
+* **service-firefox-account**
+ * Added `isSyncActive(): Boolean` method to `FxaAccountManager`
+
 # 5.0.0
 
 * [Commits](https://github.com/mozilla-mobile/android-components/compare/v4.0.0...v5.0.0)