From f6a6459b29bd0025ff056cb602c53d7e566b5325 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 11 Jun 2020 13:28:56 +0200
Subject: [PATCH] Fixed video display on incoming early media call

---
 .../org/linphone/activities/call/IncomingCallActivity.kt   | 7 +++++++
 app/src/main/res/layout/call_incoming_activity.xml         | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/app/src/main/java/org/linphone/activities/call/IncomingCallActivity.kt b/app/src/main/java/org/linphone/activities/call/IncomingCallActivity.kt
index fec88fae3..ece6ff7ea 100644
--- a/app/src/main/java/org/linphone/activities/call/IncomingCallActivity.kt
+++ b/app/src/main/java/org/linphone/activities/call/IncomingCallActivity.kt
@@ -79,6 +79,13 @@ class IncomingCallActivity : GenericActivity() {
             }
         })
 
+        viewModel.earlyMediaVideoEnabled.observe(this, Observer {
+            if (it) {
+                Log.i("[Incoming Call Activity] Early media video being received, set native window id")
+                coreContext.core.nativeVideoWindowId = binding.remoteVideoSurface
+            }
+        })
+
         val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
         viewModel.screenLocked.value = keyguardManager.isKeyguardLocked
 
diff --git a/app/src/main/res/layout/call_incoming_activity.xml b/app/src/main/res/layout/call_incoming_activity.xml
index ddaa7deae..04f7c4e24 100644
--- a/app/src/main/res/layout/call_incoming_activity.xml
+++ b/app/src/main/res/layout/call_incoming_activity.xml
@@ -69,14 +69,17 @@
             android:layout_height="200dp"
             android:layout_margin="5dp"
             android:layout_below="@id/contact_number"
+            android:layout_above="@id/buttons"
             android:layout_centerHorizontal="true"
             android:gravity="center"
             tools:layout="@layout/contact_avatar_big"
             app:viewModel="@{viewModel}"/>
 
         <TextureView
+            android:id="@+id/remote_video_surface"
             android:visibility="@{viewModel.earlyMediaVideoEnabled ? View.VISIBLE : View.GONE}"
             android:layout_below="@id/contact_number"
+            android:layout_above="@id/buttons"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />