Merge branch 'release/4.0.2'

Author: subsymbolic

app/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'kotlin-kapt'
 apply from: '../versioning.gradle'
 
 ext {
-    VERSION_NAME = "4.0.1"
+    VERSION_NAME = "4.0.2"
 }
 
 android {

app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt

@@ -17,13 +17,15 @@
 package com.duckduckgo.app.bookmarks.ui
 
 import android.app.Activity
+import android.app.AlertDialog
 import android.arch.lifecycle.Observer
 import android.arch.lifecycle.ViewModelProviders
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.support.v7.widget.RecyclerView.Adapter
 import android.support.v7.widget.RecyclerView.ViewHolder
+import android.text.Html
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -38,11 +40,12 @@ import org.jetbrains.anko.alert
 import org.jetbrains.anko.doAsync
 import javax.inject.Inject
 
-class BookmarksActivity: DuckDuckGoActivity() {
+class BookmarksActivity : DuckDuckGoActivity() {
 
     @Inject
     lateinit var viewModelFactory: ViewModelFactory
     lateinit var adapter: BookmarksAdapter
+    private var deleteDialog: AlertDialog? = null
 
     private val viewModel: BookmarksViewModel by lazy {
         ViewModelProviders.of(this, viewModelFactory).get(BookmarksViewModel::class.java)
@@ -74,11 +77,11 @@ class BookmarksActivity: DuckDuckGoActivity() {
         })
 
         viewModel.command.observe(this, Observer {
-            when(it) {
+            when (it) {
                 is BookmarksViewModel.Command.ConfirmDeleteBookmark -> confirmDeleteBookmark(it.bookmark)
                 is BookmarksViewModel.Command.OpenBookmark -> openBookmark(it.bookmark)
             }
-         })
+        })
     }
 
     private fun openBookmark(bookmark: BookmarkEntity) {
@@ -87,13 +90,15 @@ class BookmarksActivity: DuckDuckGoActivity() {
         finish()
     }
 
+    @Suppress("deprecation")
     private fun confirmDeleteBookmark(bookmark: BookmarkEntity) {
-        val message = getString(R.string.bookmarkDeleteConfirmMessage, bookmark.title)
+        val message = Html.fromHtml(getString(R.string.bookmarkDeleteConfirmMessage, bookmark.title))
         val title = getString(R.string.bookmarkDeleteConfirmTitle)
-        alert(message, title) {
+        deleteDialog = alert(message, title) {
             positiveButton(android.R.string.yes) { delete(bookmark) }
             negativeButton(android.R.string.no) { }
-        }.show()
+        }.build()
+        deleteDialog?.show()
     }
 
     private fun delete(bookmark: BookmarkEntity) {
@@ -102,6 +107,11 @@ class BookmarksActivity: DuckDuckGoActivity() {
         }
     }
 
+    override fun onDestroy() {
+        deleteDialog?.dismiss()
+        super.onDestroy()
+    }
+
     companion object {
         fun intent(context: Context): Intent {
             return Intent(context, BookmarksActivity::class.java)
@@ -110,7 +120,7 @@ class BookmarksActivity: DuckDuckGoActivity() {
         val OPEN_URL_RESULT_CODE = Activity.RESULT_FIRST_USER
     }
 
-    class BookmarksAdapter(val context: Context, val viewModel: BookmarksViewModel): Adapter<BookmarksViewHolder>() {
+    class BookmarksAdapter(val context: Context, val viewModel: BookmarksViewModel) : Adapter<BookmarksViewHolder>() {
 
         var bookmarks: List<BookmarkEntity> = emptyList()
             set(value) {

app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt

@@ -32,6 +32,7 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.inputmethod.EditorInfo.IME_ACTION_DONE
+import android.webkit.CookieManager
 import android.webkit.WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE
 import android.widget.TextView
 import android.widget.Toast
@@ -52,13 +53,15 @@ import org.jetbrains.anko.toast
 import org.jetbrains.anko.uiThread
 import timber.log.Timber
 import javax.inject.Inject
+import javax.inject.Provider
 
 
 class BrowserActivity : DuckDuckGoActivity() {
 
     @Inject lateinit var webViewClient: BrowserWebViewClient
     @Inject lateinit var webChromeClient: BrowserChromeClient
     @Inject lateinit var viewModelFactory: ViewModelFactory
+    @Inject lateinit var cookieManagerProvider: Provider<CookieManager>
 
     private lateinit var popupMenu: BrowserPopupMenu
 
@@ -337,11 +340,11 @@ class BrowserActivity : DuckDuckGoActivity() {
     }
 
     private fun launchFire() {
-        FireDialog(this, {
-            finishActivityAnimated()
-        }, {
-            applicationContext.toast(R.string.fireDataCleared)
-        }).show()
+        FireDialog(context = this,
+                clearStarted = { finishActivityAnimated() },
+                clearComplete = { applicationContext.toast(R.string.fireDataCleared) },
+                cookieManager = cookieManagerProvider.get()
+        ).show()
     }
 
     private fun launchPopupMenu() {
@@ -428,6 +431,11 @@ class BrowserActivity : DuckDuckGoActivity() {
         webView.hide()
     }
 
+    override fun onDestroy() {
+        popupMenu.dismiss()
+        super.onDestroy()
+    }
+
     companion object {
 
         fun intent(context: Context, sharedText: String? = null): Intent {

app/src/main/java/com/duckduckgo/app/di/AppComponent.kt

@@ -38,6 +38,7 @@ import javax.inject.Singleton
     (DatabaseModule::class),
     (JsonModule::class),
     (StringModule::class),
+    (BrowserModule::class),
     (BrowserAutoCompleteModule::class)
 ])
 interface AppComponent : AndroidInjector<DuckDuckGoApplication> {

app/src/main/java/com/duckduckgo/app/di/BrowserModule.kt

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2018 DuckDuckGo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.duckduckgo.app.di
+
+import android.webkit.CookieManager
+import dagger.Module
+import dagger.Provides
+
+@Module
+class BrowserModule {
+
+    @Provides
+    fun cookieManager(): CookieManager = CookieManager.getInstance()
+}

app/src/main/java/com/duckduckgo/app/global/view/FireDialog.kt

@@ -24,7 +24,10 @@ import android.webkit.WebView
 import com.duckduckgo.app.browser.R
 import kotlinx.android.synthetic.main.sheet_fire_clear_data.*
 
-class FireDialog(context: Context, clearStarted: (() -> Unit), clearComplete: (() -> Unit)) : BottomSheetDialog(context) {
+class FireDialog(context: Context,
+                 private val cookieManager: CookieManager,
+                 clearStarted: (() -> Unit),
+                 clearComplete: (() -> Unit)) : BottomSheetDialog(context) {
 
     init {
         val contentView = View.inflate(getContext(), R.layout.sheet_fire_clear_data, null)
@@ -47,8 +50,15 @@ class FireDialog(context: Context, clearStarted: (() -> Unit), clearComplete: ((
     }
 
     private fun clearCookies(clearAllCallback: (() -> Unit)) {
-        CookieManager.getInstance().removeAllCookies {
+        val ddgCookie = cookieManager.getCookie(DDG_URL)
+
+        cookieManager.removeAllCookies {
+            cookieManager.setCookie(DDG_URL, ddgCookie)
             clearAllCallback()
         }
     }
+
+    companion object {
+        private const val DDG_URL = "duckduckgo.com"
+    }
 }

app/src/main/java/com/duckduckgo/app/home/HomeActivity.kt

@@ -24,6 +24,7 @@ import android.support.v7.app.AppCompatActivity
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import android.webkit.CookieManager
 import com.duckduckgo.app.about.AboutDuckDuckGoActivity
 import com.duckduckgo.app.bookmarks.ui.BookmarksActivity
 import com.duckduckgo.app.browser.BrowserActivity
@@ -36,11 +37,16 @@ import kotlinx.android.synthetic.main.activity_home.*
 import kotlinx.android.synthetic.main.content_home.*
 import kotlinx.android.synthetic.main.popup_window_brower_menu.view.*
 import org.jetbrains.anko.toast
+import javax.inject.Inject
+import javax.inject.Provider
 
 class HomeActivity : AppCompatActivity() {
 
     private lateinit var popupMenu: BrowserPopupMenu
 
+    @Inject
+    lateinit var cookieManagerProvider: Provider<CookieManager>
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_home)
@@ -104,9 +110,10 @@ class HomeActivity : AppCompatActivity() {
     }
 
     private fun launchFire() {
-        FireDialog(this, {}, {
-            toast(R.string.fireDataCleared)
-        }).show()
+        FireDialog(context = this,
+                cookieManager = cookieManagerProvider.get(),
+                clearStarted = {},
+                clearComplete = { toast(R.string.fireDataCleared) }).show()
     }
 
     private fun launchPopupMenu() {
@@ -152,6 +159,11 @@ class HomeActivity : AppCompatActivity() {
         startActivity(BrowserActivity.intent(this, url))
     }
 
+    override fun onDestroy() {
+        popupMenu.dismiss()
+        super.onDestroy()
+    }
+
     companion object {
 
         private const val SETTINGS_REQUEST_CODE = 100

app/src/main/java/com/duckduckgo/app/trackerdetection/api/TrackerDataDownloader.kt

@@ -17,6 +17,7 @@
 package com.duckduckgo.app.trackerdetection.api
 
 import com.duckduckgo.app.global.api.isCached
+import com.duckduckgo.app.global.db.AppDatabase
 import com.duckduckgo.app.trackerdetection.AdBlockClient
 import com.duckduckgo.app.trackerdetection.Client
 import com.duckduckgo.app.trackerdetection.Client.ClientName.*
@@ -35,7 +36,8 @@ class TrackerDataDownloader @Inject constructor(
         private val trackerListService: TrackerListService,
         private val trackerDataStore: TrackerDataStore,
         private val trackerDataLoader: TrackerDataLoader,
-        private val trackerDataDao: TrackerDataDao) {
+        private val trackerDataDao: TrackerDataDao,
+        private val appDatabase: AppDatabase) {
 
     fun downloadList(clientName: Client.ClientName): Completable {
 
@@ -63,8 +65,14 @@ class TrackerDataDownloader @Inject constructor(
             if (response.isSuccessful) {
                 Timber.d("Updating disconnect data from server")
                 val body = response.body()!!
-                trackerDataDao.insertAll(body.trackers)
-                trackerDataLoader.loadDisconnectData()
+
+                appDatabase.runInTransaction {
+                    trackerDataDao.deleteAll()
+                    trackerDataDao.insertAll(body.trackers)
+                    trackerDataLoader.loadDisconnectData()
+                }
+
+
             } else {
                 throw IOException("Status: ${response.code()} - ${response.errorBody()?.string()}")
             }

app/src/main/java/com/duckduckgo/app/trackerdetection/db/TrackerDataDao.kt

@@ -34,4 +34,7 @@ interface TrackerDataDao {
 
     @Query("Select count(*) from disconnect_tracker")
     fun count(): Int
+
+    @Query("DELETE FROM disconnect_tracker")
+    fun deleteAll()
 }