Removed some stuff

Author: Pururun

android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt

@@ -113,7 +113,7 @@ import org.koin.core.qualifier.named
 import org.koin.dsl.module
 
 val uiModule = module {
-    single<DataStore<UserPreferences>>(named("COOL")) { androidContext().userPreferencesStore }
+    single<DataStore<UserPreferences>> { androidContext().userPreferencesStore }
 
     single<PackageManager> { androidContext().packageManager }
     single<String>(named(SELF_PACKAGE_NAME)) { androidContext().packageName }
@@ -131,9 +131,7 @@ val uiModule = module {
     single { androidContext().contentResolver }
 
     single { ChangelogRepository(get(), get(), get()) }
-    single<UserPreferencesRepository> {
-        UserPreferencesRepository(get<DataStore<UserPreferences>>(named("COOL")), get())
-    }
+    single { UserPreferencesRepository(get(), get()) }
     single { SettingsRepository(get()) }
     single { MullvadProblemReport(get(), get<DaemonConfig>().apiEndpointOverride, get()) }
     single { RelayOverridesRepository(get()) }

android/app/src/main/proto/user_prefs.proto

@@ -1,14 +1,8 @@
-import org.gradle.kotlin.dsl.android
-import org.gradle.kotlin.dsl.get
-import org.gradle.kotlin.dsl.kotlin
-import org.gradle.kotlin.dsl.plugins
-
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.parcelize)
     alias(libs.plugins.kotlin.ksp)
-    alias(libs.plugins.protobuf.core)
 
     id(Dependencies.junit5AndroidPluginId) version Versions.junit5Plugin
 }
@@ -40,29 +34,12 @@ android {
     }
 }
 
-protobuf {
-    protoc { artifact = libs.plugins.protobuf.protoc.get().toString() }
-    plugins {
-        create("java") { artifact = libs.plugins.grpc.protoc.gen.grpc.java.get().toString() }
-    }
-    generateProtoTasks {
-        all().forEach {
-            it.plugins { create("java") { option("lite") } }
-            it.builtins { create("kotlin") { option("lite") } }
-        }
-    }
-}
-
 dependencies {
     implementation(libs.kotlin.stdlib)
     implementation(libs.kotlinx.coroutines.android)
     implementation(libs.arrow)
     implementation(libs.arrow.optics)
     ksp(libs.arrow.optics.ksp)
-    implementation(libs.protobuf.kotlin.lite)
-    implementation(libs.androidx.datastore)
-    implementation(libs.koin)
-    implementation(libs.koin.android)
 
     // Test dependencies
     testRuntimeOnly(Dependencies.junitJupiterEngine)

android/lib/model/build.gradle.kts

@@ -1,5 +1,3 @@
-import org.gradle.kotlin.dsl.android
-
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -40,6 +38,4 @@ dependencies {
     implementation(libs.kermit)
     implementation(libs.kotlin.stdlib)
     implementation(libs.kotlinx.coroutines.android)
-    implementation(libs.koin)
-    implementation(libs.koin.android)
 }

android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/TunnelPreferencesSerializer.kt

@@ -154,8 +154,6 @@ open class TalpidVpnService : LifecycleVpnService() {
     companion object {
         const val FALLBACK_DUMMY_DNS_SERVER = "192.0.2.1"
 
-        const val APP_PREFERENCES_NAME = "net.mullvad.mullvadvpn.app_preferences"
-
         private const val IPV4_PREFIX_LENGTH = 32
         private const val IPV6_PREFIX_LENGTH = 128
     }

android/lib/talpid/build.gradle.kts

@@ -11,7 +11,6 @@ use jnix::{
     },
     FromJava, IntoJava, JnixEnv,
 };
-use std::net::Ipv6Addr;
 use std::{
     net::IpAddr,
     os::unix::io::{AsRawFd, RawFd},
@@ -308,7 +307,6 @@ impl VpnServiceConfig {
     /// Potentially subtract LAN nets from the VPN service routes, excepting gateways.
     /// This prevents LAN traffic from going in the tunnel.
     fn resolve_routes(config: &TunConfig) -> Vec<InetNetwork> {
-        log::debug!("routes: {:?}", config.routes);
         if !config.allow_lan {
             return config
                 .routes