Merge branch 'release/5.15.1'

CDRussell · CDRussell · commit 87782fa32185 · 2018-12-17T14:19:32.000Z
diff --git a/app/src/main/java/com/duckduckgo/app/settings/SettingsViewModel.kt b/app/src/main/java/com/duckduckgo/app/settings/SettingsViewModel.kt
@@ -98,6 +98,7 @@ class SettingsViewModel @Inject constructor(
     fun onLightThemeToggled(enabled: Boolean) {
         Timber.i("User toggled light theme, is now enabled: $enabled")
         settingsDataStore.theme = if (enabled) DuckDuckGoTheme.LIGHT else DuckDuckGoTheme.DARK
+        viewState.value = currentViewState().copy(lightThemeEnabled = enabled)
         command.value = Command.UpdateTheme
 
         val pixelName = if (enabled) SETTINGS_THEME_TOGGLED_LIGHT else SETTINGS_THEME_TOGGLED_DARK
@@ -107,6 +108,8 @@ class SettingsViewModel @Inject constructor(
     fun onAutocompleteSettingChanged(enabled: Boolean) {
         Timber.i("User changed autocomplete setting, is now enabled: $enabled")
         settingsDataStore.autoCompleteSuggestionsEnabled = enabled
+
+        viewState.value = currentViewState().copy(autoCompleteSuggestionsEnabled = enabled)
     }
 
     private fun obtainVersion(variantKey: String): String {
diff --git a/app/version/version.properties b/app/version/version.properties
@@ -14,4 +14,4 @@
 # limitations under the License.
 #
 
-VERSION=5.15.0
+VERSION=5.15.1

Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,4 @@`
`14`	`14`	`# limitations under the License.`
`15`	`15`	`#`
`16`	`16`
`17`		`-VERSION=5.15.0`
	`17`	`+VERSION=5.15.1`