Skip to content
This repository has been archived by the owner on Dec 14, 2021. It is now read-only.

Commit

Permalink
Update production branch with latest master (#799)
Browse files Browse the repository at this point in the history
* Update release notes for 1.3.1 (#769)

* Scroll to top after change in list sort option (#751)

* Add release steps for uploading dSYM to sentry (#770)

* Prepare version 1.3.2 (#776)

* SettingsListView: move done btn tap binding to presenter (#772)

* SettingsListView: move btn bindings to presenter

- moved setupNavbar method from viewWillAppear to viewDidLoad
so that the done button was configured/available to bind before
the presenters onViewReady was called

* unit test done btn pressed

* Add SettingListViewSpec unit test

- test fails if you remove: `let _ = doneButton.target?.perform(doneButton.action)`

* Try mocking the datastore to fix tests (#778)

* Fix audio pausing when video starts (#777)

* [#209] Move btn bindings to presenter (#779)

* Move unLinkAccount btn binding from view to presenter

* Update units tests for unLinkAccountButtonPressed

- test fails in AccountSettingsPresenterSpec if the presenter does not subscribe to the button tap event
- test fails in AccountSettingViewSpec if the .touchUpInside event
is not sent

* Move settings btn binding from view to presenter

* Update Unit tests for settingsBtnPressed

- AccountSettingPresenterSpec test fails if presenter does not
subscribe to button tap event.

* Adjust autofill UI for iPhone SE (#771)

* Adjust autofill UI for iPhone SE

* update autofill instructions screen for iphone se

* Shutdown db when app is terminating (#780)

* lock now button overrides autolock never setting (#763)

* lock now button overrides autolock never setting

* store forceLock value to keep screen locked

* propose Pull Request template (#785)

* add adjust event for sign in (#784)

* add adjust event for sign in

* add adjustmanager to wrap Adjust sdk

* disable

* update adjust manager per pr comments

* add uid to telemetry extras (#783)

* Fix lint issues (#790)

* Add v1.3.2 release notes (#791)

* Add v1.3.2 release notes

* minor nits

caps on AutoFill, attempt to focus on user value

* Fix biometrics on launch (#796)

* update release notes (#797)
  • Loading branch information
joeyg authored Nov 6, 2018
1 parent 2bd5918 commit 111f8e8
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 5 deletions.
3 changes: 2 additions & 1 deletion Shared/Common/Resources/BaseConstants.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class Constant {
static let defaultAutoLock = Setting.AutoLock.FiveMinutes
static let defaultItemListSort = Setting.ItemListSort.alphabetically
static let defaultRecordUsageData = true
static let defaultForceLock = false
}

struct color {
Expand Down Expand Up @@ -82,7 +83,7 @@ enum UserDefaultKey: String {
case .itemListSort:
return Constant.setting.defaultItemListSort.rawValue
case .forceLock:
return false
return Constant.setting.defaultForceLock
}
}
}
Expand Down
15 changes: 15 additions & 0 deletions docs/release-notes.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# Release Notes

## 1.3.2 (Build 2635)

_Date: 2018-11-03_

We fixed more bugs! You should see some slight improvements but nothing major.

Here's the full list of changes:

- Login list scrolls to top after changing the sort order
- AutoFill Instructions now looks better on smaller screens
- AutoFill Instructions video now doesn't stop your audio
- "Lock Now" button overrides the autolock timer setting
- Updated Adjust and Telemetry


## 1.3.2 (Build 2520)

_Date: 2018-10-30_
Expand Down
8 changes: 4 additions & 4 deletions lockbox-ios/Presenter/WelcomePresenter.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ protocol WelcomeViewProtocol: BaseWelcomeViewProtocol {
}

class WelcomePresenter: BaseWelcomePresenter {
private var userDefaults: UserDefaults
private var userDefaultStore: UserDefaultStore

weak var view: WelcomeViewProtocol? {
return self.baseView as? WelcomeViewProtocol
Expand All @@ -34,9 +34,9 @@ class WelcomePresenter: BaseWelcomePresenter {
dataStore: DataStore = DataStore.shared,
lifecycleStore: LifecycleStore = LifecycleStore.shared,
biometryManager: BiometryManager = BiometryManager(),
userDefaults: UserDefaults = UserDefaults.standard) {
userDefaultStore: UserDefaultStore = UserDefaultStore.shared) {

self.userDefaults = userDefaults
self.userDefaultStore = userDefaultStore

super.init(view: view,
dispatcher: dispatcher,
Expand Down Expand Up @@ -141,7 +141,7 @@ extension WelcomePresenter {
let coldStartObservable = Observable.combineLatest(
self.accountStore.profile,
self.dataStore.locked.distinctUntilChanged(),
self.userDefaults.onForceLock)
self.userDefaultStore.forceLock)
.take(1)
.filter { !$0.2 }
.map { ($0.0, $0.1) }
Expand Down

0 comments on commit 111f8e8

Please sign in to comment.