From c9221929855add8df6ee76a7a7fa764fa01197c9 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 4 Dec 2018 15:27:28 +0100
Subject: [PATCH] Replaced Linphone's Core version by SDK version in about
 fragment

---
 .../java/org/linphone/fragments/AboutFragment.java     | 10 +++++++---
 app/src/main/res/layout-land/about.xml                 |  4 ++--
 app/src/main/res/layout/about.xml                      |  4 ++--
 app/src/main/res/values/strings.xml                    |  1 +
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/linphone/fragments/AboutFragment.java b/app/src/main/java/org/linphone/fragments/AboutFragment.java
index f9ccf2b2c..923e62075 100644
--- a/app/src/main/java/org/linphone/fragments/AboutFragment.java
+++ b/app/src/main/java/org/linphone/fragments/AboutFragment.java
@@ -56,11 +56,15 @@ public class AboutFragment extends Fragment implements OnClickListener {
         View view = inflater.inflate(R.layout.about, container, false);
 
         TextView aboutVersion = view.findViewById(R.id.about_android_version);
-        TextView aboutLiblinphoneVersion = view.findViewById(R.id.about_liblinphone_version);
+        TextView aboutLiblinphoneVersion = view.findViewById(R.id.about_liblinphone_sdk_version);
         aboutLiblinphoneVersion.setText(
                 String.format(
-                        getString(R.string.about_liblinphone_version),
-                        LinphoneManager.getLc().getVersion()));
+                        getString(R.string.about_liblinphone_sdk_version),
+                        getString(R.string.linphone_sdk_version)
+                                + " ("
+                                + getString(R.string.linphone_sdk_branch)
+                                + ")"));
+        // We can't access a library's BuildConfig, so we have to set it as a resource
         aboutVersion.setText(
                 String.format(
                         getString(R.string.about_version),
diff --git a/app/src/main/res/layout-land/about.xml b/app/src/main/res/layout-land/about.xml
index 1434003f1..f7f0fb2ab 100644
--- a/app/src/main/res/layout-land/about.xml
+++ b/app/src/main/res/layout-land/about.xml
@@ -61,12 +61,12 @@
                 android:text="@string/about_version" />
 
             <TextView
-                android:id="@+id/about_liblinphone_version"
+                android:id="@+id/about_liblinphone_sdk_version"
                 style="@style/font12"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="left"
-                android:text="@string/about_liblinphone_version" />
+                android:text="@string/about_liblinphone_sdk_version" />
         </LinearLayout>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml
index 2717fa95e..72bcc935b 100644
--- a/app/src/main/res/layout/about.xml
+++ b/app/src/main/res/layout/about.xml
@@ -48,13 +48,13 @@
             android:text="@string/about_version" />
 
         <TextView
-            android:id="@+id/about_liblinphone_version"
+            android:id="@+id/about_liblinphone_sdk_version"
             style="@style/font12"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:gravity="center"
-            android:text="@string/about_liblinphone_version" />
+            android:text="@string/about_liblinphone_sdk_version" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a1984c37e..6ac546810 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,6 +12,7 @@
     <string name="tunnel_host"></string>
     <string name="about_version">Linphone Android %s</string>
     <string name="about_liblinphone_version">Linphone Core %s</string>
+    <string name="about_liblinphone_sdk_version">Linphone SDK %s</string>
     <string name="about_link">www.linphone.org</string>
     <string name="sync_account_name">linphone contacts</string>