From 0c7c3ea751a8c8371f643f24afc5c1a7de5bd4a8 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 13 Oct 2021 10:22:04 +0200
Subject: [PATCH] Fixed user-agent

---
 app/src/main/java/org/linphone/core/CoreContext.kt | 8 ++++----
 app/src/main/res/values/strings.xml                | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
index db8696476..60eed1a72 100644
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ b/app/src/main/java/org/linphone/core/CoreContext.kt
@@ -74,9 +74,9 @@ class CoreContext(val context: Context, coreConfig: Config) {
     var screenHeight: Float = 0f
 
     val appVersion: String by lazy {
-        val appVersion = org.linphone.BuildConfig.VERSION_NAME
+        val appVersion = BuildConfig.VERSION_NAME
         val appBranch = context.getString(R.string.linphone_app_branch)
-        val appBuildType = org.linphone.BuildConfig.BUILD_TYPE
+        val appBuildType = BuildConfig.BUILD_TYPE
         "$appVersion ($appBranch, $appBuildType)"
     }
 
@@ -382,8 +382,8 @@ class CoreContext(val context: Context, coreConfig: Config) {
 
     private fun computeUserAgent() {
         val deviceName: String = corePreferences.deviceName
-        val appName: String = context.resources.getString(R.string.app_name)
-        val androidVersion = org.linphone.BuildConfig.VERSION_NAME
+        val appName: String = context.resources.getString(R.string.user_agent_app_name)
+        val androidVersion = BuildConfig.VERSION_NAME
         val userAgent = "$appName/$androidVersion ($deviceName) LinphoneSDK"
         val sdkVersion = context.getString(R.string.linphone_sdk_version)
         val sdkBranch = context.getString(R.string.linphone_sdk_branch)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0c4c1d23b..63d22fca4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,6 +7,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name" translatable="false">&appName;</string>
     <string name="app_name_debug" translatable="false">&appName; (debug)</string>
+    <string name="user_agent_app_name" translatable="false">&appName;Android</string>
     <string name="service_name">&appName; Service</string>
     <string name="service_auto_start_description">&appName; has been started automatically</string>
     <string name="service_description">This is required to receive calls while in background</string>