Merge branch 'master' of github.com:duckduckgo/Android into release/4.1

# Conflicts:
#	app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt

Author: CDRussell

app/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'kotlin-kapt'
 apply from: '../versioning.gradle'
 
 ext {
-    VERSION_NAME = "4.0.8"
+    VERSION_NAME = "4.0.10"
 }
 
 android {
@@ -79,6 +79,9 @@ ext {
 
 
 dependencies {
+    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.4'
+    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
+
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
     implementation "com.android.support:appcompat-v7:$supportLibrary"

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

@@ -24,6 +24,7 @@ import android.arch.lifecycle.ViewModelProviders
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.support.v7.widget.LinearLayoutManager
 import android.text.Editable
@@ -34,6 +35,7 @@ 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.webkit.WebView
 import android.widget.TextView
 import android.widget.Toast
 import com.duckduckgo.app.bookmarks.ui.BookmarksActivity
@@ -79,11 +81,43 @@ class BrowserActivity : DuckDuckGoActivity() {
     private val fireMenu: MenuItem?
         get() = toolbar.menu.findItem(R.id.fire_menu_item)
 
+    private lateinit var webView: WebView
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
         setContentView(R.layout.activity_browser)
+
+        createWebView()
+        createPopupMenu()
+        configureObservers()
+        configureToolbar()
+        configureWebView()
+        configureOmnibarTextInput()
+        configureDummyViewTouchHandler()
+        configureAutoComplete()
+
+        if (savedInstanceState == null) {
+            consumeSharedQuery()
+        }
+    }
+
+    private fun createPopupMenu() {
         popupMenu = BrowserPopupMenu(layoutInflater)
+    }
 
+    private fun createWebView() {
+        webView = NestedWebView(this)
+        webView.gone()
+        webView.isFocusableInTouchMode = true
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            webView.focusable = View.FOCUSABLE
+        }
+
+        webViewContainer.addView(webView)
+    }
+
+    private fun configureObservers() {
         viewModel.viewState.observe(this, Observer<BrowserViewModel.ViewState> {
             it?.let { render(it) }
         })
@@ -122,16 +156,6 @@ class BrowserActivity : DuckDuckGoActivity() {
                 }
             }
         })
-
-        configureToolbar()
-        configureWebView()
-        configureOmnibarTextInput()
-        configureDummyViewTouchHandler()
-        configureAutoComplete()
-
-        if (savedInstanceState == null) {
-            consumeSharedQuery()
-        }
     }
 
     private fun configureAutoComplete() {
@@ -432,6 +456,9 @@ class BrowserActivity : DuckDuckGoActivity() {
     }
 
     override fun onDestroy() {
+        webViewContainer.removeAllViews()
+        webView.destroy()
+
         popupMenu.dismiss()
         super.onDestroy()
     }

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

@@ -42,7 +42,7 @@ class BrowserWebViewClient @Inject constructor(
 ) : WebViewClient() {
 
     var webViewClientListener: WebViewClientListener? = null
-
+    var currentUrl: String? = null
 
     /**
      * This is the new method of url overriding available from API 24 onwards
@@ -84,6 +84,7 @@ class BrowserWebViewClient @Inject constructor(
     }
 
     override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
+        currentUrl = url
         webViewClientListener?.loadingStarted()
         webViewClientListener?.urlChanged(url)
     }
@@ -94,15 +95,15 @@ class BrowserWebViewClient @Inject constructor(
 
     @WorkerThread
     override fun shouldInterceptRequest(view: WebView, request: WebResourceRequest): WebResourceResponse? {
-        Timber.v("Intercepting resource ${request.url} on page ${view.urlFromAnyThread()}}")
+        Timber.v("Intercepting resource ${request.url} on page ${currentUrl}}")
 
         if (shouldUpgrade(request)) {
             val newUri = httpsUpgrader.upgrade(request.url)
             view.post { view.loadUrl(newUri.toString()) }
             return WebResourceResponse(null, null, null)
         }
 
-        val documentUrl = view.urlFromAnyThread() ?: return null
+        val documentUrl = currentUrl ?: return null
 
         if (TrustedSites.isTrusted(documentUrl)) {
             return null
@@ -138,26 +139,9 @@ class BrowserWebViewClient @Inject constructor(
      * Utility to function to execute a function, and then return true
      *
      * Useful to reduce clutter in repeatedly including `return true` after doing the real work.
-     */
+     */ 
     private inline fun consume(function: () -> Unit): Boolean {
         function()
         return true
     }
-
-    /**
-     * Access WebView.url from any thread. If you are on the main thread it is more efficient to use
-     * WebView.url directly.
-     */
-    @AnyThread
-    private fun WebView.urlFromAnyThread(): String? {
-        val latch = CountDownLatch(1)
-        var safeUrl: String? = null
-        post {
-            safeUrl = url
-            latch.countDown()
-        }
-        latch.await()
-        return safeUrl
-    }
-
 }

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

@@ -16,6 +16,7 @@
 
 package com.duckduckgo.app.browser
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.support.v4.view.NestedScrollingChild
 import android.support.v4.view.NestedScrollingChildHelper
@@ -44,6 +45,7 @@ class NestedWebView : WebView, NestedScrollingChild {
         isNestedScrollingEnabled = true
     }
 
+    @SuppressLint("ClickableViewAccessibility")
     override fun onTouchEvent(ev: MotionEvent): Boolean {
         var returnValue = false
 

app/src/main/java/com/duckduckgo/app/global/DuckDuckGoApplication.kt

@@ -24,6 +24,7 @@ import com.duckduckgo.app.di.DaggerAppComponent
 import com.duckduckgo.app.job.AppConfigurationSyncer
 import com.duckduckgo.app.migration.LegacyMigration
 import com.duckduckgo.app.trackerdetection.TrackerDataLoader
+import com.squareup.leakcanary.LeakCanary
 import dagger.android.AndroidInjector
 import dagger.android.DispatchingAndroidInjector
 import dagger.android.HasActivityInjector
@@ -56,6 +57,8 @@ class DuckDuckGoApplication : HasActivityInjector, HasServiceInjector, Applicati
     override fun onCreate() {
         super.onCreate()
 
+        if (!installLeakCanary()) return
+
         configureDependencyInjection()
         configureLogging()
         configureCrashReporting()
@@ -66,6 +69,14 @@ class DuckDuckGoApplication : HasActivityInjector, HasServiceInjector, Applicati
         migrateLegacyDb()
     }
 
+    private fun installLeakCanary(): Boolean {
+        if (LeakCanary.isInAnalyzerProcess(this)) {
+            return false;
+        }
+        LeakCanary.install(this);
+        return true
+    }
+
     private fun migrateLegacyDb() {
         doAsync {
             migration.start { favourites, searches ->
@@ -105,7 +116,7 @@ class DuckDuckGoApplication : HasActivityInjector, HasServiceInjector, Applicati
                 .doAfterTerminate({
                     appConfigurationSyncer.scheduleRegularSync(this)
                 })
-                .subscribe({}, { Timber.w(it, "Failed to download initial app configuration") })
+                .subscribe({}, { Timber.w("Failed to download initial app configuration ${it.localizedMessage}") })
     }
 
     override fun activityInjector(): AndroidInjector<Activity> = activityInjector

app/src/main/java/com/duckduckgo/app/job/AppConfigurationDownloader.kt

@@ -38,7 +38,7 @@ class AppConfigurationDownloader @Inject constructor(
         val disconnectDownload = trackerDataDownloader.downloadList(Client.ClientName.DISCONNECT)
         val httpsUpgradeDownload = httpsUpgradeListDownloader.downloadList()
 
-        return Completable.merge(listOf(
+        return Completable.mergeDelayError(listOf(
                 easyListDownload.subscribeOn(Schedulers.io()),
                 easyPrivacyDownload.subscribeOn(Schedulers.io()),
                 trackersWhitelist.subscribeOn(Schedulers.io()),

app/src/main/java/com/duckduckgo/app/job/AppConfigurationJobService.kt

@@ -40,13 +40,13 @@ class AppConfigurationJobService : JobService() {
     override fun onStartJob(params: JobParameters?): Boolean {
         Timber.i("onStartJob")
 
-        appConfigurationDownloader.downloadTask()
+        downloadTask= appConfigurationDownloader.downloadTask()
             .subscribeOn(Schedulers.io())
             .subscribe({
                 Timber.i("Successfully downloaded all data")
                 jobFinishedSuccessfully(params)
             }, {
-                Timber.w(it, "Failed to download app configuration")
+                Timber.w("Failed to download app configuration ${it.localizedMessage}")
                 jobFinishedFailed(params)
             })
 

app/src/main/res/layout/activity_browser.xml

@@ -140,15 +140,12 @@
             android:layout_height="match_parent"
             android:focusableInTouchMode="true" />
 
-        <com.duckduckgo.app.browser.NestedWebView
-            android:id="@+id/webView"
+        <FrameLayout
+            android:id="@+id/webViewContainer"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:visibility="gone"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
-            tools:visibility="visible" />
+            />
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/autoCompleteSuggestionsList"