Merge branch 'release/5.11.0'

Author: subsymbolic

.gitignore

@@ -41,3 +41,6 @@ captures/
 
 # Keystore files
 *.jks
+
+# Fastlane
+fastlane/report.xml

Gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "fastlane"
+
+plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
+eval_gemfile(plugins_path) if File.exist?(plugins_path)

Gemfile.lock

@@ -0,0 +1,150 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.0)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    atomos (0.1.3)
+    babosa (1.0.2)
+    claide (1.0.2)
+    colored (1.2)
+    colored2 (3.1.2)
+    commander-fastlane (4.4.6)
+      highline (~> 1.7.2)
+    declarative (0.0.10)
+    declarative-option (0.1.0)
+    domain_name (0.5.20180417)
+      unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.5.0)
+    emoji_regex (0.1.1)
+    excon (0.62.0)
+    faraday (0.15.3)
+      multipart-post (>= 1.2, < 3)
+    faraday-cookie_jar (0.0.6)
+      faraday (>= 0.7.4)
+      http-cookie (~> 1.0.0)
+    faraday_middleware (0.12.2)
+      faraday (>= 0.7.4, < 1.0)
+    fastimage (2.1.4)
+    fastlane (2.104.0)
+      CFPropertyList (>= 2.3, < 4.0.0)
+      addressable (>= 2.3, < 3.0.0)
+      babosa (>= 1.0.2, < 2.0.0)
+      bundler (>= 1.12.0, < 2.0.0)
+      colored
+      commander-fastlane (>= 4.4.6, < 5.0.0)
+      dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (~> 0.1)
+      excon (>= 0.45.0, < 1.0.0)
+      faraday (~> 0.9)
+      faraday-cookie_jar (~> 0.0.6)
+      faraday_middleware (~> 0.9)
+      fastimage (>= 2.1.0, < 3.0.0)
+      gh_inspector (>= 1.1.2, < 2.0.0)
+      google-api-client (>= 0.21.2, < 0.24.0)
+      highline (>= 1.7.2, < 2.0.0)
+      json (< 3.0.0)
+      mini_magick (~> 4.5.1)
+      multi_json
+      multi_xml (~> 0.5)
+      multipart-post (~> 2.0.0)
+      plist (>= 3.1.0, < 4.0.0)
+      public_suffix (~> 2.0.0)
+      rubyzip (>= 1.2.2, < 2.0.0)
+      security (= 0.1.3)
+      simctl (~> 1.6.3)
+      slack-notifier (>= 2.0.0, < 3.0.0)
+      terminal-notifier (>= 1.6.2, < 2.0.0)
+      terminal-table (>= 1.4.5, < 2.0.0)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
+      word_wrap (~> 1.0.0)
+      xcodeproj (>= 1.6.0, < 2.0.0)
+      xcpretty (~> 0.3.0)
+      xcpretty-travis-formatter (>= 0.0.3)
+    fastlane-plugin-property_file_read (1.0.1)
+    gh_inspector (1.1.3)
+    google-api-client (0.23.9)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (>= 0.5, < 0.7.0)
+      httpclient (>= 2.8.1, < 3.0)
+      mime-types (~> 3.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.0)
+      signet (~> 0.9)
+    googleauth (0.6.6)
+      faraday (~> 0.12)
+      jwt (>= 1.4, < 3.0)
+      memoist (~> 0.12)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (~> 0.7)
+    highline (1.7.10)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    httpclient (2.8.3)
+    json (2.1.0)
+    jwt (2.1.0)
+    memoist (0.16.0)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2018.0812)
+    mini_magick (4.5.1)
+    multi_json (1.13.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    nanaimo (0.2.6)
+    naturally (2.2.0)
+    os (1.0.0)
+    plist (3.4.0)
+    public_suffix (2.0.5)
+    representable (3.0.4)
+      declarative (< 0.1.0)
+      declarative-option (< 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.2)
+    rouge (2.0.7)
+    rubyzip (1.2.2)
+    security (0.1.3)
+    signet (0.9.2)
+      addressable (~> 2.3)
+      faraday (~> 0.9)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    simctl (1.6.5)
+      CFPropertyList
+      naturally
+    slack-notifier (2.3.2)
+    terminal-notifier (1.8.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    tty-cursor (0.6.0)
+    tty-screen (0.6.5)
+    tty-spinner (0.8.0)
+      tty-cursor (>= 0.5.0)
+    uber (0.1.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.5)
+    unicode-display_width (1.4.0)
+    word_wrap (1.0.0)
+    xcodeproj (1.6.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.2.6)
+    xcpretty (0.3.0)
+      rouge (~> 2.0.7)
+    xcpretty-travis-formatter (1.0.0)
+      xcpretty (~> 0.2, >= 0.0.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fastlane
+  fastlane-plugin-property_file_read
+
+BUNDLED WITH
+   1.16.4

app/build.gradle

@@ -6,7 +6,6 @@ apply plugin: 'kotlin-kapt'
 apply from: '../versioning.gradle'
 
 ext {
-    VERSION_NAME = "5.10.6"
     USE_ORCHESTRATOR = project.hasProperty('orchestrator') ? project.property('orchestrator') : false
 }
 
@@ -17,7 +16,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 28
         versionCode buildVersionCode()
-        versionName VERSION_NAME
+        versionName buildVersionName()
         testInstrumentationRunner "com.duckduckgo.app.TestRunner"
         archivesBaseName = "duckduckgo-$versionName"
 
@@ -87,6 +86,7 @@ ext {
     glide = "4.6.1"
     androidTestRunner = "1.0.2"
     lottieVersion = "2.6.0-beta19"
+    okHttp = "3.10.0"
 }
 
 
@@ -100,7 +100,7 @@ dependencies {
     implementation "com.android.support:appcompat-v7:$supportLibrary"
     implementation "com.android.support:design:$supportLibrary"
     implementation "com.android.support.constraint:constraint-layout:1.1.0"
-    implementation "com.squareup.okhttp3:okhttp:3.10.0"
+    implementation "com.squareup.okhttp3:okhttp:$okHttp"
     implementation "com.squareup.retrofit2:retrofit:$retrofit"
     implementation "com.squareup.retrofit2:converter-moshi:$retrofit"
     implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofit"
@@ -157,6 +157,7 @@ dependencies {
     androidTestUtil "com.android.support.test:orchestrator:1.0.2"
     androidTestImplementation "com.android.support.test.espresso:espresso-core:3.0.2"
     androidTestImplementation "org.mockito:mockito-android:2.15.0"
+    androidTestImplementation "com.squareup.okhttp3:mockwebserver:$okHttp"
     androidTestImplementation "com.nhaarman:mockito-kotlin-kt1.1:1.5.0"
 
 }

app/src/androidTest/java/com/duckduckgo/app/FileUtilities.kt

@@ -16,13 +16,16 @@
 
 package com.duckduckgo.app
 
+import java.io.BufferedReader
+
 object FileUtilities {
 
-    fun loadText(resourceName: String): String =
-        javaClass.classLoader.getResource(resourceName).openStream().bufferedReader().use { it.readText() }
+    fun loadText(resourceName: String): String = readResource(resourceName).use { it.readText() }
 
+    fun loadLines(resourceName: String): List<String> = readResource(resourceName).use { it.readLines() }
 
-    fun loadLines(resourceName: String): List<String> =
-        javaClass.classLoader.getResource(resourceName).openStream().bufferedReader().use { it.readLines() }
+    private fun readResource(resourceName: String): BufferedReader {
+        return javaClass.classLoader!!.getResource(resourceName).openStream().bufferedReader()
+    }
 
 }

app/src/androidTest/java/com/duckduckgo/app/TestApplication.kt

@@ -29,10 +29,10 @@ class TestApplication : DuckDuckGoApplication() {
      */
 
     override fun configureDependencyInjection() {
-        DaggerTestAppComponent.builder()
+        daggerAppComponent = DaggerTestAppComponent.builder()
             .application(this)
-            .create(this)
-            .inject(this)
+            .build()
+        daggerAppComponent.inject(this)
     }
 
     // We don't need to actually use leak canary for tests

app/src/androidTest/java/com/duckduckgo/app/TestExtensions.kt

@@ -18,6 +18,8 @@ package com.duckduckgo.app
 
 import android.arch.lifecycle.LiveData
 import android.arch.lifecycle.Observer
+import android.support.test.InstrumentationRegistry
+import com.duckduckgo.app.di.TestAppComponent
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 
@@ -32,4 +34,12 @@ fun <T> LiveData<T>.blockingObserve(): T? {
     observeForever(innerObserver)
     latch.await(2, TimeUnit.SECONDS)
     return value
+}
+
+fun getApp(): TestApplication {
+    return InstrumentationRegistry.getTargetContext().applicationContext as TestApplication
+}
+
+fun getDaggerComponent(): TestAppComponent {
+    return getApp().daggerAppComponent as TestAppComponent
 }

app/src/androidTest/java/com/duckduckgo/app/browser/WebDataManagerTest.kt renamed to app/src/androidTest/java/com/duckduckgo/app/browser/WebViewDataManagerTest.kt

@@ -29,15 +29,15 @@ import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.mockito.ArgumentCaptor
 
-class WebDataManagerTest {
+class WebViewDataManagerTest {
 
     private inline fun <reified T : Any> argumentCaptor() = ArgumentCaptor.forClass(T::class.java)
 
     private val mockCookieManager: CookieManager = mock()
 
     private val mockStorage: WebStorage = mock()
 
-    private val testee = WebDataManager(host, WebViewSessionInMemoryStorage())
+    private val testee = WebViewDataManager(host, WebViewSessionInMemoryStorage())
 
     @UiThreadTest
     @Test

app/src/androidTest/java/com/duckduckgo/app/browser/WebViewLongPressHandlerTest.kt

@@ -16,11 +16,15 @@
 
 package com.duckduckgo.app.browser
 
+import android.support.test.InstrumentationRegistry
 import android.view.ContextMenu
 import android.view.MenuItem
 import android.webkit.WebView.HitTestResult
 import com.duckduckgo.app.statistics.pixels.Pixel
-import com.nhaarman.mockito_kotlin.*
+import com.nhaarman.mockito_kotlin.eq
+import com.nhaarman.mockito_kotlin.never
+import com.nhaarman.mockito_kotlin.verify
+import com.nhaarman.mockito_kotlin.whenever
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Before
@@ -46,10 +50,12 @@ class WebViewLongPressHandlerTest {
     @Mock
     private lateinit var mockPixel: Pixel
 
+    private var context = InstrumentationRegistry.getTargetContext()
+
     @Before
     fun setup() {
         MockitoAnnotations.initMocks(this)
-        testee = WebViewLongPressHandler(mockPixel)
+        testee = WebViewLongPressHandler(context, mockPixel)
     }
 
     @Test
@@ -71,27 +77,39 @@ class WebViewLongPressHandlerTest {
     }
 
     @Test
-    fun whenLongPressedWithImageTypeThenImageOptionsHeaderAddedToMenu() {
+    fun whenLongPressedWithImageTypeThenUrlHeaderAddedToMenu() {
         testee.handleLongPress(HitTestResult.IMAGE_TYPE, HTTPS_IMAGE_URL, mockMenu)
-        verify(mockMenu).setHeaderTitle(R.string.imageOptions)
+        verify(mockMenu).setHeaderTitle(HTTPS_IMAGE_URL)
+    }
+
+    @Test
+    fun whenLongPressedWithAnchorImageTypeThenUrlHeaderAddedToMenu() {
+        testee.handleLongPress(HitTestResult.SRC_IMAGE_ANCHOR_TYPE, HTTPS_IMAGE_URL, mockMenu)
+        verify(mockMenu).setHeaderTitle(HTTPS_IMAGE_URL)
     }
 
     @Test
-    fun whenLongPressedWithAnchorImageTypeThenImageOptionsHeaderAddedToMenu() {
+    fun whenLongPressedWithAnchorImageTypeThenTabOptionsHeaderAddedToMenu() {
         testee.handleLongPress(HitTestResult.SRC_IMAGE_ANCHOR_TYPE, HTTPS_IMAGE_URL, mockMenu)
-        verify(mockMenu).setHeaderTitle(R.string.imageOptions)
+        verifyNewForegroundTabItemAdded()
+    }
+
+    @Test
+    fun whenLongPressedWithAnchorImageTypeThenBgTabOptionsHeaderAddedToMenu() {
+        testee.handleLongPress(HitTestResult.SRC_IMAGE_ANCHOR_TYPE, HTTPS_IMAGE_URL, mockMenu)
+        verifyNewBackgroundTabItemAdded()
     }
 
     @Test
     fun whenLongPressedWithImageTypeThenDownloadImageMenuAdded() {
         testee.handleLongPress(HitTestResult.IMAGE_TYPE, HTTPS_IMAGE_URL, mockMenu)
-        verify(mockMenu).add(anyInt(), eq(WebViewLongPressHandler.CONTEXT_MENU_ID_DOWNLOAD_IMAGE), anyInt(), eq(R.string.downloadImage))
+        verifyDownloadImageItemAdded()
     }
 
     @Test
     fun whenLongPressedWithAnchorImageTypeThenDownloadImageMenuAdded() {
         testee.handleLongPress(HitTestResult.SRC_IMAGE_ANCHOR_TYPE, HTTPS_IMAGE_URL, mockMenu)
-        verify(mockMenu).add(anyInt(), eq(WebViewLongPressHandler.CONTEXT_MENU_ID_DOWNLOAD_IMAGE), anyInt(), eq(R.string.downloadImage))
+        verifyDownloadImageItemAdded()
     }
 
     @Test
@@ -103,7 +121,7 @@ class WebViewLongPressHandlerTest {
     @Test
     fun whenLongPressedWithImageTypeWhichIsADataUriThenDownloadImageMenuAdded() {
         testee.handleLongPress(HitTestResult.IMAGE_TYPE, DATA_URI_IMAGE_URL, mockMenu)
-        verify(mockMenu).add(anyInt(), eq(WebViewLongPressHandler.CONTEXT_MENU_ID_DOWNLOAD_IMAGE), anyInt(), eq(R.string.downloadImage))
+        verifyDownloadImageItemAdded()
     }
 
     @Test
@@ -128,9 +146,19 @@ class WebViewLongPressHandlerTest {
         assertTrue(action == LongPressHandler.RequiredAction.None)
     }
 
+    private fun verifyDownloadImageItemAdded() {
+        verify(mockMenu).add(anyInt(), eq(WebViewLongPressHandler.CONTEXT_MENU_ID_DOWNLOAD_IMAGE), anyInt(), eq(R.string.downloadImage))
+    }
+
+    private fun verifyNewForegroundTabItemAdded() {
+        verify(mockMenu).add(anyInt(), eq(WebViewLongPressHandler.CONTEXT_MENU_ID_OPEN_IN_NEW_TAB), anyInt(), eq(R.string.openInNewTab))
+    }
+
+    private fun verifyNewBackgroundTabItemAdded() {
+        verify(mockMenu).add(anyInt(), eq(WebViewLongPressHandler.CONTEXT_MENU_ID_OPEN_IN_NEW_BACKGROUND_TAB), anyInt(), eq(R.string.openInNewBackgroundTab))
+    }
+
     private fun verifyMenuNotAltered() {
-        verify(mockMenu, never()).setHeaderTitle(anyString())
-        verify(mockMenu, never()).setHeaderTitle(anyInt())
         verify(mockMenu, never()).add(anyInt())
         verify(mockMenu, never()).add(anyString())
         verify(mockMenu, never()).add(anyInt(), anyInt(), anyInt(), anyInt())