From a5b8a8a68391042b4787e33f8d540094667e9858 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 27 Jan 2025 17:03:47 +0100
Subject: [PATCH] Show git describe in startup logs

---
 app/src/main/java/org/linphone/contacts/ContactsManager.kt | 3 +++
 app/src/main/java/org/linphone/core/CoreContext.kt         | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/linphone/contacts/ContactsManager.kt b/app/src/main/java/org/linphone/contacts/ContactsManager.kt
index aa179add7..40fba44c0 100644
--- a/app/src/main/java/org/linphone/contacts/ContactsManager.kt
+++ b/app/src/main/java/org/linphone/contacts/ContactsManager.kt
@@ -575,10 +575,12 @@ class ContactsManager
 
     @WorkerThread
     fun onCoreStarted(core: Core) {
+        Log.i("$TAG Core has been started")
         loadContactsOnlyFromDefaultDirectory = corePreferences.fetchContactsFromDefaultDirectory
 
         core.addListener(coreListener)
         for (list in core.friendsLists) {
+            Log.i("$TAG Found existing friend list [${list.displayName}]")
             list.addListener(friendListListener)
         }
 
@@ -604,6 +606,7 @@ class ContactsManager
 
     @WorkerThread
     fun onCoreStopped(core: Core) {
+        Log.w("$TAG Core has been stopped")
         coroutineScope.cancel()
 
         core.removeListener(coreListener)
diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
index f7bbfb102..27cf540d6 100644
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ b/app/src/main/java/org/linphone/core/CoreContext.kt
@@ -415,7 +415,9 @@ class CoreContext
         }
         Log.i("=========================================")
         Log.i("==== Linphone-android information dump ====")
-        Log.i("VERSION=${BuildConfig.VERSION_NAME} / ${BuildConfig.VERSION_CODE}")
+        val gitVersion = AppUtils.getString(org.linphone.R.string.linphone_app_version)
+        val gitBranch = AppUtils.getString(org.linphone.R.string.linphone_app_branch)
+        Log.i("VERSION=${BuildConfig.VERSION_NAME} / ${BuildConfig.VERSION_CODE} ($gitVersion from $gitBranch branch)")
         Log.i("PACKAGE=${BuildConfig.APPLICATION_ID}")
         Log.i("BUILD TYPE=${BuildConfig.BUILD_TYPE}")
         Log.i("=========================================")