Merge branch 'add-flavor-information-to-the-log-droid-1899'

2 files changed, 3 insertions, 0 deletions

diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
index d95892305b..f08b3fd4d6 100644
--- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
+++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
@@ -7,12 +7,14 @@ object MullvadDaemon {
         System.loadLibrary("mullvad_jni")
     }
 
+    @Suppress("LongParameterList")
     external fun initialize(
         vpnService: MullvadVpnService,
         rpcSocketPath: String,
         filesDirectory: String,
         cacheDirectory: String,
         apiEndpointOverride: ApiEndpointOverride?,
+        extraMetadata: Map<String, String>,
     )
 
     external fun shutdown()
diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
index 3c26ad89de..44e256cdb5 100644
--- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
+++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
@@ -170,6 +170,7 @@ class MullvadVpnService : TalpidVpnService() {
                 filesDirectory = filesDir.absolutePath,
                 cacheDirectory = cacheDir.absolutePath,
                 apiEndpointOverride = apiEndpointOverride,
+                extraMetadata = mapOf("flavor" to BuildConfig.FLAVOR),
             )
             Logger.i("MullvadVpnService: Daemon initialized")
         }