Merge branch 'release/5.204.0' into main

Author: daxtheduck

app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/feature/AppTpRemoteFeatures.kt

@@ -69,8 +69,10 @@ class AppTpRemoteFeaturesStore @Inject constructor(
 
     private val togglesCache = ConcurrentHashMap<String, State>()
 
-    private val preferences: SharedPreferences by lazy {
-        sharedPreferencesProvider.getSharedPreferences(PREFS_FILENAME, multiprocess = true, migrate = false)
+    private val preferences: SharedPreferences? by lazy {
+        runCatching {
+            sharedPreferencesProvider.getSharedPreferences(PREFS_FILENAME, multiprocess = true, migrate = false)
+        }.getOrNull()
     }
     private val stateAdapter: JsonAdapter<State> by lazy {
         moshi.newBuilder().add(KotlinJsonAdapterFactory()).build().adapter(State::class.java)
@@ -90,14 +92,14 @@ class AppTpRemoteFeaturesStore @Inject constructor(
 
     init {
         coroutineScope.launch(dispatcherProvider.io()) {
-            preferences.load()
-            preferences.registerOnSharedPreferenceChangeListener(listener)
+            preferences?.load()
+            preferences?.registerOnSharedPreferenceChangeListener(listener)
         }
     }
 
     override fun set(key: String, state: State) {
         togglesCache[key] = state
-        preferences.save(key, state)
+        preferences?.save(key, state)
     }
 
     override fun get(key: String): State? {
@@ -112,7 +114,7 @@ class AppTpRemoteFeaturesStore @Inject constructor(
 
     private suspend fun SharedPreferences.load() = withContext(dispatcherProvider.io()) {
         togglesCache.clear()
-        preferences.all.keys.forEach { key ->
+        preferences?.all?.keys?.forEach { key ->
             load(key)?.let {
                 togglesCache[key] = it
             }

app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/pixels/DeviceShieldPixelNames.kt

@@ -224,6 +224,7 @@ enum class DeviceShieldPixelNames(override val pixelName: String, val enqueue: B
 
     VPN_MOTO_G_FIX_DAILY("m_vpn_ev_moto_g_fix_d", enqueue = true),
     VPN_START_ATTEMPT("m_vpn_ev_start_attempt_c", enqueue = true),
+    VPN_START_ATTEMPT_SUCCESS("m_vpn_ev_start_attempt_success_c", enqueue = true),
     VPN_START_ATTEMPT_FAILURE("m_vpn_ev_start_attempt_failure_c", enqueue = true),
     ;
 }

app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/pixels/DeviceShieldPixels.kt

@@ -361,6 +361,8 @@ interface DeviceShieldPixels {
     fun reportMotoGFix()
 
     fun reportVpnStartAttempt()
+
+    fun reportVpnStartAttemptSuccess()
 }
 
 @ContributesBinding(AppScope::class)
@@ -774,6 +776,10 @@ class RealDeviceShieldPixels @Inject constructor(
         firePixel(DeviceShieldPixelNames.VPN_START_ATTEMPT)
     }
 
+    override fun reportVpnStartAttemptSuccess() {
+        firePixel(DeviceShieldPixelNames.VPN_START_ATTEMPT_SUCCESS)
+    }
+
     private fun suddenKill() {
         firePixel(DeviceShieldPixelNames.ATP_KILLED)
     }

app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/service/DeviceShieldTileService.kt

@@ -87,7 +87,7 @@ class DeviceShieldTileService : TileService() {
         }
     }
 
-    @SuppressLint("NewApi") // IDE doesn't get we use appBuildConfig
+    @SuppressLint("NewApi", "StartActivityAndCollapseDeprecated") // IDE doesn't get we use appBuildConfig
     private fun launchActivity() {
         val intent = Intent(this, VpnPermissionRequesterActivity::class.java).apply { addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) }
         if (appBuildConfig.sdkInt >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {

app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/service/TrackerBlockingVpnService.kt

@@ -393,6 +393,8 @@ class TrackerBlockingVpnService : VpnService(), CoroutineScope by MainScope(), V
             stopVpn(VpnStopReason.ERROR, true)
         }
 
+        deviceShieldPixels.reportVpnStartAttemptSuccess()
+
         // This is something temporary while we confirm whether we're able to fix the moto g issues with appTP
         // see https://app.asana.com/0/488551667048375/1203410036713941/f for more info
         tunnelConfig?.let { config ->

app-tracking-protection/vpn-impl/src/test/java/com/duckduckgo/mobile/android/vpn/feature/AppTpRemoteFeaturesStoreTest.kt

@@ -9,6 +9,7 @@ import com.duckduckgo.feature.toggles.api.Toggle
 import com.duckduckgo.feature.toggles.api.Toggle.State
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import java.io.IOException
 import kotlinx.coroutines.test.runTest
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
@@ -115,4 +116,34 @@ class AppTpRemoteFeaturesStoreTest {
 
         assertEquals(expected, appTpRemoteFeaturesStore.get("key"))
     }
+
+    @Test
+    fun `test shared preferences creation exception`() {
+        val appTpRemoteFeaturesStore = AppTpRemoteFeaturesStore(
+            coroutineRule.testScope,
+            coroutineRule.testDispatcherProvider,
+            object : SharedPreferencesProvider {
+                override fun getSharedPreferences(
+                    name: String,
+                    multiprocess: Boolean,
+                    migrate: Boolean,
+                ): SharedPreferences {
+                    throw IOException("test")
+                }
+
+                override fun getEncryptedSharedPreferences(
+                    name: String,
+                    multiprocess: Boolean,
+                ): SharedPreferences? {
+                    throw IOException("test")
+                }
+            },
+            Moshi.Builder().build(),
+        )
+
+        assertNull(appTpRemoteFeaturesStore.get("key"))
+        val expected = State(enable = true)
+        appTpRemoteFeaturesStore.set("key", expected)
+        assertEquals(expected, appTpRemoteFeaturesStore.get("key"))
+    }
 }

app/build.gradle

@@ -166,6 +166,8 @@ fladle {
 }
 
 dependencies {
+	implementation project(":history-impl")
+	implementation project(":history-api")
 	implementation project(":data-store-impl")
 	implementation project(":data-store-api")
 	implementation project(":verified-installation-impl")

app/lint-baseline.xml

@@ -162,28 +162,6 @@
             column="42"/>
     </issue>
 
-    <issue
-        id="MissingQuantity"
-        message="For locale &quot;fr&quot; (French) the following quantities should also be defined: `many`"
-        errorLine1="    &lt;plurals name=&quot;daxTrackersBlockedCtaText&quot;>"
-        errorLine2="    ^">
-        <location
-            file="src/main/res/values-fr/strings.xml"
-            line="417"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="MissingQuantity"
-        message="For locale &quot;fr&quot; (French) the following quantities should also be defined: `many`"
-        errorLine1="    &lt;plurals name=&quot;daxTrackersBlockedCtaZeroText&quot;>"
-        errorLine2="    ^">
-        <location
-            file="src/main/res/values-fr/strings.xml"
-            line="421"
-            column="5"/>
-    </issue>
-
     <issue
         id="MissingQuantity"
         message="For locale &quot;fr&quot; (French) the following quantities should also be defined: `many`"
@@ -1977,28 +1955,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="UnusedQuantity"
-        message="For language &quot;hr&quot; (Croatian) the following quantities are not relevant: `many`"
-        errorLine1="    &lt;plurals name=&quot;daxTrackersBlockedCtaText&quot;>"
-        errorLine2="    ^">
-        <location
-            file="src/main/res/values-hr/strings.xml"
-            line="417"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="UnusedQuantity"
-        message="For language &quot;hr&quot; (Croatian) the following quantities are not relevant: `many`"
-        errorLine1="    &lt;plurals name=&quot;daxTrackersBlockedCtaZeroText&quot;>"
-        errorLine2="    ^">
-        <location
-            file="src/main/res/values-hr/strings.xml"
-            line="423"
-            column="5"/>
-    </issue>
-
     <issue
         id="UnusedQuantity"
         message="For language &quot;hr&quot; (Croatian) the following quantities are not relevant: `many`"