Revert "Merge branch 'release/5.218.0'"

This reverts commit 9e3a39f, reversing
changes made to d37c5f7.

Author: anikiki

.bundle/config

@@ -1,4 +1,4 @@
-name: Release - Create Release Task in Asana
+name: Create Android App Release Task
 
 on:
   workflow_dispatch:

.github/workflows/release_create_tag.yml

@@ -106,9 +106,6 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
-    fastlane-plugin-firebase_app_distribution (0.9.1)
-      google-apis-firebaseappdistribution_v1 (~> 0.3.0)
-      google-apis-firebaseappdistribution_v1alpha (~> 0.2.0)
     fastlane-plugin-property_file_read (1.0.1)
     gh_inspector (1.1.3)
     google-apis-androidpublisher_v3 (0.53.0)
@@ -122,10 +119,6 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-firebaseappdistribution_v1 (0.3.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-firebaseappdistribution_v1alpha (0.2.0)
-      google-apis-core (>= 0.11.0, < 2.a)
     google-apis-iamcredentials_v1 (0.17.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-playcustomapp_v1 (0.13.0)
@@ -220,7 +213,6 @@ PLATFORMS
 
 DEPENDENCIES
   fastlane
-  fastlane-plugin-firebase_app_distribution
   fastlane-plugin-property_file_read
 
 BUNDLED WITH

.github/workflows/release_create_task.yml

@@ -107,7 +107,6 @@ class ContributesRemoteFeatureCodeGenerator : CodeGenerator {
                                     )
                                     .build(),
                             )
-                            .addParameter("callback", featureTogglesCallback.asClassName(module))
                             .addParameter("appBuildConfig", appBuildConfig.asClassName(module))
                             .addParameter("variantManager", variantManager.asClassName(module))
                             .addCode(
@@ -119,7 +118,6 @@ class ContributesRemoteFeatureCodeGenerator : CodeGenerator {
                                 .featureName(%S)
                                 .appVariantProvider({ appBuildConfig.variantName })
                                 .localeProvider({ appBuildConfig.deviceLocale })
-                                .callback(callback)
                                 // save empty variants will force the default variant to be set
                                 .forceDefaultVariantProvider({ variantManager.updateVariants(emptyList()) })
                                 .build()
@@ -1153,7 +1151,6 @@ class ContributesRemoteFeatureCodeGenerator : CodeGenerator {
         private val context = FqName("android.content.Context")
         private val privacyFeaturePlugin = FqName("com.duckduckgo.privacy.config.api.PrivacyFeaturePlugin")
         private val appBuildConfig = FqName("com.duckduckgo.appbuildconfig.api.AppBuildConfig")
-        private val featureTogglesCallback = FqName("com.duckduckgo.feature.toggles.internal.api.FeatureTogglesCallback")
         private val variantManager = FqName("com.duckduckgo.experiments.api.VariantManager")
         private val buildFlavorInternal = FqName("com.duckduckgo.appbuildconfig.api.BuildFlavor.INTERNAL")
         private val moshi = FqName("com.squareup.moshi.Moshi")

.github/workflows/release_production.yml

@@ -26,15 +26,7 @@ interface Vpn {
     suspend fun start()
 
     /**
-     * Pauses the VPN tunnel.
-     * All features that were registered to use the VPN tunnel (eg. AppTP, NetP) continue to be registered and so a subsequent
-     * [start] call will re-enable them all
-     */
-    suspend fun pause()
-
-    /**
-     * Stops the VPN tunnel AND all features registered to use the VPN tunnel (eg. AppTP, NetP). A subsequent call to [start]
-     * will not re-start the VPN because no feature would be registered.
+     * Disable the device VPN by stopping the VPN service
      */
     suspend fun stop()
 

.github/workflows/release_report_error.yml

@@ -21,33 +21,20 @@ import android.content.SharedPreferences
 import androidx.core.content.edit
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.data.store.api.SharedPreferencesProvider
-import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.mobile.android.vpn.service.TrackerBlockingVpnService
-import com.squareup.anvil.annotations.ContributesBinding
-import dagger.SingleInstanceIn
 import java.util.UUID
-import javax.inject.Inject
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.withContext
 import logcat.logcat
 
 private const val PREFS_FILENAME = "com.duckduckgo.mobile.android.vpn.feature.registry.v1"
 private const val IS_INITIALIZED = "IS_INITIALIZED"
 
-@ContributesBinding(
-    scope = AppScope::class,
-    boundType = VpnFeaturesRegistry::class,
-)
-@ContributesBinding(
-    scope = AppScope::class,
-    boundType = Vpn::class,
-)
-@SingleInstanceIn(AppScope::class)
-class VpnFeaturesRegistryImpl @Inject constructor(
+internal class VpnFeaturesRegistryImpl(
     private val vpnServiceWrapper: VpnServiceWrapper,
     private val sharedPreferencesProvider: SharedPreferencesProvider,
     private val dispatcherProvider: DispatcherProvider,
-) : VpnFeaturesRegistry, Vpn {
+) : VpnFeaturesRegistry {
 
     private val mutex = Mutex()
 
@@ -116,34 +103,6 @@ class VpnFeaturesRegistryImpl @Inject constructor(
     private fun registeredFeatures(): Map<String, Any?> {
         return preferences.all.filter { it.key != IS_INITIALIZED }
     }
-
-    override suspend fun start() = withContext(dispatcherProvider.io()) {
-        vpnServiceWrapper.startService()
-    }
-
-    override suspend fun pause() {
-        vpnServiceWrapper.stopService()
-    }
-
-    override suspend fun stop() {
-        try {
-            mutex.lock()
-            // unregister all features
-            getRegisteredFeatures().onEach {
-                preferences.edit(commit = true) {
-                    remove(it.featureName)
-                }
-            }
-            // stop VPN
-            vpnServiceWrapper.stopService()
-        } finally {
-            mutex.unlock()
-        }
-    }
-
-    override suspend fun snooze(triggerAtMillis: Long) {
-        vpnServiceWrapper.snoozeService(triggerAtMillis)
-    }
 }
 
 /**
@@ -152,9 +111,10 @@ class VpnFeaturesRegistryImpl @Inject constructor(
  *
  * The class is marked as open to be able to mock it in tests.
  */
-open class VpnServiceWrapper @Inject constructor(
+internal open class VpnServiceWrapper(
     private val context: Context,
-) {
+    private val dispatcherProvider: DispatcherProvider,
+) : Vpn {
     open fun restartVpnService(forceRestart: Boolean) {
         TrackerBlockingVpnService.restartVpnService(context, forceRestart = forceRestart)
     }
@@ -167,11 +127,19 @@ open class VpnServiceWrapper @Inject constructor(
         TrackerBlockingVpnService.startService(context)
     }
 
-    open fun snoozeService(triggerAtMillis: Long) {
-        TrackerBlockingVpnService.snoozeService(context, triggerAtMillis)
-    }
-
     open fun isServiceRunning(): Boolean {
         return TrackerBlockingVpnService.isServiceRunning(context)
     }
+
+    override suspend fun start() = withContext(dispatcherProvider.io()) {
+        startService()
+    }
+
+    override suspend fun stop() = withContext(dispatcherProvider.io()) {
+        stopService()
+    }
+
+    override suspend fun snooze(triggerAtMillis: Long) {
+        TrackerBlockingVpnService.snoozeService(context, triggerAtMillis)
+    }
 }