867 - Fix obvious NPE sync crash (#884)

app/src/main/java/mozilla/lockbox/store/DataStore.kt

@@ -4,6 +4,7 @@
 
 package mozilla.lockbox.store
 
+import androidx.annotation.VisibleForTesting
 import com.jakewharton.rxrelay2.BehaviorRelay
 import com.jakewharton.rxrelay2.ReplayRelay
 import io.reactivex.Observable
@@ -59,7 +60,8 @@ open class DataStore(
 
     internal val compositeDisposable = CompositeDisposable()
     private val stateSubject = ReplayRelay.createWithSize<State>(1)
-    private val syncStateSubject = BehaviorRelay.createDefault<SyncState>(SyncState.NotSyncing)
+    @VisibleForTesting
+    val syncStateSubject: BehaviorRelay<SyncState> = BehaviorRelay.createDefault(SyncState.NotSyncing)
     private val listSubject: BehaviorRelay<List<ServerPassword>> = BehaviorRelay.createDefault(emptyList())
 
     open val state: Observable<State> = stateSubject
@@ -211,13 +213,21 @@ open class DataStore(
         }
     }
 
-    private fun sync() {
+    @VisibleForTesting(
+        otherwise = VisibleForTesting.PRIVATE
+    )
+    fun sync() {
         resetSupport(support)
 
+        val syncConfig = support.syncConfig ?: run {
+            log.error("syncConfig is null in sync. This is likely a bug.")
+            return
+        }
+
         // ideally, we don't sync unless we are connected to the network
         syncStateSubject.accept(SyncState.Syncing)
 
-        backend.sync(support.syncConfig!!)
+        backend.sync(syncConfig)
             .asSingle(coroutineContext)
             .timeout(Constant.App.syncTimeout, TimeUnit.SECONDS)
             .doOnEvent { _, err ->

app/src/test/java/mozilla/lockbox/store/DataStoreTest.kt

@@ -56,6 +56,15 @@ class DataStoreTest : DisposingTest() {
         subject = DataStore(dispatcher, support, timingSupport, lifecycleStore)
     }
 
+    @Test
+    fun `test issue 867 sync crash`() {
+        support.syncConfig = null
+        Assert.assertNull(support.syncConfig)
+        subject.sync()
+        Assert.assertNull(support.syncConfig)
+        Assert.assertEquals(subject.syncStateSubject.value, DataStore.SyncState.NotSyncing)
+    }
+
     @Test
     fun testLockUnlock_shouldSync() {
         val stateIterator = this.subject.state.blockingIterable().iterator()