Removing timeout to be fixed in #791

mozilla-lockwise · Jul 16, 2019 · dc06456 · dc06456
1 parent 6fe2146
commit dc06456
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 16 deletions.
diff --git a/app/src/main/java/mozilla/lockbox/presenter/ItemListPresenter.kt b/app/src/main/java/mozilla/lockbox/presenter/ItemListPresenter.kt
@@ -71,7 +71,7 @@ class ItemListPresenter(
             .map {
                 when (it) {
                     DataStore.SyncState.Syncing -> true
-                    DataStore.SyncState.NotSyncing, DataStore.SyncState.TimedOut -> false
+                    DataStore.SyncState.NotSyncing -> false
                 }
             }
             .subscribe { syncing ->
@@ -84,13 +84,14 @@ class ItemListPresenter(
             }
             .addTo(compositeDisposable)
 
-        dataStore.syncState
-            .filter { it == DataStore.SyncState.TimedOut }
-            .map { R.string.sync_timed_out }
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(view::showToastNotification)
-            .addTo(compositeDisposable)
-
+        /* timeout to be fixed in https://github.com/mozilla-lockwise/lockwise-android/issues/791
+              dataStore.syncState
+                  .filter { it == DataStore.SyncState.TimedOut }
+                  .map { R.string.sync_timed_out }
+                  .observeOn(AndroidSchedulers.mainThread())
+                  .subscribe(view::showToastNotification)
+                  .addTo(compositeDisposable)
+        */
         Observables.combineLatest(dataStore.list, settingStore.itemListSortOrder)
             .distinctUntilChanged()
             .map { pair ->

diff --git a/app/src/main/java/mozilla/lockbox/store/DataStore.kt b/app/src/main/java/mozilla/lockbox/store/DataStore.kt
@@ -26,14 +26,13 @@ import mozilla.lockbox.extensions.filterByType
 import mozilla.lockbox.flux.Dispatcher
 import mozilla.lockbox.log
 import mozilla.lockbox.model.SyncCredentials
-import mozilla.lockbox.support.Consumable
 import mozilla.lockbox.support.Constant
+import mozilla.lockbox.support.Consumable
 import mozilla.lockbox.support.DataStoreSupport
 import mozilla.lockbox.support.FxASyncDataStoreSupport
 import mozilla.lockbox.support.Optional
 import mozilla.lockbox.support.TimingSupport
 import java.util.concurrent.TimeUnit
-import java.util.concurrent.TimeoutException
 import kotlin.coroutines.CoroutineContext
 
 @ExperimentalCoroutinesApi
@@ -55,7 +54,7 @@ open class DataStore(
     }
 
     enum class SyncState {
-        Syncing, NotSyncing, TimedOut
+        Syncing, NotSyncing
     }
 
     internal val compositeDisposable = CompositeDisposable()
@@ -241,6 +240,16 @@ open class DataStore(
         // ideally, we don't sync unless we are connected to the network
         syncStateSubject.accept(SyncState.Syncing)
 
+        backend.sync(support.syncConfig!!)
+            .asSingle(coroutineContext)
+            .timeout(Constant.App.syncTimeout, TimeUnit.SECONDS)
+            .doOnEvent { _, _ ->
+                syncStateSubject.accept(SyncState.NotSyncing)
+            }
+            .subscribe(this::updateList, this::pushError)
+            .addTo(compositeDisposable)
+
+        /* timeout to be fixed in https://github.com/mozilla-lockwise/lockwise-android/issues/791
         backend.sync(support.syncConfig!!)
             .asSingle(coroutineContext)
             .timeout(Constant.App.syncTimeout, TimeUnit.SECONDS)
@@ -252,7 +261,7 @@ open class DataStore(
                 }
             }
             .subscribe(this::updateList, this::pushError)
-            .addTo(compositeDisposable)
+            .addTo(compositeDisposable) */
     }
 
     // item list management

diff --git a/app/src/test/java/mozilla/lockbox/presenter/ItemListPresenterTest.kt b/app/src/test/java/mozilla/lockbox/presenter/ItemListPresenterTest.kt
@@ -327,14 +327,14 @@ open class ItemListPresenterTest {
         syncStateStub.onNext(DataStore.SyncState.NotSyncing)
         Assert.assertEquals(false, view.isLoading)
     }
-
+    /* timeout to be fixed in https://github.com/mozilla-lockwise/lockwise-android/issues/791
     @Test
     fun `sync timeout indicator`() {
         syncStateStub.onNext(DataStore.SyncState.TimedOut)
         Assert.assertEquals(false, view.isLoading)
         Assert.assertEquals(R.string.sync_timed_out, view.toastNotificationArgStrId)
     }
-
+    */
     @Test
     fun `item deleted toast`() {
         val item = ServerPasswordTestHelper().item1

diff --git a/app/src/test/java/mozilla/lockbox/store/DataStoreTest.kt b/app/src/test/java/mozilla/lockbox/store/DataStoreTest.kt
@@ -212,7 +212,7 @@ class DataStoreTest : DisposingTest() {
         Assert.assertEquals(expectedSyncUnlockInfo.syncKey, support.syncConfig!!.syncKey)
         Assert.assertEquals(expectedSyncUnlockInfo.tokenserverURL, support.syncConfig!!.tokenserverURL)
     }
-
+    /* timeout to be fixed in https://github.com/mozilla-lockwise/lockwise-android/issues/791
     @Test
     fun testSync() {
         val syncIterator = this.subject.syncState.blockingIterable().iterator()
@@ -222,7 +222,7 @@ class DataStoreTest : DisposingTest() {
         Assert.assertEquals(DataStore.SyncState.Syncing, syncIterator.next())
         Assert.assertEquals(DataStore.SyncState.TimedOut, syncIterator.next())
     }
-
+    */
     @Test
     fun testGet() {
         val stateIterator = this.subject.state.blockingIterable().iterator()