Merge branch 'release/5.206.0' into main

Author: daxtheduck

.maestro/ads_preview_flows/1-_design-system-components.yaml

@@ -69,7 +69,7 @@ tags:
 - assertVisible: "Expandable Layout"
 - tapOn: "INTERACTIVE"
 - tapOn:
-    id: "com.duckduckgo.mobile.android:id/switch_one"
+    id: "com.duckduckgo.mobile.android:id/dax_switch_one"
 - tapOn:
     id: "com.duckduckgo.mobile.android:id/radio_button_two"
 - tapOn:

ad-click/ad-click-impl/src/main/java/com/duckduckgo/adclick/impl/DuckDuckGoAdClickData.kt

@@ -18,6 +18,7 @@ package com.duckduckgo.adclick.impl
 
 import com.duckduckgo.di.scopes.AppScope
 import com.squareup.anvil.annotations.ContributesBinding
+import java.util.concurrent.ConcurrentHashMap
 import javax.inject.Inject
 import timber.log.Timber
 
@@ -48,7 +49,7 @@ class DuckDuckGoAdClickData @Inject constructor() : AdClickData {
     private var currentPageUrl = ""
     private var activeTabId = ""
     private val tabAdDomains = mutableMapOf<String, String>() // tabId -> adDomain or empty
-    private val tabExemptions = mutableMapOf<String, Exemption>() // tabId -> exemption
+    private val tabExemptions = ConcurrentHashMap<String, Exemption>() // tabId -> exemption
 
     override fun setAdDomainTldPlusOne(adDomainTldPlusOne: String) {
         tabAdDomains[activeTabId] = adDomainTldPlusOne

anrs/anrs-impl/build.gradle

@@ -32,6 +32,7 @@ dependencies {
     implementation project(':common-utils')
     implementation project(':di')
     implementation project(':browser-api')
+    implementation project(':custom-tabs-api')
     implementation project(':statistics')
     implementation project(':verified-installation-api')
     implementation project(':library-loader-api')

anrs/anrs-impl/src/main/java/com/duckduckgo/app/anr/AnrSupervisor.kt

@@ -20,9 +20,9 @@ import android.os.Debug
 import android.os.Handler
 import android.os.Looper
 import com.duckduckgo.app.anrs.store.AnrsDatabase
-import com.duckduckgo.app.browser.customtabs.CustomTabDetector
 import com.duckduckgo.browser.api.BrowserLifecycleObserver
 import com.duckduckgo.browser.api.WebViewVersionProvider
+import com.duckduckgo.customtabs.api.CustomTabDetector
 import com.duckduckgo.di.scopes.AppScope
 import com.squareup.anvil.annotations.ContributesMultibinding
 import dagger.SingleInstanceIn

anrs/anrs-impl/src/main/java/com/duckduckgo/app/anr/RealCrashLogger.kt

@@ -18,11 +18,11 @@ package com.duckduckgo.app.anr
 
 import com.duckduckgo.anrs.api.CrashLogger
 import com.duckduckgo.app.anrs.store.UncaughtExceptionDao
-import com.duckduckgo.app.browser.customtabs.CustomTabDetector
 import com.duckduckgo.app.di.ProcessName
 import com.duckduckgo.appbuildconfig.api.AppBuildConfig
 import com.duckduckgo.browser.api.WebViewVersionProvider
 import com.duckduckgo.common.utils.checkMainThread
+import com.duckduckgo.customtabs.api.CustomTabDetector
 import com.duckduckgo.di.scopes.AppScope
 import com.squareup.anvil.annotations.ContributesBinding
 import javax.inject.Inject

anrs/anrs-impl/src/main/java/com/duckduckgo/app/anr/ndk/NativeCrashInit.kt

@@ -19,13 +19,13 @@ package com.duckduckgo.app.anr.ndk
 import android.content.Context
 import android.util.Log
 import androidx.lifecycle.LifecycleOwner
-import com.duckduckgo.app.browser.customtabs.CustomTabDetector
 import com.duckduckgo.app.di.IsMainProcess
 import com.duckduckgo.app.lifecycle.MainProcessLifecycleObserver
 import com.duckduckgo.app.lifecycle.VpnProcessLifecycleObserver
 import com.duckduckgo.appbuildconfig.api.AppBuildConfig
 import com.duckduckgo.appbuildconfig.api.isInternalBuild
 import com.duckduckgo.common.utils.checkMainThread
+import com.duckduckgo.customtabs.api.CustomTabDetector
 import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.library.loader.LibraryLoader
 import com.duckduckgo.library.loader.LibraryLoader.LibraryLoaderListener

app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/AppTPCompanyTrackersActivity.kt

@@ -29,11 +29,10 @@ import androidx.lifecycle.lifecycleScope
 import com.bumptech.glide.Glide
 import com.duckduckgo.anvil.annotations.InjectWith
 import com.duckduckgo.app.di.AppCoroutineScope
-import com.duckduckgo.app.global.*
 import com.duckduckgo.browser.api.ui.BrowserScreens.WebViewActivityWithParams
 import com.duckduckgo.common.ui.DuckDuckGoActivity
+import com.duckduckgo.common.ui.view.DaxSwitch
 import com.duckduckgo.common.ui.view.InfoPanel
-import com.duckduckgo.common.ui.view.SwitchView
 import com.duckduckgo.common.ui.view.addClickableLink
 import com.duckduckgo.common.ui.view.gone
 import com.duckduckgo.common.ui.view.quietlySetIsChecked
@@ -233,7 +232,7 @@ class AppTPCompanyTrackersActivity : DuckDuckGoActivity() {
         menuInflater.inflate(R.menu.menu_company_trackers_activity, menu)
 
         val switchMenuItem = menu.findItem(R.id.deviceShieldSwitch)
-        appEnabledSwitch = switchMenuItem?.actionView as SwitchView
+        appEnabledSwitch = switchMenuItem?.actionView as DaxSwitch
         appEnabledSwitch.setOnCheckedChangeListener(toggleAppSwitchListener)
         return true
     }

app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/DeviceShieldTrackerActivity.kt

@@ -35,9 +35,9 @@ import com.duckduckgo.appbuildconfig.api.AppBuildConfig
 import com.duckduckgo.browser.api.ui.BrowserScreens.WebViewActivityWithParams
 import com.duckduckgo.common.ui.DuckDuckGoActivity
 import com.duckduckgo.common.ui.view.DaxDialogListener
+import com.duckduckgo.common.ui.view.DaxSwitch
 import com.duckduckgo.common.ui.view.InfoPanel.Companion.APPTP_SETTINGS_ANNOTATION
 import com.duckduckgo.common.ui.view.InfoPanel.Companion.REPORT_ISSUES_ANNOTATION
-import com.duckduckgo.common.ui.view.SwitchView
 import com.duckduckgo.common.ui.view.TypewriterDaxDialog
 import com.duckduckgo.common.ui.view.dialog.StackedAlertDialogBuilder
 import com.duckduckgo.common.ui.view.dialog.TextAlertDialogBuilder
@@ -113,7 +113,7 @@ class DeviceShieldTrackerActivity :
 
     private val binding: ActivityDeviceShieldActivityBinding by viewBinding()
 
-    private lateinit var deviceShieldSwitch: SwitchView
+    private lateinit var deviceShieldSwitch: DaxSwitch
 
     // we might get an update before options menu has been populated; temporarily cache value to use when menu populated
     private var vpnCachedState: VpnState? = null
@@ -596,7 +596,7 @@ class DeviceShieldTrackerActivity :
         menuInflater.inflate(R.menu.menu_device_tracker_activity, menu)
 
         val switchMenuItem = menu.findItem(R.id.deviceShieldSwitch)
-        deviceShieldSwitch = switchMenuItem?.actionView as SwitchView
+        deviceShieldSwitch = switchMenuItem?.actionView as DaxSwitch
         deviceShieldSwitch.setOnCheckedChangeListener(enableAppTPSwitchListener)
         return true
     }

app-tracking-protection/vpn-impl/src/main/res/layout/menu_item_device_tracker_switch.xml

@@ -14,7 +14,7 @@
   ~ limitations under the License.
   -->
 
-<com.duckduckgo.common.ui.view.SwitchView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.duckduckgo.common.ui.view.DaxSwitch xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/deviceShieldTrackerSwitch"
     android:layout_width="wrap_content"

app-tracking-protection/vpn-impl/src/main/res/layout/row_exclusion_list_app.xml

@@ -22,7 +22,7 @@
     android:gravity="center"
     android:orientation="horizontal"
     android:background="?attr/selectableItemBackground"
-    android:minHeight="@dimen/twoLineItemWithLargeImageHeight">
+    android:minHeight="@dimen/oneLineItemWithLargeImageHeight">
 
     <ImageView
         android:id="@+id/deviceShieldAppEntryIcon"
@@ -58,7 +58,7 @@
         app:typography="caption"
         tools:text="App issues may occur if enabled" />
 
-    <com.duckduckgo.common.ui.view.SwitchView
+    <com.duckduckgo.common.ui.view.DaxSwitch
         android:id="@+id/deviceShieldAppEntryShieldEnabled"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -86,7 +86,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.541"
         app:layout_constraintVertical_chainStyle="packed"
-        app:typography="h4"
+        app:typography="body1"
         tools:text="Facebook" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>