make sure datastore is ready to provide item (#970)

* make sure datastore is ready to provide item * shift take(1) * resolve some foregrounding issues
mozilla-lockwise · May 14, 2019 · 69d6554 · 69d6554
1 parent f2778c3
commit 69d6554
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/Shared/Store/BaseDataStore.swift b/Shared/Store/BaseDataStore.swift
@@ -279,8 +279,7 @@ extension BaseDataStore {
 
         self.lifecycleStore.lifecycleEvents
                 .filter { $0 == .foreground }
-                .flatMap { _ in self.storageState }
-                .take(1)
+                .flatMap { _ in self.storageState.take(1) }
                 .subscribe(onNext: { [weak self] state in
                     guard state != .Unprepared else { return }
 

diff --git a/lockbox-ios/Presenter/ItemDetailPresenter.swift b/lockbox-ios/Presenter/ItemDetailPresenter.swift
@@ -88,8 +88,11 @@ class ItemDetailPresenter {
     }
 
     func onViewReady() {
-        let itemObservable = self.itemDetailStore.itemDetailId
-            .flatMap { self.dataStore.get($0) }
+        let itemObservable = self.dataStore.locked
+                .filter { !$0 }
+                .take(1)
+                .flatMap { _ in self.itemDetailStore.itemDetailId }
+                .flatMap { self.dataStore.get($0) }
 
         let itemDriver = itemObservable.asDriver(onErrorJustReturn: nil)
         let viewConfigDriver = Driver.combineLatest(itemDriver.filterNil(), self.itemDetailStore.itemDetailDisplay)

diff --git a/lockbox-ios/Presenter/RootPresenter.swift b/lockbox-ios/Presenter/RootPresenter.swift
@@ -110,6 +110,7 @@ class RootPresenter {
                 .disposed(by: self.disposeBag)
 
         self.dataStore.storageState
+            .distinctUntilChanged()
             .map({ (storageState) -> [Action] in
                 switch storageState {
                 case .Unprepared, .Locked:

diff --git a/lockbox-iosTests/ItemDetailPresenterSpec.swift b/lockbox-iosTests/ItemDetailPresenterSpec.swift
@@ -58,16 +58,19 @@ class ItemDetailPresenterSpec: QuickSpec {
     }
 
     class FakeDataStore: DataStore {
-        var onItemStub: PublishSubject<LoginRecord?>
+        var onItemStub = PublishSubject<LoginRecord?>()
+        var lockedStub = ReplaySubject<Bool>.create(bufferSize: 1)
         var loginIDArg: String?
 
         init() {
-            self.onItemStub = PublishSubject<LoginRecord?>()
             super.init()
-
             self.disposeBag = DisposeBag()
         }
 
+        override var locked: Observable<Bool> {
+            return lockedStub.asObservable()
+        }
+
         override func get(_ id: String) -> Observable<LoginRecord?> {
             self.loginIDArg = id
             return onItemStub.asObservable()
@@ -340,6 +343,7 @@ class ItemDetailPresenterSpec: QuickSpec {
 
                     self.itemDetailStore.itemDetailIdStub.onNext("1234")
                     self.sizeClassStore.shouldDisplaySidebarStub.onNext(false)
+                    self.dataStore.lockedStub.onNext(false)
                     self.subject.onViewReady()
                 }