From acfabaae23496f71994fce15d80805859be9477f Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 11 Jan 2024 15:44:59 +0100
Subject: [PATCH] Revert changes breaking app version & incoming call go to
 call activity when answering

---
 app/build.gradle                                   | 2 +-
 app/src/main/java/org/linphone/core/CoreContext.kt | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0508ed924..7ec0536ba 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,7 +19,7 @@ configurations {
 
 def gitBranch = new ByteArrayOutputStream()
 def gitVersion = new ByteArrayOutputStream()
-tasks.register('getGitVersion') {
+task getGitVersion() {
     def gitVersionStream = new ByteArrayOutputStream()
     def gitCommitsCount = new ByteArrayOutputStream()
     def gitCommitHash = new ByteArrayOutputStream()
diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
index 4f139ee78..44cf4b3cd 100644
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ b/app/src/main/java/org/linphone/core/CoreContext.kt
@@ -163,11 +163,8 @@ class CoreContext @UiThread constructor(val context: Context) : HandlerThread("C
                     }
                 }
                 Call.State.Connected -> {
-                    val conferenceInfo = core.findConferenceInformationFromUri(call.remoteAddress)
-                    if (conferenceInfo != null) {
-                        postOnMainThread {
-                            showCallActivity()
-                        }
+                    postOnMainThread {
+                        showCallActivity()
                     }
                 }
                 else -> {