Merge branch 'release/5.10.3'

duckduckgo · Sep 18, 2018 · 0a069c2 · 0a069c2
2 parents 887f070 + 6b593f5
commit 0a069c2
Show file tree

Hide file tree

Showing 194 changed files with 4,799 additions and 2,159 deletions.
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -11,31 +11,31 @@ cmake_minimum_required(VERSION 3.4.1)
 # Gradle automatically packages shared libraries with your APK.
 
 add_library( # Sets the name of the library.
-             adblockclient-lib
+        adblockclient-lib
 
-             # Sets the library as a shared library.
-             SHARED
+        # Sets the library as a shared library.
+        SHARED
 
-             # Provides a relative path to your source file(s).
-             src/main/cpp/adblockclient-lib.cpp
-             src/main/cpp/third-party/ad-block/ad_block_client.cc
-             src/main/cpp/third-party/ad-block/cosmetic_filter.cc
-             src/main/cpp/third-party/ad-block/filter.cc
-             src/main/cpp/third-party/bloom-filter-cpp/BloomFilter.cpp
-             src/main/cpp/third-party/bloom-filter-cpp/hashFn.cpp
-             src/main/cpp/third-party/hashset-cpp/HashSet.cpp
-            )
+        # Provides a relative path to your source file(s).
+        src/main/cpp/adblockclient-lib.cpp
+        src/main/cpp/third-party/ad-block/ad_block_client.cc
+        src/main/cpp/third-party/ad-block/cosmetic_filter.cc
+        src/main/cpp/third-party/ad-block/filter.cc
+        src/main/cpp/third-party/bloom-filter-cpp/BloomFilter.cpp
+        src/main/cpp/third-party/bloom-filter-cpp/hashFn.cpp
+        src/main/cpp/third-party/hashset-cpp/HashSet.cpp
+        )
 
 add_library( # Sets the name of the library.
-             https-bloom-lib
+        https-bloom-lib
 
-             # Sets the library as a shared library.
-             SHARED
+        # Sets the library as a shared library.
+        SHARED
 
-             # Provides a relative path to your source file(s).
-             src/main/cpp/https-bloom-lib.cpp
-             src/main/cpp/third-party/bloom_cpp/src/BloomFilter.cpp
-            )
+        # Provides a relative path to your source file(s).
+        src/main/cpp/https-bloom-lib.cpp
+        src/main/cpp/third-party/bloom_cpp/src/BloomFilter.cpp
+        )
 
 # Searches for a specified prebuilt library and stores the path as a
 # variable. Because CMake includes system libraries in the search path by
@@ -44,19 +44,19 @@ add_library( # Sets the name of the library.
 # completing its build.
 
 find_library( # Sets the name of the path variable.
-              log-lib
+        log-lib
 
-              # Specifies the name of the NDK library that
-              # you want CMake to locate.
-              log )
+        # Specifies the name of the NDK library that
+        # you want CMake to locate.
+        log)
 
 # Specifies libraries CMake should link to your target library. You
 # can link multiple libraries, such as libraries you define in this
 # build script, prebuilt third-party libraries, or system libraries.
 
 target_link_libraries( # Specifies the target library.
-                       adblockclient-lib
+        adblockclient-lib
 
-                       # Links the target library to the log library
-                       # included in the NDK.
-                       ${log-lib} )
+        # Links the target library to the log library
+        # included in the NDK.
+        ${log-lib})
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,7 +6,7 @@ apply plugin: 'kotlin-kapt'
 apply from: '../versioning.gradle'
 
 ext {
-    VERSION_NAME = "5.10.2"
+    VERSION_NAME = "5.10.3"
     USE_ORCHESTRATOR = project.hasProperty('orchestrator') ? project.property('orchestrator') : false
 }
 

diff --git a/app/src/androidTest/java/com/duckduckgo/app/TestApplication.kt b/app/src/androidTest/java/com/duckduckgo/app/TestApplication.kt
@@ -30,9 +30,9 @@ class TestApplication : DuckDuckGoApplication() {
 
     override fun configureDependencyInjection() {
         DaggerTestAppComponent.builder()
-                .application(this)
-                .create(this)
-                .inject(this)
+            .application(this)
+            .create(this)
+            .inject(this)
     }
 
     // We don't need to actually use leak canary for tests

diff --git a/app/src/androidTest/java/com/duckduckgo/app/bookmarks/db/BookmarksDaoTest.kt b/app/src/androidTest/java/com/duckduckgo/app/bookmarks/db/BookmarksDaoTest.kt
@@ -39,8 +39,8 @@ class BookmarksDaoTest {
     @Before
     fun before() {
         db = Room.inMemoryDatabaseBuilder(InstrumentationRegistry.getContext(), AppDatabase::class.java)
-                .allowMainThreadQueries()
-                .build()
+            .allowMainThreadQueries()
+            .build()
         dao = db.bookmarksDao()
     }
 

diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt
@@ -32,8 +32,6 @@ import com.duckduckgo.app.browser.BrowserTabViewModel.Command.DisplayMessage
 import com.duckduckgo.app.browser.BrowserTabViewModel.Command.Navigate
 import com.duckduckgo.app.browser.LongPressHandler.RequiredAction.DownloadFile
 import com.duckduckgo.app.browser.LongPressHandler.RequiredAction.OpenInNewTab
-import com.duckduckgo.app.browser.defaultBrowsing.DefaultBrowserDetector
-import com.duckduckgo.app.browser.defaultBrowsing.DefaultBrowserNotification
 import com.duckduckgo.app.browser.favicon.FaviconDownloader
 import com.duckduckgo.app.browser.omnibar.OmnibarEntryConverter
 import com.duckduckgo.app.browser.session.WebViewSessionStorage
@@ -47,7 +45,6 @@ import com.duckduckgo.app.privacy.db.SiteVisitedEntity
 import com.duckduckgo.app.privacy.model.PrivacyGrade
 import com.duckduckgo.app.privacy.store.TermsOfServiceStore
 import com.duckduckgo.app.settings.db.SettingsDataStore
-import com.duckduckgo.app.statistics.VariantManager
 import com.duckduckgo.app.statistics.api.StatisticsUpdater
 import com.duckduckgo.app.tabs.model.TabRepository
 import com.duckduckgo.app.trackerdetection.model.TrackerNetwork
@@ -104,21 +101,12 @@ class BrowserTabViewModelTest {
     @Mock
     private lateinit var mockOmnibarConverter: OmnibarEntryConverter
 
-    @Mock
-    private lateinit var mockDefaultBrowserDetector: DefaultBrowserDetector
-
-    @Mock
-    private lateinit var mockDefaultBrowserNotification: DefaultBrowserNotification
-
     @Mock
     private lateinit var mockTabsRepository: TabRepository
 
     @Mock
     private lateinit var webViewSessionStorage: WebViewSessionStorage
 
-    @Mock
-    private lateinit var variantManager: VariantManager
-
     @Mock
     private lateinit var mockFaviconDownloader: FaviconDownloader
 
@@ -154,14 +142,11 @@ class BrowserTabViewModelTest {
             autoCompleteApi = mockAutoCompleteApi,
             appSettingsPreferencesStore = mockSettingsStore,
             bookmarksDao = bookmarksDao,
-            defaultBrowserNotification = mockDefaultBrowserNotification,
-            defaultBrowserDetector = mockDefaultBrowserDetector,
             longPressHandler = mockLongPressHandler,
             appConfigurationDao = appConfigurationDao,
             webViewSessionStorage = webViewSessionStorage,
             specialUrlDetector = SpecialUrlDetector(),
-            faviconDownloader = mockFaviconDownloader,
-            variantManager = variantManager
+            faviconDownloader = mockFaviconDownloader
         )
 
         testee.loadData("abc", null)