Merge branch 'release/5.65.0' into main

marcosholgado · marcosholgado · commit 86b57e6049ef · 2020-09-23T13:26:07.000+01:00
diff --git a/app/src/main/java/com/duckduckgo/app/browser/di/BrowserModule.kt b/app/src/main/java/com/duckduckgo/app/browser/di/BrowserModule.kt
@@ -168,7 +168,7 @@ class BrowserModule {
         removeCookies: RemoveCookies,
         dispatcherProvider: DispatcherProvider
     ): DuckDuckGoCookieManager {
-        return WebViewCookieManager(cookieManager, AppUrl.Url.HOST, removeCookies, dispatcherProvider)
+        return WebViewCookieManager(cookieManager, AppUrl.Url.COOKIES, removeCookies, dispatcherProvider)
     }
 
     @Provides
diff --git a/app/src/main/java/com/duckduckgo/app/global/AppUrl.kt b/app/src/main/java/com/duckduckgo/app/global/AppUrl.kt
@@ -22,6 +22,7 @@ class AppUrl {
         const val HOST = "duckduckgo.com"
         const val API = "https://$HOST"
         const val HOME = "https://$HOST"
+        const val COOKIES = "https://$HOST"
         const val ABOUT = "https://$HOST/about"
         const val TOSDR = "https://tosdr.org"
         const val PIXEL = "https://improving.duckduckgo.com"
diff --git a/app/version/release-notes b/app/version/release-notes
@@ -1,5 +1,5 @@
 ## What's new in this release?
-Bug fixes and other improvements.
+In this release we fixed an issue that was causing DuckDuckGo settings to be reset when the fire button is used.
 
 ## Have feedback?
 You can always reach us at https://duckduckgo.com/feedback.
diff --git a/app/version/version.properties b/app/version/version.properties
@@ -1 +1 @@
-VERSION=5.64.0
+VERSION=5.65.0

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ class BrowserModule {`
`168`	`168`	`removeCookies: RemoveCookies,`
`169`	`169`	`dispatcherProvider: DispatcherProvider`
`170`	`170`	`): DuckDuckGoCookieManager {`
`171`		`- return WebViewCookieManager(cookieManager, AppUrl.Url.HOST, removeCookies, dispatcherProvider)`
	`171`	`+ return WebViewCookieManager(cookieManager, AppUrl.Url.COOKIES, removeCookies, dispatcherProvider)`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`@Provides`