From 78384e7b5571ea776b71183444fb388bf9f7f273 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Thu, 7 Oct 2021 19:48:33 +0200
Subject: [PATCH 01/50] add initial approach for pip mode (wip)

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 app/src/main/AndroidManifest.xml              |  3 +-
 .../talk/activities/MagicCallActivity.kt      | 64 +++++++++++--------
 .../talk/controllers/CallController.java      | 10 ++-
 .../talk/controllers/ChatController.kt        | 12 +---
 .../ic_baseline_picture_in_picture_alt_24.xml | 10 +++
 app/src/main/res/layout/controller_call.xml   |  4 +-
 app/src/main/res/layout/controller_chat.xml   | 13 ----
 7 files changed, 59 insertions(+), 57 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_baseline_picture_in_picture_alt_24.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e254e15ce..c0f7a31c0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -124,7 +124,8 @@
 
         <activity
             android:name=".activities.MagicCallActivity"
-            android:configChanges="orientation|screenSize"
+            android:supportsPictureInPicture="true"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
             android:launchMode="singleTask" />
 
         <activity
diff --git a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
index 496756524..968b0ed23 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
@@ -23,12 +23,15 @@
 package com.nextcloud.talk.activities
 
 import android.app.KeyguardManager
+import android.app.PictureInPictureParams
 import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
-import android.view.View
+import android.util.Log
+import android.util.Rational
 import android.view.Window
 import android.view.WindowManager
+import androidx.annotation.RequiresApi
 import autodagger.AutoInjector
 import com.bluelinelabs.conductor.Conductor
 import com.bluelinelabs.conductor.Router
@@ -38,7 +41,6 @@ import com.nextcloud.talk.R
 import com.nextcloud.talk.application.NextcloudTalkApplication
 import com.nextcloud.talk.controllers.CallController
 import com.nextcloud.talk.controllers.CallNotificationController
-import com.nextcloud.talk.controllers.ChatController
 import com.nextcloud.talk.databinding.ActivityMagicCallBinding
 import com.nextcloud.talk.events.ConfigurationChangeEvent
 import com.nextcloud.talk.utils.bundle.BundleKeys
@@ -46,14 +48,11 @@ import com.nextcloud.talk.utils.bundle.BundleKeys
 @AutoInjector(NextcloudTalkApplication::class)
 class MagicCallActivity : BaseActivity() {
     lateinit var binding: ActivityMagicCallBinding
-
-    private lateinit var chatController: ChatController
-
     private var router: Router? = null
-    private var chatRouter: Router? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        Log.d(TAG, "onCreate")
         NextcloudTalkApplication.sharedApplication!!.componentApplication.inject(this)
         setTheme(R.style.CallTheme)
 
@@ -63,7 +62,7 @@ class MagicCallActivity : BaseActivity() {
             WindowManager.LayoutParams.FLAG_FULLSCREEN or
                 WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
         )
-        window.decorView.systemUiVisibility = systemUiVisibility
+       // window.decorView.systemUiVisibility = systemUiVisibility
 
         binding = ActivityMagicCallBinding.inflate(layoutInflater)
         setContentView(binding.root)
@@ -87,30 +86,28 @@ class MagicCallActivity : BaseActivity() {
             }
         }
 
-        val extras = intent.extras ?: Bundle()
-        extras.putBoolean("showToggleChat", true)
-
-        chatController = ChatController(extras)
-        chatRouter = Conductor.attachRouter(this, binding.chatControllerView, savedInstanceState)
-        chatRouter!!.setRoot(
-            RouterTransaction.with(chatController)
-                .pushChangeHandler(HorizontalChangeHandler())
-                .popChangeHandler(HorizontalChangeHandler())
-        )
     }
 
-    fun showChat() {
+    @RequiresApi(Build.VERSION_CODES.O)
+    fun enterPipMode() {
         enableKeyguard()
-        binding.chatControllerView.visibility = View.VISIBLE
-        binding.controllerContainer.visibility = View.GONE
-        chatController.wasDetached = false
-        chatController.pullChatMessages(1)
+        enterPictureInPictureMode(getPipParams())
     }
 
-    fun showCall() {
-        binding.controllerContainer.visibility = View.VISIBLE
-        binding.chatControllerView.visibility = View.GONE
-        chatController.wasDetached = true
+    @RequiresApi(Build.VERSION_CODES.O)
+    override fun onUserLeaveHint() {
+        enterPictureInPictureMode(getPipParams())
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    private fun getPipParams(): PictureInPictureParams {
+        val pipRatio = Rational(
+            300,
+            500
+        )
+        return PictureInPictureParams.Builder()
+            .setAspectRatio(pipRatio)
+            .build()
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
@@ -145,14 +142,25 @@ class MagicCallActivity : BaseActivity() {
         }
     }
 
+    override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean,
+        newConfig: Configuration) {
+        if (isInPictureInPictureMode) {
+            Log.d(TAG, "Hide the full-screen UI (controls, etc.) while in picture-in-picture mode.")
+        } else {
+            Log.d(TAG,"Restore the full-screen UI.")
+        }
+    }
+
+
+
     companion object {
         private val TAG = "MagicCallActivity"
 
-        private val systemUiVisibility: Int
+      /*  private val systemUiVisibility: Int
             get() {
                 var flags = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN
                 flags = flags or View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
                 return flags
-            }
+            } */
     }
 }
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
index c9407800b..8eec7429d 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
@@ -141,6 +141,7 @@ import javax.inject.Inject;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatActivity;
 import autodagger.AutoInjector;
 import butterknife.BindView;
@@ -372,7 +373,9 @@ public class CallController extends BaseController {
         basicInitialization();
         initViews();
         initPipView();
-        initiateCall();
+        if (!isConnectionEstablished()){
+            initiateCall();
+        }
     }
 
     private void basicInitialization() {
@@ -839,9 +842,10 @@ public class CallController extends BaseController {
         }
     }
 
-    @OnClick(R.id.callControlToggleChat)
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    @OnClick(R.id.callControlEnterPip)
     void onToggleChatClick() {
-        ((MagicCallActivity) getActivity()).showChat();
+        ((MagicCallActivity) getActivity()).enterPipMode();
     }
 
     @OnClick(R.id.callControlHangupView)
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
index cd18dc807..fe54e4628 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -577,15 +577,6 @@ class ChatController(args: Bundle) :
 
         binding.messageInputView.setPadding(0, 0, 0, 0)
 
-        if (args.containsKey("showToggleChat") && args.getBoolean("showToggleChat")) {
-            binding.callControlToggleChat.visibility = View.VISIBLE
-            wasDetached = true
-        }
-
-        binding.callControlToggleChat.setOnClickListener {
-            (activity as MagicCallActivity).showCall()
-        }
-
         binding.messagesListView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
             override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
                 super.onScrollStateChanged(recyclerView, newState)
@@ -1459,6 +1450,7 @@ class ChatController(args: Bundle) :
             !activity?.isChangingConfigurations!! &&
             !isLeavingForConversation
         ) {
+            // TODO: don't leave room when going back to call from PIP Mode!!
             wasDetached = true
             leaveRoom()
         }
@@ -2336,7 +2328,7 @@ class ChatController(args: Bundle) :
             menu.findItem(R.id.action_forward_message).isVisible =
                 ChatMessage.MessageType.REGULAR_TEXT_MESSAGE == message.getMessageType()
             if (menu.hasVisibleItems()) {
-                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
+                if (Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
                     setForceShowIcon(true)
                 }
                 show()
diff --git a/app/src/main/res/drawable/ic_baseline_picture_in_picture_alt_24.xml b/app/src/main/res/drawable/ic_baseline_picture_in_picture_alt_24.xml
new file mode 100644
index 000000000..7837510dd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_picture_in_picture_alt_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M19,11h-8v6h8v-6zM23,19L23,4.98C23,3.88 22.1,3 21,3L3,3c-1.1,0 -2,0.88 -2,1.98L1,19c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2zM21,19.02L3,19.02L3,4.97h18v14.05z"/>
+</vector>
diff --git a/app/src/main/res/layout/controller_call.xml b/app/src/main/res/layout/controller_call.xml
index a02000cfc..6592ab88b 100644
--- a/app/src/main/res/layout/controller_call.xml
+++ b/app/src/main/res/layout/controller_call.xml
@@ -142,14 +142,14 @@
         android:orientation="horizontal">
 
         <com.facebook.drawee.view.SimpleDraweeView
-            android:id="@+id/callControlToggleChat"
+            android:id="@+id/callControlEnterPip"
             android:layout_width="60dp"
             android:layout_height="match_parent"
             android:layout_marginStart="40dp"
             android:layout_marginEnd="10dp"
             android:elevation="10dp"
             app:backgroundImage="@color/call_buttons_background"
-            app:placeholderImage="@drawable/ic_comment_white"
+            app:placeholderImage="@drawable/ic_baseline_picture_in_picture_alt_24"
             app:roundAsCircle="true" />
 
         <com.facebook.drawee.view.SimpleDraweeView
diff --git a/app/src/main/res/layout/controller_chat.xml b/app/src/main/res/layout/controller_chat.xml
index b65baa4a8..413e56ffb 100644
--- a/app/src/main/res/layout/controller_chat.xml
+++ b/app/src/main/res/layout/controller_chat.xml
@@ -40,19 +40,6 @@
             android:visibility="gone"
             tools:visibility="visible" />
 
-        <com.facebook.drawee.view.SimpleDraweeView
-            android:id="@+id/callControlToggleChat"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:layout_alignParentEnd="true"
-            android:layout_margin="16dp"
-            android:elevation="10dp"
-            android:visibility="gone"
-            app:backgroundImage="@color/call_buttons_background"
-            app:placeholderImage="@drawable/ic_call_black_24dp"
-            app:roundAsCircle="true"
-            tools:visibility="visible" />
-
         <LinearLayout
             android:id="@+id/progressBar"
             android:layout_width="match_parent"

From d4d23c185529602b1e3d1e04afd829dcabb64894 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Mon, 11 Oct 2021 22:47:12 +0200
Subject: [PATCH 02/50] set calling/dialing state by
 ApplicationWideCurrentRoomHolder

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../talk/controllers/CallController.java          |  4 +++-
 .../nextcloud/talk/controllers/ChatController.kt  | 15 ++++-----------
 .../ApplicationWideCurrentRoomHolder.java         | 10 ++++++++++
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
index 8eec7429d..0aff62c2d 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
@@ -844,7 +844,7 @@ public class CallController extends BaseController {
 
     @RequiresApi(api = Build.VERSION_CODES.O)
     @OnClick(R.id.callControlEnterPip)
-    void onToggleChatClick() {
+    void enterPipMode() {
         ((MagicCallActivity) getActivity()).enterPipMode();
     }
 
@@ -1304,6 +1304,7 @@ public class CallController extends BaseController {
                             setCallState(CallStatus.JOINED);
 
                             ApplicationWideCurrentRoomHolder.getInstance().setInCall(true);
+                            ApplicationWideCurrentRoomHolder.getInstance().setDialing(false);
 
                             if (!TextUtils.isEmpty(roomToken)) {
                                 NotificationUtils.INSTANCE.cancelExistingNotificationsForRoom(getApplicationContext(),
@@ -1581,6 +1582,7 @@ public class CallController extends BaseController {
         }
 
         hangupNetworkCalls(shutDownView);
+        ApplicationWideCurrentRoomHolder.getInstance().setInCall(false);
     }
 
     private void hangupNetworkCalls(boolean shutDownView) {
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
index fe54e4628..48617a730 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -232,7 +232,6 @@ class ChatController(args: Bundle) :
     val roomId: String
     val voiceOnly: Boolean
     var isFirstMessagesProcessing = true
-    var isLeavingForConversation: Boolean = false
     var wasDetached: Boolean = false
     var emojiPopup: EmojiPopup? = null
 
@@ -1367,10 +1366,8 @@ class ChatController(args: Bundle) :
             activity?.findViewById<View>(R.id.toolbar)?.setOnClickListener { v -> showConversationInfoScreen() }
         }
 
-        isLeavingForConversation = false
         ApplicationWideCurrentRoomHolder.getInstance().currentRoomId = roomId
         ApplicationWideCurrentRoomHolder.getInstance().currentRoomToken = roomId
-        ApplicationWideCurrentRoomHolder.getInstance().isInCall = false
         ApplicationWideCurrentRoomHolder.getInstance().userInRoom = conversationUser
 
         val smileyButton = binding.messageInputView.findViewById<ImageButton>(R.id.smileyButton)
@@ -1434,11 +1431,6 @@ class ChatController(args: Bundle) :
 
     override fun onDetach(view: View) {
         super.onDetach(view)
-
-        if (!isLeavingForConversation) {
-            // current room is still "active", we need the info
-            ApplicationWideCurrentRoomHolder.getInstance().clear()
-        }
         eventBus?.unregister(this)
 
         if (activity != null) {
@@ -1448,9 +1440,10 @@ class ChatController(args: Bundle) :
         if (conversationUser != null &&
             activity != null &&
             !activity?.isChangingConfigurations!! &&
-            !isLeavingForConversation
+            !ApplicationWideCurrentRoomHolder.getInstance().isInCall &&
+            !ApplicationWideCurrentRoomHolder.getInstance().isDialing
         ) {
-            // TODO: don't leave room when going back to call from PIP Mode!!
+            ApplicationWideCurrentRoomHolder.getInstance().clear()
             wasDetached = true
             leaveRoom()
         }
@@ -2121,7 +2114,7 @@ class ChatController(args: Bundle) :
     }
 
     private fun startACall(isVoiceOnlyCall: Boolean) {
-        isLeavingForConversation = true
+        ApplicationWideCurrentRoomHolder.getInstance().isDialing = true
         val callIntent = getIntentForCall(isVoiceOnlyCall)
         if (callIntent != null) {
             startActivity(callIntent)
diff --git a/app/src/main/java/com/nextcloud/talk/utils/singletons/ApplicationWideCurrentRoomHolder.java b/app/src/main/java/com/nextcloud/talk/utils/singletons/ApplicationWideCurrentRoomHolder.java
index 6ce60d386..1ab12a531 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/singletons/ApplicationWideCurrentRoomHolder.java
+++ b/app/src/main/java/com/nextcloud/talk/utils/singletons/ApplicationWideCurrentRoomHolder.java
@@ -28,6 +28,7 @@ public class ApplicationWideCurrentRoomHolder {
     private String currentRoomToken = "";
     private UserEntity userInRoom = new UserEntity();
     private boolean inCall = false;
+    private boolean isDialing = false;
     private String session = "";
 
     public static ApplicationWideCurrentRoomHolder getInstance() {
@@ -38,6 +39,7 @@ public class ApplicationWideCurrentRoomHolder {
         currentRoomId = "";
         userInRoom = new UserEntity();
         inCall = false;
+        isDialing = false;
         currentRoomToken = "";
         session = "";
     }
@@ -74,6 +76,14 @@ public class ApplicationWideCurrentRoomHolder {
         this.inCall = inCall;
     }
 
+    public boolean isDialing() {
+        return isDialing;
+    }
+
+    public void setDialing(boolean dialing) {
+        isDialing = dialing;
+    }
+
     public String getSession() {
         return session;
     }

From 7f19816961d3cb26a4f4aad37115559f2c9902ea Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Tue, 12 Oct 2021 12:27:14 +0200
Subject: [PATCH 03/50] remove call activity from tasks

add launch screen for call

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 app/src/main/AndroidManifest.xml   | 5 ++++-
 app/src/main/res/values/styles.xml | 7 +++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c0f7a31c0..00de93a50 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -124,9 +124,12 @@
 
         <activity
             android:name=".activities.MagicCallActivity"
+            android:theme="@style/AppTheme.CallLauncher"
             android:supportsPictureInPicture="true"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
-            android:launchMode="singleTask" />
+            android:launchMode="singleTask"
+            android:taskAffinity=".call"
+            android:excludeFromRecents="true" />
 
         <activity
             android:name=".activities.FullScreenImageActivity"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c266cc46d..a0ec7740c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -187,6 +187,13 @@
         <item name="android:navigationBarColor">@color/colorPrimary</item>
     </style>
 
+    <!-- Call Launch screen -->
+    <style name="AppTheme.CallLauncher">
+        <item name="android:windowBackground">@color/black</item>
+        <item name="android:statusBarColor">@color/black</item>
+        <item name="android:navigationBarColor">@color/black</item>
+    </style>
+
     <style name="Nextcloud.Material.TextButton" parent="Widget.MaterialComponents.Button.TextButton.Icon">
         <item name="android:typeface">sans</item>
         <item name="android:textStyle">bold</item>

From d4322bf2d9373b69857587f74730375b4a38a3d4 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Tue, 12 Oct 2021 12:36:31 +0200
Subject: [PATCH 04/50] finish call activity if closed via "X" in pip mode

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../nextcloud/talk/activities/MagicCallActivity.kt | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
index 968b0ed23..b83a9c214 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
@@ -49,6 +49,7 @@ import com.nextcloud.talk.utils.bundle.BundleKeys
 class MagicCallActivity : BaseActivity() {
     lateinit var binding: ActivityMagicCallBinding
     private var router: Router? = null
+    var isInPipMode: Boolean = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -142,8 +143,10 @@ class MagicCallActivity : BaseActivity() {
         }
     }
 
-    override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean,
-        newConfig: Configuration) {
+    override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, newConfig: Configuration) {
+        super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
+        isInPipMode = isInPictureInPictureMode
+
         if (isInPictureInPictureMode) {
             Log.d(TAG, "Hide the full-screen UI (controls, etc.) while in picture-in-picture mode.")
         } else {
@@ -151,7 +154,12 @@ class MagicCallActivity : BaseActivity() {
         }
     }
 
-
+    override fun onStop() {
+        super.onStop()
+        if (isInPipMode) {
+            finish()
+        }
+    }
 
     companion object {
         private val TAG = "MagicCallActivity"

From 0aee8eb7ef6f4dc30988ff4e32b7b21eec4fbf7e Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Tue, 12 Oct 2021 12:39:32 +0200
Subject: [PATCH 05/50] remove comment

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../com/nextcloud/talk/activities/MagicCallActivity.kt    | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
index b83a9c214..445fb1060 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
@@ -63,7 +63,6 @@ class MagicCallActivity : BaseActivity() {
             WindowManager.LayoutParams.FLAG_FULLSCREEN or
                 WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
         )
-       // window.decorView.systemUiVisibility = systemUiVisibility
 
         binding = ActivityMagicCallBinding.inflate(layoutInflater)
         setContentView(binding.root)
@@ -163,12 +162,5 @@ class MagicCallActivity : BaseActivity() {
 
     companion object {
         private val TAG = "MagicCallActivity"
-
-      /*  private val systemUiVisibility: Int
-            get() {
-                var flags = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN
-                flags = flags or View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-                return flags
-            } */
     }
 }

From ea8e45e9344f7c27184cfd5aa4f2c92e153b6876 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Tue, 12 Oct 2021 12:44:46 +0200
Subject: [PATCH 06/50] enable keyguard when users presses home button

= security check if call was entered via notification in locked mode

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../main/java/com/nextcloud/talk/activities/MagicCallActivity.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
index 445fb1060..c6656faad 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
@@ -96,6 +96,7 @@ class MagicCallActivity : BaseActivity() {
 
     @RequiresApi(Build.VERSION_CODES.O)
     override fun onUserLeaveHint() {
+        enableKeyguard()
         enterPictureInPictureMode(getPipParams())
     }
 

From d482d8603e2bbfb2e12a4539ccf7d06d5419ad10 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Tue, 12 Oct 2021 22:55:16 +0200
Subject: [PATCH 07/50] modify call screen design for pip mode

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../nextcloud/talk/activities/MagicCallActivity.kt  |  6 ++++--
 .../nextcloud/talk/controllers/CallController.java  | 13 +++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
index c6656faad..e357226a5 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
@@ -82,6 +82,7 @@ class MagicCallActivity : BaseActivity() {
                     RouterTransaction.with(CallController(intent.extras))
                         .pushChangeHandler(HorizontalChangeHandler())
                         .popChangeHandler(HorizontalChangeHandler())
+                        .tag("CallController")
                 )
             }
         }
@@ -147,10 +148,11 @@ class MagicCallActivity : BaseActivity() {
         super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
         isInPipMode = isInPictureInPictureMode
 
+        var callController = router?.getControllerWithTag("CallController") as CallController
         if (isInPictureInPictureMode) {
-            Log.d(TAG, "Hide the full-screen UI (controls, etc.) while in picture-in-picture mode.")
+            callController.updateUiForPipMode()
         } else {
-            Log.d(TAG,"Restore the full-screen UI.")
+            callController.updateUiForNormalMode()
         }
     }
 
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
index 0aff62c2d..6a525a734 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
@@ -2359,6 +2359,19 @@ public class CallController extends BaseController {
         }
     }
 
+    public void updateUiForPipMode(){
+        callControls.setVisibility(View.GONE);
+        callInfosLinearLayout.setVisibility(View.GONE);
+        selfVideoView.setVisibility(View.GONE);
+        callStateView.setVisibility(View.GONE);
+    }
+
+    public void updateUiForNormalMode(){
+        callControls.setVisibility(View.VISIBLE);
+        callInfosLinearLayout.setVisibility(View.VISIBLE);
+        selfVideoView.setVisibility(View.VISIBLE);
+    }
+
     private String getDescriptionForCallType() {
         String appName = getResources().getString(R.string.nc_app_product_name);
         if (isVoiceOnlyCall) {

From 914b10bf2055ba758e96bd509837af0d7270eece Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Mon, 18 Oct 2021 11:08:58 +0200
Subject: [PATCH 08/50] make pip fullscreen (wip)

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../nextcloud/talk/controllers/CallController.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
index 6a525a734..085da8684 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
@@ -2360,6 +2360,12 @@ public class CallController extends BaseController {
     }
 
     public void updateUiForPipMode(){
+        RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+                                                                             ViewGroup.LayoutParams.WRAP_CONTENT);
+        params.setMargins(0,0,0, 0);
+        gridView.setLayoutParams(params);
+
+
         callControls.setVisibility(View.GONE);
         callInfosLinearLayout.setVisibility(View.GONE);
         selfVideoView.setVisibility(View.GONE);
@@ -2367,6 +2373,14 @@ public class CallController extends BaseController {
     }
 
     public void updateUiForNormalMode(){
+        RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+                                                                             ViewGroup.LayoutParams.WRAP_CONTENT);
+        params.addRule(RelativeLayout.BELOW, R.id.callInfosLinearLayout);
+        int callControlsHeight =
+            Math.round(getApplicationContext().getResources().getDimension(R.dimen.call_controls_height));
+        params.setMargins(0,0,0, callControlsHeight);
+        gridView.setLayoutParams(params);
+
         callControls.setVisibility(View.VISIBLE);
         callInfosLinearLayout.setVisibility(View.VISIBLE);
         selfVideoView.setVisibility(View.VISIBLE);

From 3ba599be98576f1db32a5fbb7998ee57baef83bf Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Wed, 20 Oct 2021 20:24:26 +0200
Subject: [PATCH 09/50] rename old "pip*"-stuff to "selfVideo*"

improve design-logic for pip-mode and normal mode when switched back from pip

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../talk/activities/MagicCallActivity.kt      |   2 +-
 .../talk/controllers/CallController.java      | 105 ++++++++++--------
 app/src/main/res/layout/controller_call.xml   |   4 +-
 3 files changed, 63 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
index e357226a5..ae142a96d 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
@@ -148,7 +148,7 @@ class MagicCallActivity : BaseActivity() {
         super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
         isInPipMode = isInPictureInPictureMode
 
-        var callController = router?.getControllerWithTag("CallController") as CallController
+        val callController = router?.getControllerWithTag("CallController") as CallController
         if (isInPictureInPictureMode) {
             callController.updateUiForPipMode()
         } else {
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
index 085da8684..8e8babe47 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
@@ -180,8 +180,12 @@ public class CallController extends BaseController {
     @BindView(R.id.callControlEnableSpeaker)
     SimpleDraweeView callControlEnableSpeaker;
 
-    @BindView(R.id.pip_video_view)
-    SurfaceViewRenderer pipVideoView;
+    @BindView(R.id.selfVideoRenderer)
+    SurfaceViewRenderer selfVideoRenderer;
+
+    @BindView(R.id.selfVideoViewWrapper)
+    FrameLayout selfVideoViewWrapper;
+
     @BindView(R.id.controllerCallLayout)
     RelativeLayout controllerCallLayout;
     @BindView(R.id.gridview)
@@ -205,8 +209,7 @@ public class CallController extends BaseController {
     @BindView(R.id.callConversationNameTextView)
     TextView callConversationNameTextView;
 
-    @BindView(R.id.selfVideoView)
-    FrameLayout selfVideoView;
+
 
     @BindView(R.id.callStateRelativeLayoutView)
     RelativeLayout callStateView;
@@ -371,8 +374,9 @@ public class CallController extends BaseController {
 
         callControls.setZ(100.0f);
         basicInitialization();
+        participantDisplayItems = new HashMap<>();
         initViews();
-        initPipView();
+        updateSelfVideoViewPosition();
         if (!isConnectionEstablished()){
             initiateCall();
         }
@@ -475,37 +479,37 @@ public class CallController extends BaseController {
                 });
     }
 
-
     @SuppressLint("ClickableViewAccessibility")
     private void initViews() {
-        participantDisplayItems = new HashMap<>();
+
+
+        callControls.setVisibility(View.VISIBLE);
+        callInfosLinearLayout.setVisibility(View.VISIBLE);
+        selfVideoViewWrapper.setVisibility(View.VISIBLE);
 
         if (isVoiceOnlyCall) {
             callControlEnableSpeaker.setVisibility(View.VISIBLE);
             cameraSwitchButton.setVisibility(View.GONE);
             cameraControlButton.setVisibility(View.GONE);
-            pipVideoView.setVisibility(View.GONE);
+            selfVideoRenderer.setVisibility(View.GONE);
 
             RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
                                                                                  ViewGroup.LayoutParams.WRAP_CONTENT);
             params.addRule(RelativeLayout.BELOW, R.id.callInfosLinearLayout);
-            int callControlsHeight =
-                    Math.round(getApplicationContext().getResources().getDimension(R.dimen.call_controls_height));
+            int callControlsHeight = Math.round(getApplicationContext().getResources().getDimension(R.dimen.call_controls_height));
             params.setMargins(0,0,0, callControlsHeight);
             gridView.setLayoutParams(params);
         } else {
+            RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+                                                                                 ViewGroup.LayoutParams.WRAP_CONTENT);
+            params.setMargins(0,0,0, 0);
+            gridView.setLayoutParams(params);
+
             callControlEnableSpeaker.setVisibility(View.GONE);
             if (cameraEnumerator.getDeviceNames().length < 2) {
                 cameraSwitchButton.setVisibility(View.GONE);
             }
-
-            pipVideoView.init(rootEglBase.getEglBaseContext(), null);
-            pipVideoView.setZOrderMediaOverlay(true);
-            // disabled because it causes some devices to crash
-            pipVideoView.setEnableHardwareScaler(false);
-            pipVideoView.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FIT);
-
-            pipVideoView.setOnTouchListener(new SelfVideoTouchListener());
+            initSelfVideoView();
         }
 
         gridView.setOnTouchListener(new View.OnTouchListener() {
@@ -521,6 +525,21 @@ public class CallController extends BaseController {
         initGridAdapter();
     }
 
+    @SuppressLint("ClickableViewAccessibility")
+    private void initSelfVideoView() {
+        try{
+            selfVideoRenderer.init(rootEglBase.getEglBaseContext(), null);
+        } catch(IllegalStateException e) {
+            Log.d(TAG, "selfVideoRenderer already initialized", e);
+        }
+
+        selfVideoRenderer.setZOrderMediaOverlay(true);
+        // disabled because it causes some devices to crash
+        selfVideoRenderer.setEnableHardwareScaler(false);
+        selfVideoRenderer.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FIT);
+        selfVideoRenderer.setOnTouchListener(new SelfVideoTouchListener());
+    }
+
     private void initGridAdapter() {
         if (conversationView != null) {
             GridView gridView = conversationView.findViewById(R.id.gridview);
@@ -704,7 +723,7 @@ public class CallController extends BaseController {
         localVideoTrack = peerConnectionFactory.createVideoTrack("NCv0", videoSource);
         localMediaStream.addTrack(localVideoTrack);
         localVideoTrack.setEnabled(false);
-        localVideoTrack.addSink(pipVideoView);
+        localVideoTrack.addSink(selfVideoRenderer);
     }
 
     private void microphoneInitialization() {
@@ -725,7 +744,7 @@ public class CallController extends BaseController {
                 Logging.d(TAG, "Creating front facing camera capturer.");
                 VideoCapturer videoCapturer = enumerator.createCapturer(deviceName, null);
                 if (videoCapturer != null) {
-                    pipVideoView.setMirror(true);
+                    selfVideoRenderer.setMirror(true);
                     return videoCapturer;
                 }
             }
@@ -740,7 +759,7 @@ public class CallController extends BaseController {
                 VideoCapturer videoCapturer = enumerator.createCapturer(deviceName, null);
 
                 if (videoCapturer != null) {
-                    pipVideoView.setMirror(false);
+                    selfVideoRenderer.setMirror(false);
                     return videoCapturer;
                 }
             }
@@ -894,7 +913,7 @@ public class CallController extends BaseController {
             cameraVideoCapturer.switchCamera(new CameraVideoCapturer.CameraSwitchHandler() {
                 @Override
                 public void onCameraSwitchDone(boolean currentCameraIsFront) {
-                    pipVideoView.setMirror(currentCameraIsFront);
+                    selfVideoRenderer.setMirror(currentCameraIsFront);
                 }
 
                 @Override
@@ -928,9 +947,9 @@ public class CallController extends BaseController {
                 localMediaStream.videoTracks.get(0).setEnabled(enable);
             }
             if (enable) {
-                pipVideoView.setVisibility(View.VISIBLE);
+                selfVideoRenderer.setVisibility(View.VISIBLE);
             } else {
-                pipVideoView.setVisibility(View.INVISIBLE);
+                selfVideoRenderer.setVisibility(View.INVISIBLE);
             }
         } else {
             message = "audioOff";
@@ -1545,8 +1564,8 @@ public class CallController extends BaseController {
                 videoCapturer = null;
             }
 
-            if (pipVideoView != null) {
-                pipVideoView.release();
+            if (selfVideoRenderer != null) {
+                selfVideoRenderer.release();
             }
 
             if (audioSource != null) {
@@ -1879,11 +1898,11 @@ public class CallController extends BaseController {
     public void onMessageEvent(ConfigurationChangeEvent configurationChangeEvent) {
         powerManagerUtils.setOrientation(Objects.requireNonNull(getResources()).getConfiguration().orientation);
         initGridAdapter();
-        initPipView();
+        updateSelfVideoViewPosition();
     }
 
-    private void initPipView() {
-        FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) pipVideoView.getLayoutParams();
+    private void updateSelfVideoViewPosition() {
+        FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) selfVideoRenderer.getLayoutParams();
 
         DisplayMetrics displayMetrics = getApplicationContext().getResources().getDisplayMetrics();
         int screenWidthPx = displayMetrics.widthPixels;
@@ -1908,11 +1927,11 @@ public class CallController extends BaseController {
             layoutParams.width = (int) getResources().getDimension(R.dimen.large_preview_dimension);
             newXafterRotate = (float) (screenWidthDp - getResources().getDimension(R.dimen.large_preview_dimension) * 0.5);
         }
-        pipVideoView.setLayoutParams(layoutParams);
+        selfVideoRenderer.setLayoutParams(layoutParams);
 
         int newXafterRotatePx = (int) DisplayUtils.convertDpToPixel(newXafterRotate, getApplicationContext());
-        selfVideoView.setY(newYafterRotate);
-        selfVideoView.setX(newXafterRotatePx);
+        selfVideoViewWrapper.setY(newYafterRotate);
+        selfVideoViewWrapper.setX(newXafterRotatePx);
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
@@ -2368,22 +2387,18 @@ public class CallController extends BaseController {
 
         callControls.setVisibility(View.GONE);
         callInfosLinearLayout.setVisibility(View.GONE);
-        selfVideoView.setVisibility(View.GONE);
+        selfVideoViewWrapper.setVisibility(View.GONE);
         callStateView.setVisibility(View.GONE);
+
+        selfVideoRenderer.release();
     }
 
     public void updateUiForNormalMode(){
-        RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                                                                             ViewGroup.LayoutParams.WRAP_CONTENT);
-        params.addRule(RelativeLayout.BELOW, R.id.callInfosLinearLayout);
-        int callControlsHeight =
-            Math.round(getApplicationContext().getResources().getDimension(R.dimen.call_controls_height));
-        params.setMargins(0,0,0, callControlsHeight);
-        gridView.setLayoutParams(params);
+        initViews();  // --> IllegalStateException: pip_video_viewAlready initialized
 
         callControls.setVisibility(View.VISIBLE);
         callInfosLinearLayout.setVisibility(View.VISIBLE);
-        selfVideoView.setVisibility(View.VISIBLE);
+        selfVideoViewWrapper.setVisibility(View.VISIBLE);
     }
 
     private String getDescriptionForCallType() {
@@ -2489,10 +2504,10 @@ public class CallController extends BaseController {
             long duration = event.getEventTime() - event.getDownTime();
 
             if (event.getActionMasked() == MotionEvent.ACTION_MOVE) {
-                float newY = event.getRawY() - selfVideoView.getHeight() / (float) 2;
-                float newX = event.getRawX() - selfVideoView.getWidth() / (float) 2;
-                selfVideoView.setY(newY);
-                selfVideoView.setX(newX);
+                float newY = event.getRawY() - selfVideoViewWrapper.getHeight() / (float) 2;
+                float newX = event.getRawX() - selfVideoViewWrapper.getWidth() / (float) 2;
+                selfVideoViewWrapper.setY(newY);
+                selfVideoViewWrapper.setX(newX);
             } else if (event.getActionMasked() == MotionEvent.ACTION_UP && duration < 100) {
                 switchCamera();
             }
diff --git a/app/src/main/res/layout/controller_call.xml b/app/src/main/res/layout/controller_call.xml
index 6592ab88b..d53216b67 100644
--- a/app/src/main/res/layout/controller_call.xml
+++ b/app/src/main/res/layout/controller_call.xml
@@ -55,12 +55,12 @@
                 android:stretchMode="columnWidth" />
 
             <FrameLayout
-                android:id="@+id/selfVideoView"
+                android:id="@+id/selfVideoViewWrapper"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content">
 
                 <org.webrtc.SurfaceViewRenderer
-                    android:id="@+id/pip_video_view"
+                    android:id="@+id/selfVideoRenderer"
                     android:layout_width="@dimen/large_preview_dimension"
                     android:layout_height="150dp"
                     android:layout_gravity="center"

From 6839b9eb2c7a1d7fea3b2380ff8daf06aa479346 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Wed, 20 Oct 2021 21:32:14 +0200
Subject: [PATCH 10/50] fix animation of callControls

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../java/com/nextcloud/talk/controllers/CallController.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
index 8e8babe47..aa0a1e00c 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
@@ -481,9 +481,6 @@ public class CallController extends BaseController {
 
     @SuppressLint("ClickableViewAccessibility")
     private void initViews() {
-
-
-        callControls.setVisibility(View.VISIBLE);
         callInfosLinearLayout.setVisibility(View.VISIBLE);
         selfVideoViewWrapper.setVisibility(View.VISIBLE);
 
@@ -2394,9 +2391,10 @@ public class CallController extends BaseController {
     }
 
     public void updateUiForNormalMode(){
+        callControls.setVisibility(View.INVISIBLE); // animateCallControls needs this to be invisible for a check.
         initViews();  // --> IllegalStateException: pip_video_viewAlready initialized
 
-        callControls.setVisibility(View.VISIBLE);
+
         callInfosLinearLayout.setVisibility(View.VISIBLE);
         selfVideoViewWrapper.setVisibility(View.VISIBLE);
     }

From 1ae5f51a817f907811bad216def49a709fe7f15b Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Mon, 25 Oct 2021 10:47:17 +0200
Subject: [PATCH 11/50] hide pip button for android < 8

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../talk/activities/MagicCallActivity.kt      |  7 +++++--
 .../talk/adapters/ParticipantsAdapter.java    | 19 +++++++++++++++++++
 .../talk/controllers/CallController.java      | 17 ++++++++++++-----
 app/src/main/res/layout/controller_call.xml   |  7 ++++---
 4 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
index ae142a96d..326bddc12 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
@@ -95,10 +95,13 @@ class MagicCallActivity : BaseActivity() {
         enterPictureInPictureMode(getPipParams())
     }
 
-    @RequiresApi(Build.VERSION_CODES.O)
     override fun onUserLeaveHint() {
         enableKeyguard()
-        enterPictureInPictureMode(getPipParams())
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            enterPictureInPictureMode(getPipParams())
+        } else {
+            finish()
+        }
     }
 
     @RequiresApi(Build.VERSION_CODES.O)
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/ParticipantsAdapter.java b/app/src/main/java/com/nextcloud/talk/adapters/ParticipantsAdapter.java
index d0b4b43fc..493a17cbc 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/ParticipantsAdapter.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/ParticipantsAdapter.java
@@ -79,6 +79,8 @@ public class ParticipantsAdapter extends BaseAdapter {
 
             surfaceViewRenderer = convertView.findViewById(R.id.surface_view);
             try {
+                Log.d(TAG, "hasSurface: " + participantDisplayItem.getRootEglBase().hasSurface());
+
                 surfaceViewRenderer.setMirror(false);
                 surfaceViewRenderer.init(participantDisplayItem.getRootEglBase().getEglBaseContext(), null);
                 surfaceViewRenderer.setZOrderMediaOverlay(false);
@@ -127,7 +129,24 @@ public class ParticipantsAdapter extends BaseAdapter {
         } else {
             audioOffView.setVisibility(View.INVISIBLE);
         }
+
+
+        convertView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
+
+            @Override
+            public void onViewAttachedToWindow(View v) {
+                Log.d(TAG,"onViewAttachedToWindow");
+            }
+
+            @Override
+            public void onViewDetachedFromWindow(View v) {
+                Log.d(TAG,"onViewDetachedFromWindow");
+            }
+        });
+
+
         return convertView;
+
     }
 
     private boolean hasVideoStream(ParticipantDisplayItem participantDisplayItem, MediaStream mediaStream) {
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
index aa0a1e00c..1189792c2 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
@@ -141,7 +141,6 @@ import javax.inject.Inject;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatActivity;
 import autodagger.AutoInjector;
 import butterknife.BindView;
@@ -208,8 +207,8 @@ public class CallController extends BaseController {
     TextView callVoiceOrVideoTextView;
     @BindView(R.id.callConversationNameTextView)
     TextView callConversationNameTextView;
-
-
+    @BindView(R.id.callControlEnterPip)
+    SimpleDraweeView callControlEnterPip;
 
     @BindView(R.id.callStateRelativeLayoutView)
     RelativeLayout callStateView;
@@ -484,6 +483,10 @@ public class CallController extends BaseController {
         callInfosLinearLayout.setVisibility(View.VISIBLE);
         selfVideoViewWrapper.setVisibility(View.VISIBLE);
 
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            callControlEnterPip.setVisibility(View.GONE);
+        }
+
         if (isVoiceOnlyCall) {
             callControlEnableSpeaker.setVisibility(View.VISIBLE);
             cameraSwitchButton.setVisibility(View.GONE);
@@ -858,10 +861,14 @@ public class CallController extends BaseController {
         }
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.O)
     @OnClick(R.id.callControlEnterPip)
     void enterPipMode() {
-        ((MagicCallActivity) getActivity()).enterPipMode();
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O){
+            ((MagicCallActivity) getActivity()).enterPipMode();
+        } else{
+            Log.w(TAG, "tried to enterPipMode with an android api level below 26 (Android 8). This scenario should " +
+                "have been avoided by hiding the PIP button!");
+        }
     }
 
     @OnClick(R.id.callControlHangupView)
diff --git a/app/src/main/res/layout/controller_call.xml b/app/src/main/res/layout/controller_call.xml
index d53216b67..2195a1b79 100644
--- a/app/src/main/res/layout/controller_call.xml
+++ b/app/src/main/res/layout/controller_call.xml
@@ -139,13 +139,14 @@
         android:animateLayoutChanges="true"
         android:background="@android:color/transparent"
         android:gravity="center"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:layout_marginStart="40dp"
+        android:layout_marginEnd="40dp">
 
         <com.facebook.drawee.view.SimpleDraweeView
             android:id="@+id/callControlEnterPip"
             android:layout_width="60dp"
             android:layout_height="match_parent"
-            android:layout_marginStart="40dp"
             android:layout_marginEnd="10dp"
             android:elevation="10dp"
             app:backgroundImage="@color/call_buttons_background"
@@ -189,7 +190,7 @@
             android:layout_width="60dp"
             android:layout_height="match_parent"
             android:layout_marginStart="10dp"
-            android:layout_marginEnd="40dp"
+            android:layout_marginEnd="10dp"
             app:backgroundImage="@color/nc_darkRed"
             app:placeholderImage="@drawable/ic_call_end_white_24px"
             app:roundAsCircle="true" />

From 12d96634e5ad7aba6edb022600cc6386db530060 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Mon, 25 Oct 2021 11:08:03 +0200
Subject: [PATCH 12/50] fix to show call controls in voiceOnly call after
 coming back from pip mode

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../com/nextcloud/talk/controllers/CallController.java   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
index 1189792c2..d9763c5c4 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
@@ -2398,9 +2398,12 @@ public class CallController extends BaseController {
     }
 
     public void updateUiForNormalMode(){
-        callControls.setVisibility(View.INVISIBLE); // animateCallControls needs this to be invisible for a check.
-        initViews();  // --> IllegalStateException: pip_video_viewAlready initialized
-
+        if (isVoiceOnlyCall) {
+            callControls.setVisibility(View.VISIBLE);
+        } else {
+            callControls.setVisibility(View.INVISIBLE); // animateCallControls needs this to be invisible for a check.
+        }
+        initViews();
 
         callInfosLinearLayout.setVisibility(View.VISIBLE);
         selfVideoViewWrapper.setVisibility(View.VISIBLE);

From 78653e7d8ddc7250af1733220ab037a254e88946 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Mon, 25 Oct 2021 11:23:32 +0200
Subject: [PATCH 13/50] show call controls in videocall when entering call or
 when come back from pip mode

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../java/com/nextcloud/talk/controllers/CallController.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
index d9763c5c4..3e330a143 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
@@ -522,6 +522,8 @@ public class CallController extends BaseController {
             }
         });
 
+        animateCallControls(true, 0);
+
         initGridAdapter();
     }
 

From 2c1b45491d9b6a63f18a813a205954ce5796a4d2 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Mon, 25 Oct 2021 11:52:05 +0200
Subject: [PATCH 14/50] start pip mode when back button is pressed

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../com/nextcloud/talk/activities/MagicCallActivity.kt | 10 ++++++----
 .../com/nextcloud/talk/controllers/CallController.java |  7 +------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
index 326bddc12..d485ee963 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
@@ -89,13 +89,15 @@ class MagicCallActivity : BaseActivity() {
 
     }
 
-    @RequiresApi(Build.VERSION_CODES.O)
-    fun enterPipMode() {
-        enableKeyguard()
-        enterPictureInPictureMode(getPipParams())
+    override fun onBackPressed() {
+        enterPipMode()
     }
 
     override fun onUserLeaveHint() {
+        enterPipMode()
+    }
+
+    fun enterPipMode() {
         enableKeyguard()
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             enterPictureInPictureMode(getPipParams())
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
index 3e330a143..d0954cea0 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
@@ -865,12 +865,7 @@ public class CallController extends BaseController {
 
     @OnClick(R.id.callControlEnterPip)
     void enterPipMode() {
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O){
-            ((MagicCallActivity) getActivity()).enterPipMode();
-        } else{
-            Log.w(TAG, "tried to enterPipMode with an android api level below 26 (Android 8). This scenario should " +
-                "have been avoided by hiding the PIP button!");
-        }
+        ((MagicCallActivity) getActivity()).enterPipMode();
     }
 
     @OnClick(R.id.callControlHangupView)

From e0e3bf4c32121f87ae4fca61843332d708e3ba22 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Tue, 26 Oct 2021 14:58:37 +0200
Subject: [PATCH 15/50] add logging and comments

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../talk/controllers/CallController.java       | 18 ++++++++++++++----
 .../CallNotificationController.java            |  3 ++-
 .../talk/controllers/ChatController.kt         |  6 ++++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
index d0954cea0..b9c6e60d5 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
@@ -1252,9 +1252,16 @@ public class CallController extends BaseController {
 
         int apiVersion = ApiUtils.getConversationApiVersion(conversationUser,  new int[] {ApiUtils.APIv4, 1});
 
+        Log.d(TAG, "joinRoomAndCall");
+        Log.d(TAG, "   baseUrl= " + baseUrl);
+        Log.d(TAG, "   roomToken= " + roomToken);
+        Log.d(TAG, "   callSession= " + callSession);
+
+        String url = ApiUtils.getUrlForParticipantsActive(apiVersion, baseUrl, roomToken);
+        Log.d(TAG, "   url= " + url);
+
         if (TextUtils.isEmpty(callSession)) {
-            ncApi.joinRoom(credentials, ApiUtils.getUrlForParticipantsActive(apiVersion, baseUrl, roomToken),
-                           conversationPassword)
+            ncApi.joinRoom(credentials, url, conversationPassword)
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
                     .retry(3)
@@ -1267,6 +1274,8 @@ public class CallController extends BaseController {
                         @Override
                         public void onNext(@io.reactivex.annotations.NonNull RoomOverall roomOverall) {
                             callSession = roomOverall.getOcs().getData().getSessionId();
+                            Log.d(TAG, " new callSession by joinRoom= " + callSession);
+
                             ApplicationWideCurrentRoomHolder.getInstance().setSession(callSession);
                             ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomId(roomId);
                             ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomToken(roomToken);
@@ -1276,12 +1285,12 @@ public class CallController extends BaseController {
 
                         @Override
                         public void onError(@io.reactivex.annotations.NonNull Throwable e) {
-                            // unused atm
+                            Log.e(TAG, "joinRoom onError", e);
                         }
 
                         @Override
                         public void onComplete() {
-                            // unused atm
+                            Log.d(TAG, "joinRoom onComplete");
                         }
                     });
         } else {
@@ -1640,6 +1649,7 @@ public class CallController extends BaseController {
                 });
     }
 
+    // TODO: why is this never called?!
     private void leaveRoom(boolean shutDownView) {
         int apiVersion = ApiUtils.getConversationApiVersion(conversationUser, new int[] {ApiUtils.APIv4, 1});
 
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
index 66e6dcdf7..04030bce1 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
@@ -315,7 +315,8 @@ public class CallNotificationController extends BaseController {
             conversationNameTextView.setText(currentConversation.getDisplayName());
         }
 
-        loadAvatar();
+        // TODO: load avatar, but don't block UI!
+//        loadAvatar();
         checkIfAnyParticipantsRemainInRoom();
         showAnswerControls();
     }
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
index 48617a730..830bb6404 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -269,6 +269,8 @@ class ChatController(args: Bundle) :
         this.roomToken = args.getString(KEY_ROOM_TOKEN, "")
         this.sharedText = args.getString(BundleKeys.KEY_SHARED_TEXT, "")
 
+        Log.d(TAG, "roomToken = " + roomToken)
+
         if (args.containsKey(KEY_ACTIVE_CONVERSATION)) {
             this.currentConversation = Parcels.unwrap<Conversation>(args.getParcelable(KEY_ACTIVE_CONVERSATION))
         }
@@ -289,6 +291,7 @@ class ChatController(args: Bundle) :
     }
 
     private fun getRoomInfo() {
+        Log.d(TAG, "getRoomInfo")
         val shouldRepeat = CapabilitiesUtil.hasSpreedFeatureCapability(conversationUser, "webinary-lobby")
         if (shouldRepeat) {
             checkingLobbyStatus = true
@@ -308,6 +311,8 @@ class ChatController(args: Bundle) :
                     @Suppress("Detekt.TooGenericExceptionCaught")
                     override fun onNext(roomOverall: RoomOverall) {
                         currentConversation = roomOverall.ocs.data
+                        Log.d(TAG, "currentConversation.toString : " + currentConversation.toString())
+                        Log.d(TAG, "currentConversation.sessionId : " + currentConversation?.sessionId)
                         loadAvatarForStatusBar()
 
                         setTitle()
@@ -419,6 +424,7 @@ class ChatController(args: Bundle) :
 
     override fun onViewBound(view: View) {
         actionBar?.show()
+        Log.d(TAG, "onViewBound")
         var adapterWasNull = false
 
         if (adapter == null) {

From 51b86b5a881ca8a61a62a954c5c6463e812f0e68 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Tue, 26 Oct 2021 15:00:03 +0200
Subject: [PATCH 16/50] fix currentRoomToken for
 ApplicationWideCurrentRoomHolder

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../main/java/com/nextcloud/talk/controllers/ChatController.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
index 830bb6404..d8708bdf3 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -1373,7 +1373,7 @@ class ChatController(args: Bundle) :
         }
 
         ApplicationWideCurrentRoomHolder.getInstance().currentRoomId = roomId
-        ApplicationWideCurrentRoomHolder.getInstance().currentRoomToken = roomId
+        ApplicationWideCurrentRoomHolder.getInstance().currentRoomToken = roomToken
         ApplicationWideCurrentRoomHolder.getInstance().userInRoom = conversationUser
 
         val smileyButton = binding.messageInputView.findViewById<ImageButton>(R.id.smileyButton)

From 0d1e0af9d12744ca2d7aec67c295b413c6378987 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Tue, 26 Oct 2021 20:20:18 +0200
Subject: [PATCH 17/50] fix NPE when call is joined by notification

add ability to have PIP mode for calls joined by notification

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../java/com/nextcloud/talk/activities/MagicCallActivity.kt   | 4 ++--
 .../java/com/nextcloud/talk/controllers/CallController.java   | 2 +-
 .../talk/controllers/CallNotificationController.java          | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
index d485ee963..5be79df36 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
@@ -82,7 +82,7 @@ class MagicCallActivity : BaseActivity() {
                     RouterTransaction.with(CallController(intent.extras))
                         .pushChangeHandler(HorizontalChangeHandler())
                         .popChangeHandler(HorizontalChangeHandler())
-                        .tag("CallController")
+                        .tag(CallController.TAG)
                 )
             }
         }
@@ -153,7 +153,7 @@ class MagicCallActivity : BaseActivity() {
         super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
         isInPipMode = isInPictureInPictureMode
 
-        val callController = router?.getControllerWithTag("CallController") as CallController
+        val callController = router?.getControllerWithTag(CallController.TAG) as CallController
         if (isInPictureInPictureMode) {
             callController.updateUiForPipMode()
         } else {
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
index b9c6e60d5..98c318469 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
@@ -161,7 +161,7 @@ import pub.devrel.easypermissions.AfterPermissionGranted;
 @AutoInjector(NextcloudTalkApplication.class)
 public class CallController extends BaseController {
 
-    private static final String TAG = "CallController";
+    public static final String TAG = "CallController";
 
     private static final String[] PERMISSIONS_CALL = {
             android.Manifest.permission.CAMERA,
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
index 04030bce1..5ac497949 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
@@ -200,7 +200,8 @@ public class CallNotificationController extends BaseController {
 
         getRouter().replaceTopController(RouterTransaction.with(new CallController(originalBundle))
                                                  .popChangeHandler(new HorizontalChangeHandler())
-                                                 .pushChangeHandler(new HorizontalChangeHandler()));
+                                                 .pushChangeHandler(new HorizontalChangeHandler())
+                                                 .tag(CallController.TAG));
     }
 
     private void checkIfAnyParticipantsRemainInRoom() {

From 03913b40a23ab1785ab5290b4e7393e15ec0e8f5 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Wed, 27 Oct 2021 12:47:45 +0200
Subject: [PATCH 18/50] fix to enable pip for CallNotification Controller

methods to update UI are not yet implemented. maybe it's better to make two Activities: one for Call and one for CallNotification...

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../talk/activities/MagicCallActivity.kt      | 20 ++++++++++++++-----
 .../CallNotificationController.java           |  2 +-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
index 5be79df36..c9220d7ba 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
@@ -76,6 +76,7 @@ class MagicCallActivity : BaseActivity() {
                     RouterTransaction.with(CallNotificationController(intent.extras))
                         .pushChangeHandler(HorizontalChangeHandler())
                         .popChangeHandler(HorizontalChangeHandler())
+                        .tag(CallNotificationController.TAG)
                 )
             } else {
                 router!!.setRoot(
@@ -153,11 +154,20 @@ class MagicCallActivity : BaseActivity() {
         super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
         isInPipMode = isInPictureInPictureMode
 
-        val callController = router?.getControllerWithTag(CallController.TAG) as CallController
-        if (isInPictureInPictureMode) {
-            callController.updateUiForPipMode()
-        } else {
-            callController.updateUiForNormalMode()
+        if (router?.getControllerWithTag(CallNotificationController.TAG) != null) {
+            val callNotificationController = router?.getControllerWithTag(CallNotificationController.TAG) as CallNotificationController
+            if (isInPictureInPictureMode) {
+                // callNotificationController.updateUiForPipMode()
+            } else {
+                // callNotificationController.updateUiForNormalMode()
+            }
+        } else if (router?.getControllerWithTag(CallController.TAG) != null) {
+            val callController = router?.getControllerWithTag(CallController.TAG) as CallController
+            if (isInPictureInPictureMode) {
+                callController.updateUiForPipMode()
+            } else {
+                callController.updateUiForNormalMode()
+            }
         }
     }
 
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
index 5ac497949..a013f25a5 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
@@ -101,7 +101,7 @@ import okhttp3.Cache;
 @AutoInjector(NextcloudTalkApplication.class)
 public class CallNotificationController extends BaseController {
 
-    private static final String TAG = "CallNotificationController";
+    public static final String TAG = "CallNotificationController";
 
     @Inject
     NcApi ncApi;

From 3afcceae5011a2a8c8879f98547c5ba00fa398a2 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Wed, 27 Oct 2021 12:52:56 +0200
Subject: [PATCH 19/50] delete creation of intent that is not used

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../com/nextcloud/talk/controllers/ContactsController.java  | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
index 59115a39e..3d202cfd4 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
@@ -22,7 +22,6 @@ package com.nextcloud.talk.controllers;
 
 import android.app.SearchManager;
 import android.content.Context;
-import android.content.Intent;
 import android.graphics.PorterDuff;
 import android.os.Build;
 import android.os.Bundle;
@@ -45,7 +44,6 @@ import com.bluelinelabs.conductor.changehandler.VerticalChangeHandler;
 import com.bluelinelabs.logansquare.LoganSquare;
 import com.kennyc.bottomsheet.BottomSheet;
 import com.nextcloud.talk.R;
-import com.nextcloud.talk.activities.MagicCallActivity;
 import com.nextcloud.talk.adapters.items.GenericTextHeaderItem;
 import com.nextcloud.talk.adapters.items.UserItem;
 import com.nextcloud.talk.api.NcApi;
@@ -106,7 +104,6 @@ import eu.davidea.flexibleadapter.FlexibleAdapter;
 import eu.davidea.flexibleadapter.SelectableAdapter;
 import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager;
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem;
-import eu.davidea.flexibleadapter.items.IFlexible;
 import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
@@ -897,13 +894,10 @@ public class ContactsController extends BaseController implements SearchView.OnQ
                             @Override
                             public void onNext(RoomOverall roomOverall) {
                                 if (getActivity() != null) {
-                                    Intent conversationIntent = new Intent(getActivity(), MagicCallActivity.class);
                                     Bundle bundle = new Bundle();
                                     bundle.putParcelable(BundleKeys.INSTANCE.getKEY_USER_ENTITY(), currentUser);
                                     bundle.putString(BundleKeys.INSTANCE.getKEY_ROOM_TOKEN(), roomOverall.getOcs().getData().getToken());
                                     bundle.putString(BundleKeys.INSTANCE.getKEY_ROOM_ID(), roomOverall.getOcs().getData().getRoomId());
-                                    conversationIntent.putExtras(bundle);
-
                                     bundle.putParcelable(BundleKeys.INSTANCE.getKEY_ACTIVE_CONVERSATION(),
                                                          Parcels.wrap(roomOverall.getOcs().getData()));
 

From 06fab75c309a0b8db418e582d244c7e864dbdd13 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Wed, 27 Oct 2021 13:04:00 +0200
Subject: [PATCH 20/50] remove unused view

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 app/src/main/res/layout/activity_magic_call.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app/src/main/res/layout/activity_magic_call.xml b/app/src/main/res/layout/activity_magic_call.xml
index 7ea065fa5..046293920 100644
--- a/app/src/main/res/layout/activity_magic_call.xml
+++ b/app/src/main/res/layout/activity_magic_call.xml
@@ -29,11 +29,4 @@
         android:id="@+id/controller_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
-
-    <com.bluelinelabs.conductor.ChangeHandlerFrameLayout
-        android:id="@+id/chatControllerView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone" />
-
 </RelativeLayout>

From b49a1b9274281f0efea92a2069c4d66c4a245cc3 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Wed, 27 Oct 2021 13:17:13 +0200
Subject: [PATCH 21/50] remove unused import

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../controllers/bottomsheet/OperationsMenuController.java     | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java
index d1226ba3a..d084ee654 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java
@@ -38,7 +38,6 @@ import com.bluelinelabs.conductor.RouterTransaction;
 import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler;
 import com.bluelinelabs.logansquare.LoganSquare;
 import com.nextcloud.talk.R;
-import com.nextcloud.talk.activities.MagicCallActivity;
 import com.nextcloud.talk.api.NcApi;
 import com.nextcloud.talk.application.NextcloudTalkApplication;
 import com.nextcloud.talk.controllers.base.BaseController;
@@ -714,7 +713,6 @@ public class OperationsMenuController extends BaseController {
         eventBus.post(new BottomSheetLockEvent(true, 0,
                                                true, true, dismissView));
 
-        Intent conversationIntent = new Intent(getActivity(), MagicCallActivity.class);
         Bundle bundle = new Bundle();
         bundle.putString(BundleKeys.INSTANCE.getKEY_ROOM_TOKEN(), conversation.getToken());
         bundle.putString(BundleKeys.INSTANCE.getKEY_ROOM_ID(), conversation.getRoomId());
@@ -723,8 +721,6 @@ public class OperationsMenuController extends BaseController {
         bundle.putParcelable(BundleKeys.INSTANCE.getKEY_ACTIVE_CONVERSATION(), Parcels.wrap(conversation));
         bundle.putString(BundleKeys.INSTANCE.getKEY_CONVERSATION_PASSWORD(), callPassword);
 
-        conversationIntent.putExtras(bundle);
-
         if (getParentController() != null) {
             ConductorRemapping.INSTANCE.remapChatController(getParentController().getRouter(), currentUser.getId(),
                                                             conversation.getToken(), bundle, true);

From 251d41f7fbf4287e5daed4f996f67caef32e5431 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Thu, 28 Oct 2021 00:10:06 +0200
Subject: [PATCH 22/50] replace CallController with CallActivity etc. (WIP)

- delete MagicCallActivity
- replace butterknife with viewbinding for CallActivity

TODO:
- also switch CallNotificationController to Activity
- check if CallActivity and CallNotificationActivity are called correctly
- testing!

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../firebase/MagicFirebaseMessagingService.kt |   4 +-
 app/src/main/AndroidManifest.xml              |   2 +-
 .../CallActivity.java}                        | 845 +++++++++---------
 .../talk/activities/MagicCallActivity.kt      | 184 ----
 .../CallNotificationController.java           |  18 +-
 .../talk/controllers/ChatController.kt        |   6 +-
 .../talk/jobs/NotificationWorker.java         |   4 +-
 .../main/res/layout/activity_magic_call.xml   |  32 -
 app/src/main/res/layout/call_states.xml       |   2 +-
 app/src/main/res/layout/controller_call.xml   |  21 +-
 .../layout/controller_call_notification.xml   |   2 +-
 11 files changed, 455 insertions(+), 665 deletions(-)
 rename app/src/main/java/com/nextcloud/talk/{controllers/CallController.java => activities/CallActivity.java} (78%)
 delete mode 100644 app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
 delete mode 100644 app/src/main/res/layout/activity_magic_call.xml

diff --git a/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt b/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt
index babda90c6..42c18b51c 100644
--- a/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt
+++ b/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt
@@ -41,7 +41,7 @@ import com.bluelinelabs.logansquare.LoganSquare
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 import com.nextcloud.talk.R
-import com.nextcloud.talk.activities.MagicCallActivity
+import com.nextcloud.talk.activities.CallActivity
 import com.nextcloud.talk.api.NcApi
 import com.nextcloud.talk.application.NextcloudTalkApplication
 import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
@@ -178,7 +178,7 @@ class MagicFirebaseMessagingService : FirebaseMessagingService() {
                                 )
                             }
                         } else if (type == "call") {
-                            val fullScreenIntent = Intent(applicationContext, MagicCallActivity::class.java)
+                            val fullScreenIntent = Intent(applicationContext, CallActivity::class.java)
                             val bundle = Bundle()
                             bundle.putString(BundleKeys.KEY_ROOM_ID, decryptedPushMessage!!.id)
                             bundle.putParcelable(KEY_USER_ENTITY, signatureVerification!!.userEntity)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 00de93a50..a1f1ae7e5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -123,7 +123,7 @@
         </activity>
 
         <activity
-            android:name=".activities.MagicCallActivity"
+            android:name=".activities.CallActivity"
             android:theme="@style/AppTheme.CallLauncher"
             android:supportsPictureInPicture="true"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
similarity index 78%
rename from app/src/main/java/com/nextcloud/talk/controllers/CallController.java
rename to app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
index 98c318469..cd5787547 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -18,12 +18,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.nextcloud.talk.controllers;
+package com.nextcloud.talk.activities;
 
 import android.Manifest;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.annotation.SuppressLint;
+import android.app.KeyguardManager;
+import android.app.PictureInPictureParams;
 import android.content.res.Configuration;
 import android.graphics.Color;
 import android.media.AudioAttributes;
@@ -36,28 +38,23 @@ import android.os.Looper;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;
-import android.view.LayoutInflater;
+import android.util.Rational;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
+import android.view.Window;
+import android.view.WindowManager;
 import android.widget.FrameLayout;
-import android.widget.GridView;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
-import android.widget.TextView;
 
 import com.bluelinelabs.logansquare.LoganSquare;
-import com.facebook.drawee.view.SimpleDraweeView;
 import com.nextcloud.talk.R;
-import com.nextcloud.talk.activities.MagicCallActivity;
 import com.nextcloud.talk.adapters.ParticipantDisplayItem;
 import com.nextcloud.talk.adapters.ParticipantsAdapter;
 import com.nextcloud.talk.api.NcApi;
 import com.nextcloud.talk.application.NextcloudTalkApplication;
-import com.nextcloud.talk.controllers.base.BaseController;
+import com.nextcloud.talk.databinding.ControllerCallBinding;
 import com.nextcloud.talk.events.ConfigurationChangeEvent;
 import com.nextcloud.talk.events.MediaStreamEvent;
 import com.nextcloud.talk.events.NetworkEvent;
@@ -122,7 +119,6 @@ import org.webrtc.PeerConnectionFactory;
 import org.webrtc.RendererCommon;
 import org.webrtc.SessionDescription;
 import org.webrtc.SurfaceTextureHelper;
-import org.webrtc.SurfaceViewRenderer;
 import org.webrtc.VideoCapturer;
 import org.webrtc.VideoSource;
 import org.webrtc.VideoTrack;
@@ -141,12 +137,9 @@ import javax.inject.Inject;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatActivity;
 import autodagger.AutoInjector;
-import butterknife.BindView;
-import butterknife.OnClick;
-import butterknife.OnItemClick;
-import butterknife.OnLongClick;
 import io.reactivex.Observable;
 import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -159,9 +152,9 @@ import okhttp3.Cache;
 import pub.devrel.easypermissions.AfterPermissionGranted;
 
 @AutoInjector(NextcloudTalkApplication.class)
-public class CallController extends BaseController {
+public class CallActivity extends BaseActivity {
 
-    public static final String TAG = "CallController";
+    public static final String TAG = "CallActivity";
 
     private static final String[] PERMISSIONS_CALL = {
             android.Manifest.permission.CAMERA,
@@ -176,52 +169,6 @@ public class CallController extends BaseController {
             Manifest.permission.RECORD_AUDIO
     };
 
-    @BindView(R.id.callControlEnableSpeaker)
-    SimpleDraweeView callControlEnableSpeaker;
-
-    @BindView(R.id.selfVideoRenderer)
-    SurfaceViewRenderer selfVideoRenderer;
-
-    @BindView(R.id.selfVideoViewWrapper)
-    FrameLayout selfVideoViewWrapper;
-
-    @BindView(R.id.controllerCallLayout)
-    RelativeLayout controllerCallLayout;
-    @BindView(R.id.gridview)
-    GridView gridView;
-
-    @BindView(R.id.callControlsLinearLayout)
-    LinearLayout callControls;
-    @BindView(R.id.call_control_microphone)
-    SimpleDraweeView microphoneControlButton;
-    @BindView(R.id.call_control_camera)
-    SimpleDraweeView cameraControlButton;
-    @BindView(R.id.call_control_switch_camera)
-    SimpleDraweeView cameraSwitchButton;
-    @BindView(R.id.callStateTextView)
-    TextView callStateTextView;
-
-    @BindView(R.id.callInfosLinearLayout)
-    LinearLayout callInfosLinearLayout;
-    @BindView(R.id.callVoiceOrVideoTextView)
-    TextView callVoiceOrVideoTextView;
-    @BindView(R.id.callConversationNameTextView)
-    TextView callConversationNameTextView;
-    @BindView(R.id.callControlEnterPip)
-    SimpleDraweeView callControlEnterPip;
-
-    @BindView(R.id.callStateRelativeLayoutView)
-    RelativeLayout callStateView;
-
-    @BindView(R.id.conversationRelativeLayoutView)
-    RelativeLayout conversationView;
-
-    @BindView(R.id.errorImageView)
-    ImageView errorImageView;
-
-    @BindView(R.id.callStateProgressBar)
-    ProgressBar progressBar;
-
     @Inject
     NcApi ncApi;
     @Inject
@@ -293,29 +240,46 @@ public class CallController extends BaseController {
     private Map<String, ParticipantDisplayItem> participantDisplayItems;
     private ParticipantsAdapter participantsAdapter;
 
+    private Boolean isInPipMode = false;
+
+    private ControllerCallBinding binding;
+
     @Parcel
     public enum CallStatus {
         CONNECTING, CALLING_TIMEOUT, JOINED, IN_CONVERSATION, RECONNECTING, OFFLINE, LEAVING, PUBLISHER_FAILED
     }
 
-    public CallController(Bundle args) {
-        super(args);
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
         NextcloudTalkApplication.Companion.getSharedApplication().getComponentApplication().inject(this);
 
-        roomId = args.getString(BundleKeys.INSTANCE.getKEY_ROOM_ID(), "");
-        roomToken = args.getString(BundleKeys.INSTANCE.getKEY_ROOM_TOKEN(), "");
-        conversationUser = args.getParcelable(BundleKeys.INSTANCE.getKEY_USER_ENTITY());
-        conversationPassword = args.getString(BundleKeys.INSTANCE.getKEY_CONVERSATION_PASSWORD(), "");
-        conversationName = args.getString(BundleKeys.INSTANCE.getKEY_CONVERSATION_NAME(), "");
-        isVoiceOnlyCall = args.getBoolean(BundleKeys.INSTANCE.getKEY_CALL_VOICE_ONLY(), false);
+        setTheme(R.style.CallTheme);
 
-        if (args.containsKey(BundleKeys.INSTANCE.getKEY_FROM_NOTIFICATION_START_CALL())) {
-            isIncomingCallFromNotification = args.getBoolean(BundleKeys.INSTANCE.getKEY_FROM_NOTIFICATION_START_CALL());
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dismissKeyguard();
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+
+        binding = ControllerCallBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        Bundle extras = getIntent().getExtras();
+        roomId = extras.getString(BundleKeys.INSTANCE.getKEY_ROOM_ID(), "");
+        roomToken = extras.getString(BundleKeys.INSTANCE.getKEY_ROOM_TOKEN(), "");
+        conversationUser = extras.getParcelable(BundleKeys.INSTANCE.getKEY_USER_ENTITY());
+        conversationPassword = extras.getString(BundleKeys.INSTANCE.getKEY_CONVERSATION_PASSWORD(), "");
+        conversationName = extras.getString(BundleKeys.INSTANCE.getKEY_CONVERSATION_NAME(), "");
+        isVoiceOnlyCall = extras.getBoolean(BundleKeys.INSTANCE.getKEY_CALL_VOICE_ONLY(), false);
+
+        if (extras.containsKey(BundleKeys.INSTANCE.getKEY_FROM_NOTIFICATION_START_CALL())) {
+            isIncomingCallFromNotification = extras.getBoolean(BundleKeys.INSTANCE.getKEY_FROM_NOTIFICATION_START_CALL());
         }
 
         credentials = ApiUtils.getCredentials(conversationUser.getUsername(), conversationUser.getToken());
 
-        baseUrl = args.getString(BundleKeys.INSTANCE.getKEY_MODIFIED_BASE_URL(), "");
+        baseUrl = extras.getString(BundleKeys.INSTANCE.getKEY_MODIFIED_BASE_URL(), "");
 
         if (TextUtils.isEmpty(baseUrl)) {
             baseUrl = conversationUser.getBaseUrl();
@@ -323,61 +287,76 @@ public class CallController extends BaseController {
 
         powerManagerUtils = new PowerManagerUtils();
 
-        if (args.getString("state", "").equalsIgnoreCase("resume")) {
+        if (extras.getString("state", "").equalsIgnoreCase("resume")) {
             setCallState(CallStatus.IN_CONVERSATION);
         } else {
             setCallState(CallStatus.CONNECTING);
         }
+
+        binding.microphoneButton.setOnClickListener(l -> onMicrophoneClick());
+        binding.microphoneButton.setOnLongClickListener(l -> {
+            if (!audioOn) {
+                callControlHandler.removeCallbacksAndMessages(null);
+                callInfosHandler.removeCallbacksAndMessages(null);
+                cameraSwitchHandler.removeCallbacksAndMessages(null);
+                isPTTActive = true;
+                binding.callControls.setVisibility(View.VISIBLE);
+                if (!isVoiceOnlyCall) {
+                    binding.switchSelfVideoButton.setVisibility(View.VISIBLE);
+                }
+            }
+            onMicrophoneClick();
+            return true;
+        });
+
+        initClickListeners();
     }
 
-    @Override
-    protected View inflateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup container) {
-        return inflater.inflate(R.layout.controller_call, container, false);
+    private void initClickListeners() {
+        binding.pictureInPictureButton.setOnClickListener(l -> enterPipMode());
+
+        binding.speakerButton.setOnClickListener(l -> {
+            if (audioManager != null) {
+                audioManager.toggleUseSpeakerphone();
+                if (audioManager.isSpeakerphoneAutoOn()) {
+                    binding.speakerButton.getHierarchy().setPlaceholderImage(R.drawable.ic_volume_up_white_24dp);
+                } else {
+                    binding.speakerButton.getHierarchy().setPlaceholderImage(R.drawable.ic_volume_mute_white_24dp);
+                }
+            }
+        });
+
+        binding.cameraButton.setOnClickListener(l -> onCameraClick());
+
+        binding.hangupButton.setOnClickListener(l -> {
+            setCallState(CallStatus.LEAVING);
+            hangup(true);
+        });
+
+        binding.switchSelfVideoButton.setOnClickListener(l -> switchCamera());
+
+        binding.gridview.setOnItemClickListener((parent, view, position, id) -> animateCallControls(true, 0));
+
+        binding.callStates.callStateRelativeLayout.setOnClickListener(l -> {
+            if (currentCallStatus.equals(CallStatus.CALLING_TIMEOUT)) {
+                setCallState(CallStatus.RECONNECTING);
+                hangupNetworkCalls(false);
+            }
+        });
     }
 
     private void createCameraEnumerator() {
-        if (getActivity() != null) {
-            boolean camera2EnumeratorIsSupported = false;
-            try {
-                camera2EnumeratorIsSupported = Camera2Enumerator.isSupported(getActivity());
-            } catch (final Throwable throwable) {
-                Log.w(TAG, "Camera2Enumator threw an error");
-            }
-
-            if (camera2EnumeratorIsSupported) {
-                cameraEnumerator = new Camera2Enumerator(getActivity());
-            } else {
-                cameraEnumerator = new Camera1Enumerator(MagicWebRTCUtils.shouldEnableVideoHardwareAcceleration());
-            }
-        }
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    @Override
-    protected void onViewBound(@NonNull View view) {
-        super.onViewBound(view);
-
-        microphoneControlButton.setOnTouchListener(new MicrophoneButtonTouchListener());
-
-        pulseAnimation = PulseAnimation.create().with(microphoneControlButton)
-                .setDuration(310)
-                .setRepeatCount(PulseAnimation.INFINITE)
-                .setRepeatMode(PulseAnimation.REVERSE);
-
-
+        boolean camera2EnumeratorIsSupported = false;
         try {
-            cache.evictAll();
-        } catch (IOException e) {
-            Log.e(TAG, "Failed to evict cache");
+            camera2EnumeratorIsSupported = Camera2Enumerator.isSupported(this);
+        } catch (final Throwable throwable) {
+            Log.w(TAG, "Camera2Enumator threw an error");
         }
 
-        callControls.setZ(100.0f);
-        basicInitialization();
-        participantDisplayItems = new HashMap<>();
-        initViews();
-        updateSelfVideoViewPosition();
-        if (!isConnectionEstablished()){
-            initiateCall();
+        if (camera2EnumeratorIsSupported) {
+            cameraEnumerator = new Camera2Enumerator(this);
+        } else {
+            cameraEnumerator = new Camera1Enumerator(MagicWebRTCUtils.shouldEnableVideoHardwareAcceleration());
         }
     }
 
@@ -480,43 +459,43 @@ public class CallController extends BaseController {
 
     @SuppressLint("ClickableViewAccessibility")
     private void initViews() {
-        callInfosLinearLayout.setVisibility(View.VISIBLE);
-        selfVideoViewWrapper.setVisibility(View.VISIBLE);
+        binding.callInfosLinearLayout.setVisibility(View.VISIBLE);
+        binding.selfVideoViewWrapper.setVisibility(View.VISIBLE);
 
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-            callControlEnterPip.setVisibility(View.GONE);
+            binding.pictureInPictureButton.setVisibility(View.GONE);
         }
 
         if (isVoiceOnlyCall) {
-            callControlEnableSpeaker.setVisibility(View.VISIBLE);
-            cameraSwitchButton.setVisibility(View.GONE);
-            cameraControlButton.setVisibility(View.GONE);
-            selfVideoRenderer.setVisibility(View.GONE);
+            binding.speakerButton.setVisibility(View.VISIBLE);
+            binding.switchSelfVideoButton.setVisibility(View.GONE);
+            binding.cameraButton.setVisibility(View.GONE);
+            binding.selfVideoRenderer.setVisibility(View.GONE);
 
             RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
                                                                                  ViewGroup.LayoutParams.WRAP_CONTENT);
             params.addRule(RelativeLayout.BELOW, R.id.callInfosLinearLayout);
             int callControlsHeight = Math.round(getApplicationContext().getResources().getDimension(R.dimen.call_controls_height));
             params.setMargins(0,0,0, callControlsHeight);
-            gridView.setLayoutParams(params);
+            binding.gridview.setLayoutParams(params);
         } else {
             RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
                                                                                  ViewGroup.LayoutParams.WRAP_CONTENT);
             params.setMargins(0,0,0, 0);
-            gridView.setLayoutParams(params);
+            binding.gridview.setLayoutParams(params);
 
-            callControlEnableSpeaker.setVisibility(View.GONE);
+            binding.speakerButton.setVisibility(View.GONE);
             if (cameraEnumerator.getDeviceNames().length < 2) {
-                cameraSwitchButton.setVisibility(View.GONE);
+                binding.switchSelfVideoButton.setVisibility(View.GONE);
             }
             initSelfVideoView();
         }
 
-        gridView.setOnTouchListener(new View.OnTouchListener() {
+        binding.gridview.setOnTouchListener(new View.OnTouchListener() {
             public boolean onTouch(View v, MotionEvent me) {
                 int action = me.getActionMasked();
                 if (action == MotionEvent.ACTION_DOWN) {
-                    showCallControls();
+                    animateCallControls(true, 0);
                 }
                 return false;
             }
@@ -530,21 +509,20 @@ public class CallController extends BaseController {
     @SuppressLint("ClickableViewAccessibility")
     private void initSelfVideoView() {
         try{
-            selfVideoRenderer.init(rootEglBase.getEglBaseContext(), null);
+            binding.selfVideoRenderer.init(rootEglBase.getEglBaseContext(), null);
         } catch(IllegalStateException e) {
             Log.d(TAG, "selfVideoRenderer already initialized", e);
         }
 
-        selfVideoRenderer.setZOrderMediaOverlay(true);
+        binding.selfVideoRenderer.setZOrderMediaOverlay(true);
         // disabled because it causes some devices to crash
-        selfVideoRenderer.setEnableHardwareScaler(false);
-        selfVideoRenderer.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FIT);
-        selfVideoRenderer.setOnTouchListener(new SelfVideoTouchListener());
+        binding.selfVideoRenderer.setEnableHardwareScaler(false);
+        binding.selfVideoRenderer.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FIT);
+        binding.selfVideoRenderer.setOnTouchListener(new SelfVideoTouchListener());
     }
 
     private void initGridAdapter() {
-        if (conversationView != null) {
-            GridView gridView = conversationView.findViewById(R.id.gridview);
+        if (binding.conversationRelativeLayout != null) {
 
             int columns;
             int participantsInGrid = participantDisplayItems.size();
@@ -564,34 +542,32 @@ public class CallController extends BaseController {
                 }
             }
 
-            gridView.setNumColumns(columns);
+            binding.gridview.setNumColumns(columns);
 
-            RelativeLayout gridViewWrapper = conversationView.findViewById(R.id.conversationRelativeLayoutView);
-            gridViewWrapper.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+            binding.conversationRelativeLayout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
                 @Override
                 public void onGlobalLayout() {
-                    gridViewWrapper.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-                    int height = gridViewWrapper.getMeasuredHeight();
-                    gridView.setMinimumHeight(height);
+                    binding.conversationRelativeLayout.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                    int height = binding.conversationRelativeLayout.getMeasuredHeight();
+                    binding.gridview.setMinimumHeight(height);
                 }
             });
 
-            LinearLayout callInfosLinearLayout = conversationView.findViewById(R.id.callInfosLinearLayout);
-            callInfosLinearLayout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+            binding.callInfosLinearLayout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
                 @Override
                 public void onGlobalLayout() {
-                    callInfosLinearLayout.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                    binding.callInfosLinearLayout.getViewTreeObserver().removeOnGlobalLayoutListener(this);
                 }
             });
 
             participantsAdapter = new ParticipantsAdapter(
-                    this.getActivity(),
+                    this,
                     participantDisplayItems,
-                    gridViewWrapper,
-                    callInfosLinearLayout,
+                    binding.conversationRelativeLayout,
+                    binding.callInfosLinearLayout,
                     columns,
                     isVoiceOnlyCall);
-            gridView.setAdapter(participantsAdapter);
+            binding.gridview.setAdapter(participantsAdapter);
         }
     }
 
@@ -599,7 +575,7 @@ public class CallController extends BaseController {
     private void checkPermissions() {
         if (isVoiceOnlyCall) {
             onMicrophoneClick();
-        } else if (getActivity() != null) {
+        } else {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 requestPermissions(PERMISSIONS_CALL, 100);
             } else {
@@ -615,7 +591,7 @@ public class CallController extends BaseController {
 
     @AfterPermissionGranted(100)
     private void onPermissionsGranted() {
-        if (EffortlessPermissions.hasPermissions(getActivity(), PERMISSIONS_CALL)) {
+        if (EffortlessPermissions.hasPermissions(this, PERMISSIONS_CALL)) {
             if (!videoOn && !isVoiceOnlyCall) {
                 onCameraClick();
             }
@@ -626,19 +602,18 @@ public class CallController extends BaseController {
 
             if (!isVoiceOnlyCall) {
                 if (cameraEnumerator.getDeviceNames().length == 0) {
-                    cameraControlButton.setVisibility(View.GONE);
+                    binding.cameraButton.setVisibility(View.GONE);
                 }
 
                 if (cameraEnumerator.getDeviceNames().length > 1) {
-                    cameraSwitchButton.setVisibility(View.VISIBLE);
+                    binding.switchSelfVideoButton.setVisibility(View.VISIBLE);
                 }
             }
 
             if (!isConnectionEstablished()) {
                 fetchSignalingSettings();
             }
-        } else if (getActivity() != null && EffortlessPermissions.somePermissionPermanentlyDenied(getActivity(),
-                                                                                                  PERMISSIONS_CALL)) {
+        } else if (EffortlessPermissions.somePermissionPermanentlyDenied(this, PERMISSIONS_CALL)) {
             checkIfSomeAreApproved();
         }
 
@@ -647,30 +622,30 @@ public class CallController extends BaseController {
     private void checkIfSomeAreApproved() {
         if (!isVoiceOnlyCall) {
             if (cameraEnumerator.getDeviceNames().length == 0) {
-                cameraControlButton.setVisibility(View.GONE);
+                binding.cameraButton.setVisibility(View.GONE);
             }
 
             if (cameraEnumerator.getDeviceNames().length > 1) {
-                cameraSwitchButton.setVisibility(View.VISIBLE);
+                binding.switchSelfVideoButton.setVisibility(View.VISIBLE);
             }
 
-            if (getActivity() != null && EffortlessPermissions.hasPermissions(getActivity(), PERMISSIONS_CAMERA)) {
+            if (EffortlessPermissions.hasPermissions(this, PERMISSIONS_CAMERA)) {
                 if (!videoOn) {
                     onCameraClick();
                 }
             } else {
-                cameraControlButton.getHierarchy().setPlaceholderImage(R.drawable.ic_videocam_off_white_24px);
-                cameraControlButton.setAlpha(0.7f);
-                cameraSwitchButton.setVisibility(View.GONE);
+                binding.cameraButton.getHierarchy().setPlaceholderImage(R.drawable.ic_videocam_off_white_24px);
+                binding.cameraButton.setAlpha(0.7f);
+                binding.switchSelfVideoButton.setVisibility(View.GONE);
             }
         }
 
-        if (EffortlessPermissions.hasPermissions(getActivity(), PERMISSIONS_MICROPHONE)) {
+        if (EffortlessPermissions.hasPermissions(this, PERMISSIONS_MICROPHONE)) {
             if (!audioOn) {
                 onMicrophoneClick();
             }
         } else {
-            microphoneControlButton.getHierarchy().setPlaceholderImage(R.drawable.ic_mic_off_white_24px);
+            binding.microphoneButton.getHierarchy().setPlaceholderImage(R.drawable.ic_mic_off_white_24px);
         }
 
         if (!isConnectionEstablished()) {
@@ -682,14 +657,14 @@ public class CallController extends BaseController {
     private void onPermissionsDenied() {
         if (!isVoiceOnlyCall) {
             if (cameraEnumerator.getDeviceNames().length == 0) {
-                cameraControlButton.setVisibility(View.GONE);
+                binding.cameraButton.setVisibility(View.GONE);
             } else if (cameraEnumerator.getDeviceNames().length == 1) {
-                cameraSwitchButton.setVisibility(View.GONE);
+                binding.switchSelfVideoButton.setVisibility(View.GONE);
             }
         }
 
-        if (getActivity() != null && (EffortlessPermissions.hasPermissions(getActivity(), PERMISSIONS_CAMERA) ||
-                EffortlessPermissions.hasPermissions(getActivity(), PERMISSIONS_MICROPHONE))) {
+        if ((EffortlessPermissions.hasPermissions(this, PERMISSIONS_CAMERA) ||
+                EffortlessPermissions.hasPermissions(this, PERMISSIONS_MICROPHONE))) {
             checkIfSomeAreApproved();
         } else if (!isConnectionEstablished()) {
             fetchSignalingSettings();
@@ -725,7 +700,7 @@ public class CallController extends BaseController {
         localVideoTrack = peerConnectionFactory.createVideoTrack("NCv0", videoSource);
         localMediaStream.addTrack(localVideoTrack);
         localVideoTrack.setEnabled(false);
-        localVideoTrack.addSink(selfVideoRenderer);
+        localVideoTrack.addSink(binding.selfVideoRenderer);
     }
 
     private void microphoneInitialization() {
@@ -746,7 +721,7 @@ public class CallController extends BaseController {
                 Logging.d(TAG, "Creating front facing camera capturer.");
                 VideoCapturer videoCapturer = enumerator.createCapturer(deviceName, null);
                 if (videoCapturer != null) {
-                    selfVideoRenderer.setMirror(true);
+                    binding.selfVideoRenderer.setMirror(true);
                     return videoCapturer;
                 }
             }
@@ -761,7 +736,7 @@ public class CallController extends BaseController {
                 VideoCapturer videoCapturer = enumerator.createCapturer(deviceName, null);
 
                 if (videoCapturer != null) {
-                    selfVideoRenderer.setMirror(false);
+                    binding.selfVideoRenderer.setMirror(false);
                     return videoCapturer;
                 }
             }
@@ -770,41 +745,11 @@ public class CallController extends BaseController {
         return null;
     }
 
-    @OnLongClick(R.id.call_control_microphone)
-    boolean onMicrophoneLongClick() {
-        if (!audioOn) {
-            callControlHandler.removeCallbacksAndMessages(null);
-            callInfosHandler.removeCallbacksAndMessages(null);
-            cameraSwitchHandler.removeCallbacksAndMessages(null);
-            isPTTActive = true;
-            callControls.setVisibility(View.VISIBLE);
-            if (!isVoiceOnlyCall) {
-                cameraSwitchButton.setVisibility(View.VISIBLE);
-            }
-        }
-
-        onMicrophoneClick();
-        return true;
-    }
-
-    @OnClick(R.id.callControlEnableSpeaker)
-    public void onEnableSpeakerphoneClick() {
-        if (audioManager != null) {
-            audioManager.toggleUseSpeakerphone();
-            if (audioManager.isSpeakerphoneAutoOn()) {
-                callControlEnableSpeaker.getHierarchy().setPlaceholderImage(R.drawable.ic_volume_up_white_24dp);
-            } else {
-                callControlEnableSpeaker.getHierarchy().setPlaceholderImage(R.drawable.ic_volume_mute_white_24dp);
-            }
-        }
-    }
-
-    @OnClick(R.id.call_control_microphone)
     public void onMicrophoneClick() {
-        if (getActivity() != null && EffortlessPermissions.hasPermissions(getActivity(), PERMISSIONS_MICROPHONE)) {
+        if (EffortlessPermissions.hasPermissions(this, PERMISSIONS_MICROPHONE)) {
 
-            if (getActivity() != null && !appPreferences.getPushToTalkIntroShown()) {
-                spotlightView = new SpotlightView.Builder(getActivity())
+            if (!appPreferences.getPushToTalkIntroShown()) {
+                spotlightView = new SpotlightView.Builder(this)
                         .introAnimationDuration(300)
                         .enableRevealAnimation(true)
                         .performClick(false)
@@ -816,7 +761,7 @@ public class CallController extends BaseController {
                         .subHeadingTvSize(16)
                         .subHeadingTvText(getResources().getString(R.string.nc_push_to_talk_desc))
                         .maskColor(Color.parseColor("#dc000000"))
-                        .target(microphoneControlButton)
+                        .target(binding.microphoneButton)
                         .lineAnimDuration(400)
                         .lineAndArcColor(getResources().getColor(R.color.colorPrimary))
                         .enableDismissAfterShown(true)
@@ -831,14 +776,14 @@ public class CallController extends BaseController {
                 audioOn = !audioOn;
 
                 if (audioOn) {
-                    microphoneControlButton.getHierarchy().setPlaceholderImage(R.drawable.ic_mic_white_24px);
+                    binding.microphoneButton.getHierarchy().setPlaceholderImage(R.drawable.ic_mic_white_24px);
                 } else {
-                    microphoneControlButton.getHierarchy().setPlaceholderImage(R.drawable.ic_mic_off_white_24px);
+                    binding.microphoneButton.getHierarchy().setPlaceholderImage(R.drawable.ic_mic_off_white_24px);
                 }
 
                 toggleMedia(audioOn, false);
             } else {
-                microphoneControlButton.getHierarchy().setPlaceholderImage(R.drawable.ic_mic_white_24px);
+                binding.microphoneButton.getHierarchy().setPlaceholderImage(R.drawable.ic_mic_white_24px);
                 pulseAnimation.start();
                 toggleMedia(true, false);
             }
@@ -847,13 +792,12 @@ public class CallController extends BaseController {
                 fetchSignalingSettings();
             }
 
-        } else if (getActivity() != null && EffortlessPermissions.somePermissionPermanentlyDenied(getActivity(),
-                                                                                                  PERMISSIONS_MICROPHONE)) {
+        } else if (EffortlessPermissions.somePermissionPermanentlyDenied(this, PERMISSIONS_MICROPHONE)) {
             // Microphone permission is permanently denied so we cannot request it normally.
 
             OpenAppDetailsDialogFragment.show(
                     R.string.nc_microphone_permission_permanently_denied,
-                    R.string.nc_permissions_settings, (AppCompatActivity) getActivity());
+                    R.string.nc_permissions_settings, (AppCompatActivity) this);
         } else {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 requestPermissions(PERMISSIONS_MICROPHONE, 100);
@@ -863,39 +807,26 @@ public class CallController extends BaseController {
         }
     }
 
-    @OnClick(R.id.callControlEnterPip)
-    void enterPipMode() {
-        ((MagicCallActivity) getActivity()).enterPipMode();
-    }
-
-    @OnClick(R.id.callControlHangupView)
-    void onHangupClick() {
-        setCallState(CallStatus.LEAVING);
-        hangup(true);
-    }
-
-    @OnClick(R.id.call_control_camera)
     public void onCameraClick() {
-        if (getActivity() != null && EffortlessPermissions.hasPermissions(getActivity(), PERMISSIONS_CAMERA)) {
+        if (EffortlessPermissions.hasPermissions(this, PERMISSIONS_CAMERA)) {
             videoOn = !videoOn;
 
             if (videoOn) {
-                cameraControlButton.getHierarchy().setPlaceholderImage(R.drawable.ic_videocam_white_24px);
+                binding.cameraButton.getHierarchy().setPlaceholderImage(R.drawable.ic_videocam_white_24px);
                 if (cameraEnumerator.getDeviceNames().length > 1) {
-                    cameraSwitchButton.setVisibility(View.VISIBLE);
+                    binding.switchSelfVideoButton.setVisibility(View.VISIBLE);
                 }
             } else {
-                cameraControlButton.getHierarchy().setPlaceholderImage(R.drawable.ic_videocam_off_white_24px);
-                cameraSwitchButton.setVisibility(View.GONE);
+                binding.cameraButton.getHierarchy().setPlaceholderImage(R.drawable.ic_videocam_off_white_24px);
+                binding.switchSelfVideoButton.setVisibility(View.GONE);
             }
 
             toggleMedia(videoOn, true);
-        } else if (getActivity() != null && EffortlessPermissions.somePermissionPermanentlyDenied(getActivity(),
-                                                                                                  PERMISSIONS_CAMERA)) {
+        } else if (EffortlessPermissions.somePermissionPermanentlyDenied(this, PERMISSIONS_CAMERA)) {
             // Camera permission is permanently denied so we cannot request it normally.
             OpenAppDetailsDialogFragment.show(
                     R.string.nc_camera_permission_permanently_denied,
-                    R.string.nc_permissions_settings, (AppCompatActivity) getActivity());
+                    R.string.nc_permissions_settings, (AppCompatActivity) this);
         } else {
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
@@ -907,14 +838,13 @@ public class CallController extends BaseController {
 
     }
 
-    @OnClick({R.id.call_control_switch_camera})
     public void switchCamera() {
         CameraVideoCapturer cameraVideoCapturer = (CameraVideoCapturer) videoCapturer;
         if (cameraVideoCapturer != null) {
             cameraVideoCapturer.switchCamera(new CameraVideoCapturer.CameraSwitchHandler() {
                 @Override
                 public void onCameraSwitchDone(boolean currentCameraIsFront) {
-                    selfVideoRenderer.setMirror(currentCameraIsFront);
+                    binding.selfVideoRenderer.setMirror(currentCameraIsFront);
                 }
 
                 @Override
@@ -930,11 +860,11 @@ public class CallController extends BaseController {
         if (video) {
             message = "videoOff";
             if (enable) {
-                cameraControlButton.setAlpha(1.0f);
+                binding.cameraButton.setAlpha(1.0f);
                 message = "videoOn";
                 startVideoCapture();
             } else {
-                cameraControlButton.setAlpha(0.7f);
+                binding.cameraButton.setAlpha(0.7f);
                 if (videoCapturer != null) {
                     try {
                         videoCapturer.stopCapture();
@@ -948,17 +878,17 @@ public class CallController extends BaseController {
                 localMediaStream.videoTracks.get(0).setEnabled(enable);
             }
             if (enable) {
-                selfVideoRenderer.setVisibility(View.VISIBLE);
+                binding.selfVideoRenderer.setVisibility(View.VISIBLE);
             } else {
-                selfVideoRenderer.setVisibility(View.INVISIBLE);
+                binding.selfVideoRenderer.setVisibility(View.INVISIBLE);
             }
         } else {
             message = "audioOff";
             if (enable) {
                 message = "audioOn";
-                microphoneControlButton.setAlpha(1.0f);
+                binding.microphoneButton.setAlpha(1.0f);
             } else {
-                microphoneControlButton.setAlpha(0.7f);
+                binding.microphoneButton.setAlpha(0.7f);
             }
 
             if (localMediaStream != null && localMediaStream.audioTracks.size() > 0) {
@@ -998,16 +928,16 @@ public class CallController extends BaseController {
                 cameraSwitchHandler.removeCallbacksAndMessages(null);
                 alpha = 1.0f;
                 duration = 1000;
-                if (callControls.getVisibility() != View.VISIBLE) {
-                    callControls.setAlpha(0.0f);
-                    callControls.setVisibility(View.VISIBLE);
+                if (binding.callControls.getVisibility() != View.VISIBLE) {
+                    binding.callControls.setAlpha(0.0f);
+                    binding.callControls.setVisibility(View.VISIBLE);
 
-                    callInfosLinearLayout.setAlpha(0.0f);
-                    callInfosLinearLayout.setVisibility(View.VISIBLE);
+                    binding.callInfosLinearLayout.setAlpha(0.0f);
+                    binding.callInfosLinearLayout.setVisibility(View.VISIBLE);
 
-                    cameraSwitchButton.setAlpha(0.0f);
+                    binding.switchSelfVideoButton.setAlpha(0.0f);
                     if (videoOn) {
-                        cameraSwitchButton.setVisibility(View.VISIBLE);
+                        binding.switchSelfVideoButton.setVisibility(View.VISIBLE);
                     }
                 } else {
                     callControlHandler.postDelayed(() -> animateCallControls(false, 0), 5000);
@@ -1018,9 +948,9 @@ public class CallController extends BaseController {
                 duration = 1000;
             }
 
-            if (callControls != null) {
-                callControls.setEnabled(false);
-                callControls.animate()
+            if (binding.callControls != null) {
+                binding.callControls.setEnabled(false);
+                binding.callControls.animate()
                         .translationY(0)
                         .alpha(alpha)
                         .setDuration(duration)
@@ -1029,9 +959,9 @@ public class CallController extends BaseController {
                             @Override
                             public void onAnimationEnd(Animator animation) {
                                 super.onAnimationEnd(animation);
-                                if (callControls != null) {
+                                if (binding.callControls != null) {
                                     if (!show) {
-                                        callControls.setVisibility(View.GONE);
+                                        binding.callControls.setVisibility(View.GONE);
                                         if (spotlightView != null && spotlightView.getVisibility() != View.GONE) {
                                             spotlightView.setVisibility(View.GONE);
                                         }
@@ -1046,15 +976,15 @@ public class CallController extends BaseController {
                                         }, 7500);
                                     }
 
-                                    callControls.setEnabled(true);
+                                    binding.callControls.setEnabled(true);
                                 }
                             }
                         });
             }
 
-            if (callInfosLinearLayout != null) {
-                callInfosLinearLayout.setEnabled(false);
-                callInfosLinearLayout.animate()
+            if (binding.callInfosLinearLayout != null) {
+                binding.callInfosLinearLayout.setEnabled(false);
+                binding.callInfosLinearLayout.animate()
                         .translationY(0)
                         .alpha(alpha)
                         .setDuration(duration)
@@ -1063,9 +993,9 @@ public class CallController extends BaseController {
                             @Override
                             public void onAnimationEnd(Animator animation) {
                                 super.onAnimationEnd(animation);
-                                if (callInfosLinearLayout != null) {
+                                if (binding.callInfosLinearLayout != null) {
                                     if (!show) {
-                                        callInfosLinearLayout.setVisibility(View.GONE);
+                                        binding.callInfosLinearLayout.setVisibility(View.GONE);
                                     } else {
                                         callInfosHandler.postDelayed(new Runnable() {
                                             @Override
@@ -1077,15 +1007,15 @@ public class CallController extends BaseController {
                                         }, 7500);
                                     }
 
-                                    callInfosLinearLayout.setEnabled(true);
+                                    binding.callInfosLinearLayout.setEnabled(true);
                                 }
                             }
                         });
             }
 
-            if (cameraSwitchButton != null) {
-                cameraSwitchButton.setEnabled(false);
-                cameraSwitchButton.animate()
+            if (binding.switchSelfVideoButton != null) {
+                binding.switchSelfVideoButton.setEnabled(false);
+                binding.switchSelfVideoButton.animate()
                         .translationY(0)
                         .alpha(alpha)
                         .setDuration(duration)
@@ -1094,12 +1024,12 @@ public class CallController extends BaseController {
                             @Override
                             public void onAnimationEnd(Animator animation) {
                                 super.onAnimationEnd(animation);
-                                if (cameraSwitchButton != null) {
+                                if (binding.switchSelfVideoButton != null) {
                                     if (!show) {
-                                        cameraSwitchButton.setVisibility(View.GONE);
+                                        binding.switchSelfVideoButton.setVisibility(View.GONE);
                                     }
 
-                                    cameraSwitchButton.setEnabled(true);
+                                    binding.switchSelfVideoButton.setEnabled(true);
                                 }
                             }
                         });
@@ -1111,7 +1041,8 @@ public class CallController extends BaseController {
     @Override
     public void onDestroy() {
         if (!currentCallStatus.equals(CallStatus.LEAVING)) {
-            onHangupClick();
+            setCallState(CallStatus.LEAVING);
+            hangup(true);
         }
         powerManagerUtils.updatePhoneState(PowerManagerUtils.PhoneState.IDLE);
         super.onDestroy();
@@ -1458,11 +1389,6 @@ public class CallController extends BaseController {
         }
     }
 
-    @OnItemClick({R.id.gridview})
-    public void showCallControls() {
-        animateCallControls(true, 0);
-    }
-
     private void dispose(@Nullable Disposable disposable) {
         if (disposable != null && !disposable.isDisposed()) {
             disposable.dispose();
@@ -1574,8 +1500,8 @@ public class CallController extends BaseController {
                 videoCapturer = null;
             }
 
-            if (selfVideoRenderer != null) {
-                selfVideoRenderer.release();
+            if (binding.selfVideoRenderer != null) {
+                binding.selfVideoRenderer.release();
             }
 
             if (audioSource != null) {
@@ -1628,8 +1554,8 @@ public class CallController extends BaseController {
 
                     @Override
                     public void onNext(@io.reactivex.annotations.NonNull GenericOverall genericOverall) {
-                        if (shutDownView && getActivity() != null) {
-                            getActivity().finish();
+                        if (shutDownView) {
+                            finish();
                         } else if (!shutDownView &&
                                 (currentCallStatus == CallStatus.RECONNECTING ||
                                         currentCallStatus == CallStatus.PUBLISHER_FAILED)) {
@@ -1664,8 +1590,8 @@ public class CallController extends BaseController {
 
                     @Override
                     public void onNext(@io.reactivex.annotations.NonNull GenericOverall genericOverall) {
-                        if (shutDownView && getActivity() != null) {
-                            getActivity().finish();
+                        if (shutDownView) {
+                            finish();
                         }
                     }
 
@@ -1875,16 +1801,12 @@ public class CallController extends BaseController {
     private void endPeerConnection(String sessionId, boolean justScreen) {
         List<MagicPeerConnectionWrapper> magicPeerConnectionWrappers;
         MagicPeerConnectionWrapper magicPeerConnectionWrapper;
-        if (!(magicPeerConnectionWrappers = getPeerConnectionWrapperListForSessionId(sessionId)).isEmpty()
-                && getActivity() != null) {
+        if (!(magicPeerConnectionWrappers = getPeerConnectionWrapperListForSessionId(sessionId)).isEmpty()) {
             for (int i = 0; i < magicPeerConnectionWrappers.size(); i++) {
                 magicPeerConnectionWrapper = magicPeerConnectionWrappers.get(i);
                 if (magicPeerConnectionWrapper.getSessionId().equals(sessionId)) {
                     if (magicPeerConnectionWrapper.getVideoStreamType().equals("screen") || !justScreen) {
-
-
-                        // TODO runOnUiThread not necessary???
-                        getActivity().runOnUiThread(() -> removeMediaStream(sessionId));
+                        runOnUiThread(() -> removeMediaStream(sessionId));
                         deleteMagicPeerConnection(magicPeerConnectionWrapper);
                     }
                 }
@@ -1896,11 +1818,11 @@ public class CallController extends BaseController {
         Log.d(TAG, "removeMediaStream");
         participantDisplayItems.remove(sessionId);
 
-        if (!isBeingDestroyed() && !isDestroyed()) {
+        if (!isDestroyed()) {
             initGridAdapter();
 
-            if (callControls != null) {
-                callControls.setZ(100.0f);
+            if (binding.callControls != null) {
+                binding.callControls.setZ(100.0f);
             }
         }
     }
@@ -1913,7 +1835,7 @@ public class CallController extends BaseController {
     }
 
     private void updateSelfVideoViewPosition() {
-        FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) selfVideoRenderer.getLayoutParams();
+        FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) binding.selfVideoRenderer.getLayoutParams();
 
         DisplayMetrics displayMetrics = getApplicationContext().getResources().getDisplayMetrics();
         int screenWidthPx = displayMetrics.widthPixels;
@@ -1922,7 +1844,7 @@ public class CallController extends BaseController {
 
         float newXafterRotate = 0;
         float newYafterRotate;
-        if (callInfosLinearLayout.getVisibility() == View.VISIBLE) {
+        if (binding.callInfosLinearLayout.getVisibility() == View.VISIBLE) {
             newYafterRotate = 250;
         } else {
             newYafterRotate = 20;
@@ -1938,11 +1860,11 @@ public class CallController extends BaseController {
             layoutParams.width = (int) getResources().getDimension(R.dimen.large_preview_dimension);
             newXafterRotate = (float) (screenWidthDp - getResources().getDimension(R.dimen.large_preview_dimension) * 0.5);
         }
-        selfVideoRenderer.setLayoutParams(layoutParams);
+        binding.selfVideoRenderer.setLayoutParams(layoutParams);
 
         int newXafterRotatePx = (int) DisplayUtils.convertDpToPixel(newXafterRotate, getApplicationContext());
-        selfVideoViewWrapper.setY(newYafterRotate);
-        selfVideoViewWrapper.setX(newXafterRotatePx);
+        binding.selfVideoViewWrapper.setY(newYafterRotate);
+        binding.selfVideoViewWrapper.setX(newXafterRotatePx);
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
@@ -1960,7 +1882,7 @@ public class CallController extends BaseController {
             if (!isVoiceOnlyCall) {
                 boolean enableVideo = peerConnectionEvent.getPeerConnectionEventType().equals(PeerConnectionEvent
                                                                                                       .PeerConnectionEventType.SENSOR_FAR) && videoOn;
-                if (getActivity() != null && EffortlessPermissions.hasPermissions(getActivity(), PERMISSIONS_CAMERA) &&
+                if (EffortlessPermissions.hasPermissions(this, PERMISSIONS_CAMERA) &&
                         (currentCallStatus.equals(CallStatus.CONNECTING) || isConnectionEstablished()) && videoOn
                         && enableVideo != localVideoTrack.enabled()) {
                     toggleMedia(enableVideo, true);
@@ -2004,7 +1926,7 @@ public class CallController extends BaseController {
                 magicPeerConnectionWrapper = magicPeerConnectionWrapperList.get(i);
                 Observable
                         .interval(1, TimeUnit.SECONDS)
-                        .repeatUntil(() -> (!isConnectionEstablished() || isBeingDestroyed() || isDestroyed()))
+                        .repeatUntil(() -> (!isConnectionEstablished() || isDestroyed()))
                         .observeOn(Schedulers.io())
                         .subscribe(new Observer<Long>() {
                             @Override
@@ -2172,15 +2094,7 @@ public class CallController extends BaseController {
         participantDisplayItems.put(session, participantDisplayItem);
 
         initGridAdapter();
-        callControls.setZ(100.0f);
-    }
-
-    @OnClick(R.id.callStateRelativeLayoutView)
-    public void onConnectingViewClick() {
-        if (currentCallStatus.equals(CallStatus.CALLING_TIMEOUT)) {
-            setCallState(CallStatus.RECONNECTING);
-            hangupNetworkCalls(false);
-        }
+        binding.callControls.setZ(100.0f);
     }
 
     private void setCallState(CallStatus callState) {
@@ -2197,105 +2111,105 @@ public class CallController extends BaseController {
                     handler.post(() -> {
                         playCallingSound();
                         if (isIncomingCallFromNotification) {
-                            callStateTextView.setText(R.string.nc_call_incoming);
+                            binding.callStates.callStateTextView.setText(R.string.nc_call_incoming);
                         } else {
-                            callStateTextView.setText(R.string.nc_call_ringing);
+                            binding.callStates.callStateTextView.setText(R.string.nc_call_ringing);
                         }
-                        callConversationNameTextView.setText(conversationName);
+                        binding.callConversationNameTextView.setText(conversationName);
 
-                        callVoiceOrVideoTextView.setText(getDescriptionForCallType());
+                        binding.callModeTextView.setText(getDescriptionForCallType());
 
-                        if (callStateView.getVisibility() != View.VISIBLE) {
-                            callStateView.setVisibility(View.VISIBLE);
+                        if (binding.callStates.callStateRelativeLayout.getVisibility() != View.VISIBLE) {
+                            binding.callStates.callStateRelativeLayout.setVisibility(View.VISIBLE);
                         }
 
-                        if (gridView.getVisibility() != View.INVISIBLE) {
-                            gridView.setVisibility(View.INVISIBLE);
+                        if (binding.gridview.getVisibility() != View.INVISIBLE) {
+                            binding.gridview.setVisibility(View.INVISIBLE);
                         }
 
-                        if (progressBar.getVisibility() != View.VISIBLE) {
-                            progressBar.setVisibility(View.VISIBLE);
+                        if (binding.callStates.callStateProgressBar.getVisibility() != View.VISIBLE) {
+                            binding.callStates.callStateProgressBar.setVisibility(View.VISIBLE);
                         }
 
-                        if (errorImageView.getVisibility() != View.GONE) {
-                            errorImageView.setVisibility(View.GONE);
+                        if (binding.callStates.errorImageView.getVisibility() != View.GONE) {
+                            binding.callStates.errorImageView.setVisibility(View.GONE);
                         }
                     });
                     break;
                 case CALLING_TIMEOUT:
                     handler.post(() -> {
                         hangup(false);
-                        callStateTextView.setText(R.string.nc_call_timeout);
-                        callVoiceOrVideoTextView.setText(getDescriptionForCallType());
-                        if (callStateView.getVisibility() != View.VISIBLE) {
-                            callStateView.setVisibility(View.VISIBLE);
+                        binding.callStates.callStateTextView.setText(R.string.nc_call_timeout);
+                        binding.callModeTextView.setText(getDescriptionForCallType());
+                        if (binding.callStates.callStateRelativeLayout.getVisibility() != View.VISIBLE) {
+                            binding.callStates.callStateRelativeLayout.setVisibility(View.VISIBLE);
                         }
 
-                        if (progressBar.getVisibility() != View.GONE) {
-                            progressBar.setVisibility(View.GONE);
+                        if (binding.callStates.callStateProgressBar.getVisibility() != View.GONE) {
+                            binding.callStates.callStateProgressBar.setVisibility(View.GONE);
                         }
 
-                        if (gridView.getVisibility() != View.INVISIBLE) {
-                            gridView.setVisibility(View.INVISIBLE);
+                        if (binding.gridview.getVisibility() != View.INVISIBLE) {
+                            binding.gridview.setVisibility(View.INVISIBLE);
                         }
 
-                        errorImageView.setImageResource(R.drawable.ic_av_timer_timer_24dp);
+                        binding.callStates.errorImageView.setImageResource(R.drawable.ic_av_timer_timer_24dp);
 
-                        if (errorImageView.getVisibility() != View.VISIBLE) {
-                            errorImageView.setVisibility(View.VISIBLE);
+                        if (binding.callStates.errorImageView.getVisibility() != View.VISIBLE) {
+                            binding.callStates.errorImageView.setVisibility(View.VISIBLE);
                         }
                     });
                     break;
                 case RECONNECTING:
                     handler.post(() -> {
                         playCallingSound();
-                        callStateTextView.setText(R.string.nc_call_reconnecting);
-                        callVoiceOrVideoTextView.setText(getDescriptionForCallType());
-                        if (callStateView.getVisibility() != View.VISIBLE) {
-                            callStateView.setVisibility(View.VISIBLE);
+                        binding.callStates.callStateTextView.setText(R.string.nc_call_reconnecting);
+                        binding.callModeTextView.setText(getDescriptionForCallType());
+                        if (binding.callStates.callStateRelativeLayout.getVisibility() != View.VISIBLE) {
+                            binding.callStates.callStateRelativeLayout.setVisibility(View.VISIBLE);
                         }
-                        if (gridView.getVisibility() != View.INVISIBLE) {
-                            gridView.setVisibility(View.INVISIBLE);
+                        if (binding.gridview.getVisibility() != View.INVISIBLE) {
+                            binding.gridview.setVisibility(View.INVISIBLE);
                         }
-                        if (progressBar.getVisibility() != View.VISIBLE) {
-                            progressBar.setVisibility(View.VISIBLE);
+                        if (binding.callStates.callStateProgressBar.getVisibility() != View.VISIBLE) {
+                            binding.callStates.callStateProgressBar.setVisibility(View.VISIBLE);
                         }
 
-                        if (errorImageView.getVisibility() != View.GONE) {
-                            errorImageView.setVisibility(View.GONE);
+                        if (binding.callStates.errorImageView.getVisibility() != View.GONE) {
+                            binding.callStates.errorImageView.setVisibility(View.GONE);
                         }
                     });
                     break;
                 case JOINED:
                     handler.postDelayed(() -> setCallState(CallStatus.CALLING_TIMEOUT), 45000);
                     handler.post(() -> {
-                        callVoiceOrVideoTextView.setText(getDescriptionForCallType());
-                        if (callStateView != null) {
+                        binding.callModeTextView.setText(getDescriptionForCallType());
+                        if (binding.callStates.callStateRelativeLayout != null) {
                             if (isIncomingCallFromNotification) {
-                                callStateTextView.setText(R.string.nc_call_incoming);
+                                binding.callStates.callStateTextView.setText(R.string.nc_call_incoming);
                             } else {
-                                callStateTextView.setText(R.string.nc_call_ringing);
+                                binding.callStates.callStateTextView.setText(R.string.nc_call_ringing);
                             }
-                            if (callStateView.getVisibility() != View.VISIBLE) {
-                                callStateView.setVisibility(View.VISIBLE);
+                            if (binding.callStates.callStateRelativeLayout.getVisibility() != View.VISIBLE) {
+                                binding.callStates.callStateRelativeLayout.setVisibility(View.VISIBLE);
                             }
                         }
 
-                        if (progressBar != null) {
-                            if (progressBar.getVisibility() != View.VISIBLE) {
-                                progressBar.setVisibility(View.VISIBLE);
+                        if (binding.callStates.callStateProgressBar != null) {
+                            if (binding.callStates.callStateProgressBar.getVisibility() != View.VISIBLE) {
+                                binding.callStates.callStateProgressBar.setVisibility(View.VISIBLE);
                             }
                         }
 
-                        if (gridView != null) {
-                            if (gridView.getVisibility() != View.INVISIBLE) {
-                                gridView.setVisibility(View.INVISIBLE);
+                        if (binding.gridview != null) {
+                            if (binding.gridview.getVisibility() != View.INVISIBLE) {
+                                binding.gridview.setVisibility(View.INVISIBLE);
                             }
                         }
 
-                        if (errorImageView != null) {
-                            if (errorImageView.getVisibility() != View.GONE) {
-                                errorImageView.setVisibility(View.GONE);
+                        if (binding.callStates.errorImageView != null) {
+                            if (binding.callStates.errorImageView.getVisibility() != View.GONE) {
+                                binding.callStates.errorImageView.setVisibility(View.GONE);
                             }
                         }
                     });
@@ -2303,37 +2217,37 @@ public class CallController extends BaseController {
                 case IN_CONVERSATION:
                     handler.post(() -> {
                         stopCallingSound();
-                        callVoiceOrVideoTextView.setText(getDescriptionForCallType());
+                        binding.callModeTextView.setText(getDescriptionForCallType());
 
                         if (!isVoiceOnlyCall) {
-                            callInfosLinearLayout.setVisibility(View.GONE);
+                            binding.callInfosLinearLayout.setVisibility(View.GONE);
                         }
 
                         if (!isPTTActive) {
                             animateCallControls(false, 5000);
                         }
 
-                        if (callStateView != null) {
-                            if (callStateView.getVisibility() != View.INVISIBLE) {
-                                callStateView.setVisibility(View.INVISIBLE);
+                        if (binding.callStates.callStateRelativeLayout != null) {
+                            if (binding.callStates.callStateRelativeLayout.getVisibility() != View.INVISIBLE) {
+                                binding.callStates.callStateRelativeLayout.setVisibility(View.INVISIBLE);
                             }
                         }
 
-                        if (progressBar != null) {
-                            if (progressBar.getVisibility() != View.GONE) {
-                                progressBar.setVisibility(View.GONE);
+                        if (binding.callStates.callStateProgressBar != null) {
+                            if (binding.callStates.callStateProgressBar.getVisibility() != View.GONE) {
+                                binding.callStates.callStateProgressBar.setVisibility(View.GONE);
                             }
                         }
 
-                        if (gridView != null) {
-                            if (gridView.getVisibility() != View.VISIBLE) {
-                                gridView.setVisibility(View.VISIBLE);
+                        if (binding.gridview != null) {
+                            if (binding.gridview.getVisibility() != View.VISIBLE) {
+                                binding.gridview.setVisibility(View.VISIBLE);
                             }
                         }
 
-                        if (errorImageView != null) {
-                            if (errorImageView.getVisibility() != View.GONE) {
-                                errorImageView.setVisibility(View.GONE);
+                        if (binding.callStates.errorImageView != null) {
+                            if (binding.callStates.errorImageView.getVisibility() != View.GONE) {
+                                binding.callStates.errorImageView.setVisibility(View.GONE);
                             }
                         }
                     });
@@ -2342,45 +2256,45 @@ public class CallController extends BaseController {
                     handler.post(() -> {
                         stopCallingSound();
 
-                        if (callStateTextView != null) {
-                            callStateTextView.setText(R.string.nc_offline);
+                        if (binding.callStates.callStateTextView != null) {
+                            binding.callStates.callStateTextView.setText(R.string.nc_offline);
 
-                            if (callStateView.getVisibility() != View.VISIBLE) {
-                                callStateView.setVisibility(View.VISIBLE);
+                            if (binding.callStates.callStateRelativeLayout.getVisibility() != View.VISIBLE) {
+                                binding.callStates.callStateRelativeLayout.setVisibility(View.VISIBLE);
                             }
                         }
 
 
-                        if (gridView != null) {
-                            if (gridView.getVisibility() != View.INVISIBLE) {
-                                gridView.setVisibility(View.INVISIBLE);
+                        if (binding.gridview != null) {
+                            if (binding.gridview.getVisibility() != View.INVISIBLE) {
+                                binding.gridview.setVisibility(View.INVISIBLE);
                             }
                         }
 
-                        if (progressBar != null) {
-                            if (progressBar.getVisibility() != View.GONE) {
-                                progressBar.setVisibility(View.GONE);
+                        if (binding.callStates.callStateProgressBar != null) {
+                            if (binding.callStates.callStateProgressBar.getVisibility() != View.GONE) {
+                                binding.callStates.callStateProgressBar.setVisibility(View.GONE);
                             }
                         }
 
-                        if (errorImageView != null) {
-                            errorImageView.setImageResource(R.drawable.ic_signal_wifi_off_white_24dp);
-                            if (errorImageView.getVisibility() != View.VISIBLE) {
-                                errorImageView.setVisibility(View.VISIBLE);
+                        if (binding.callStates.errorImageView != null) {
+                            binding.callStates.errorImageView.setImageResource(R.drawable.ic_signal_wifi_off_white_24dp);
+                            if (binding.callStates.errorImageView.getVisibility() != View.VISIBLE) {
+                                binding.callStates.errorImageView.setVisibility(View.VISIBLE);
                             }
                         }
                     });
                     break;
                 case LEAVING:
                     handler.post(() -> {
-                        if (!isDestroyed() && !isBeingDestroyed()) {
+                        if (!isDestroyed()) {
                             stopCallingSound();
-                            callVoiceOrVideoTextView.setText(getDescriptionForCallType());
-                            callStateTextView.setText(R.string.nc_leaving_call);
-                            callStateView.setVisibility(View.VISIBLE);
-                            gridView.setVisibility(View.INVISIBLE);
-                            progressBar.setVisibility(View.VISIBLE);
-                            errorImageView.setVisibility(View.GONE);
+                            binding.callModeTextView.setText(getDescriptionForCallType());
+                            binding.callStates.callStateTextView.setText(R.string.nc_leaving_call);
+                            binding.callStates.callStateRelativeLayout.setVisibility(View.VISIBLE);
+                            binding.gridview.setVisibility(View.INVISIBLE);
+                            binding.callStates.callStateProgressBar.setVisibility(View.VISIBLE);
+                            binding.callStates.errorImageView.setVisibility(View.GONE);
                         }
                     });
                     break;
@@ -2393,27 +2307,27 @@ public class CallController extends BaseController {
         RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
                                                                              ViewGroup.LayoutParams.WRAP_CONTENT);
         params.setMargins(0,0,0, 0);
-        gridView.setLayoutParams(params);
+        binding.gridview.setLayoutParams(params);
 
 
-        callControls.setVisibility(View.GONE);
-        callInfosLinearLayout.setVisibility(View.GONE);
-        selfVideoViewWrapper.setVisibility(View.GONE);
-        callStateView.setVisibility(View.GONE);
+        binding.callControls.setVisibility(View.GONE);
+        binding.callInfosLinearLayout.setVisibility(View.GONE);
+        binding.selfVideoViewWrapper.setVisibility(View.GONE);
+        binding.callStates.callStateRelativeLayout.setVisibility(View.GONE);
 
-        selfVideoRenderer.release();
+        binding.selfVideoRenderer.release();
     }
 
     public void updateUiForNormalMode(){
         if (isVoiceOnlyCall) {
-            callControls.setVisibility(View.VISIBLE);
+            binding.callControls.setVisibility(View.VISIBLE);
         } else {
-            callControls.setVisibility(View.INVISIBLE); // animateCallControls needs this to be invisible for a check.
+            binding.callControls.setVisibility(View.INVISIBLE); // animateCallControls needs this to be invisible for a check.
         }
         initViews();
 
-        callInfosLinearLayout.setVisibility(View.VISIBLE);
-        selfVideoViewWrapper.setVisibility(View.VISIBLE);
+        binding.callInfosLinearLayout.setVisibility(View.VISIBLE);
+        binding.selfVideoViewWrapper.setVisibility(View.VISIBLE);
     }
 
     private String getDescriptionForCallType() {
@@ -2435,24 +2349,23 @@ public class CallController extends BaseController {
             ringtoneUri = Uri.parse("android.resource://" + getApplicationContext().getPackageName() + "/raw" +
                                             "/tr110_1_kap8_3_freiton1");
         }
-        if (getActivity() != null) {
-            mediaPlayer = new MediaPlayer();
-            try {
-                mediaPlayer.setDataSource(Objects.requireNonNull(getActivity()), ringtoneUri);
-                mediaPlayer.setLooping(true);
-                AudioAttributes audioAttributes = new AudioAttributes.Builder().setContentType(
-                        AudioAttributes.CONTENT_TYPE_SONIFICATION)
-                        .setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION)
-                        .build();
-                mediaPlayer.setAudioAttributes(audioAttributes);
 
-                mediaPlayer.setOnPreparedListener(mp -> mediaPlayer.start());
+        mediaPlayer = new MediaPlayer();
+        try {
+            mediaPlayer.setDataSource(this, ringtoneUri);
+            mediaPlayer.setLooping(true);
+            AudioAttributes audioAttributes = new AudioAttributes.Builder().setContentType(
+                    AudioAttributes.CONTENT_TYPE_SONIFICATION)
+                    .setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION)
+                    .build();
+            mediaPlayer.setAudioAttributes(audioAttributes);
 
-                mediaPlayer.prepareAsync();
+            mediaPlayer.setOnPreparedListener(mp -> mediaPlayer.start());
 
-            } catch (IOException e) {
-                Log.e(TAG, "Failed to play sound");
-            }
+            mediaPlayer.prepareAsync();
+
+        } catch (IOException e) {
+            Log.e(TAG, "Failed to play sound");
         }
     }
 
@@ -2467,16 +2380,32 @@ public class CallController extends BaseController {
         }
     }
 
+    @SuppressLint("ClickableViewAccessibility")
     @Override
-    protected void onAttach(@NonNull View view) {
-        super.onAttach(view);
-        eventBus.register(this);
-    }
+    public void onStart() {
+        super.onStart();
+        binding.microphoneButton.setOnTouchListener(new MicrophoneButtonTouchListener());
 
-    @Override
-    protected void onDetach(@NonNull View view) {
-        super.onDetach(view);
-        eventBus.unregister(this);
+        pulseAnimation = PulseAnimation.create().with(binding.microphoneButton)
+            .setDuration(310)
+            .setRepeatCount(PulseAnimation.INFINITE)
+            .setRepeatMode(PulseAnimation.REVERSE);
+
+
+        try {
+            cache.evictAll();
+        } catch (IOException e) {
+            Log.e(TAG, "Failed to evict cache");
+        }
+
+        binding.callControls.setZ(100.0f);
+        basicInitialization();
+        participantDisplayItems = new HashMap<>();
+        initViews();
+        updateSelfVideoViewPosition();
+        if (!isConnectionEstablished()){
+            initiateCall();
+        }
     }
 
     private class MicrophoneButtonTouchListener implements View.OnTouchListener {
@@ -2487,7 +2416,7 @@ public class CallController extends BaseController {
             v.onTouchEvent(event);
             if (event.getAction() == MotionEvent.ACTION_UP && isPTTActive) {
                 isPTTActive = false;
-                microphoneControlButton.getHierarchy().setPlaceholderImage(R.drawable.ic_mic_off_white_24px);
+                binding.microphoneButton.getHierarchy().setPlaceholderImage(R.drawable.ic_mic_off_white_24px);
                 pulseAnimation.stop();
                 toggleMedia(false, false);
                 animateCallControls(false, 5000);
@@ -2511,6 +2440,78 @@ public class CallController extends BaseController {
         }
     }
 
+    public void onBackPressed() {
+        enterPipMode();
+    }
+
+    public void onUserLeaveHint() {
+        enterPipMode();
+    }
+
+    void enterPipMode() {
+        enableKeyguard();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            enterPictureInPictureMode(getPipParams());
+        } else {
+            finish();
+        }
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    public PictureInPictureParams getPipParams() {
+        Rational pipRatio = new Rational(300, 500);
+        return new PictureInPictureParams.Builder()
+            .setAspectRatio(pipRatio)
+            .build();
+    }
+
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        eventBus.post(new ConfigurationChangeEvent());
+    }
+
+    private void dismissKeyguard() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+            setShowWhenLocked(true);
+            setTurnScreenOn(true);
+            KeyguardManager keyguardManager = (KeyguardManager) getSystemService(KEYGUARD_SERVICE);
+            keyguardManager.requestDismissKeyguard(this, null);
+        } else {
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
+        }
+    }
+
+    private void enableKeyguard() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+            setShowWhenLocked(false);
+        } else {
+            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
+            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
+        }
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    @Override
+    public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode, Configuration newConfig) {
+        super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig);
+        isInPipMode = isInPictureInPictureMode;
+        if (isInPictureInPictureMode) {
+            updateUiForPipMode();
+        } else {
+            updateUiForNormalMode();
+        }
+    }
+
+    public void onStop() {
+        super.onStop();
+        if (isInPipMode) {
+            finish();
+        }
+    }
+
     private class SelfVideoTouchListener implements View.OnTouchListener {
 
         @SuppressLint("ClickableViewAccessibility")
@@ -2519,10 +2520,10 @@ public class CallController extends BaseController {
             long duration = event.getEventTime() - event.getDownTime();
 
             if (event.getActionMasked() == MotionEvent.ACTION_MOVE) {
-                float newY = event.getRawY() - selfVideoViewWrapper.getHeight() / (float) 2;
-                float newX = event.getRawX() - selfVideoViewWrapper.getWidth() / (float) 2;
-                selfVideoViewWrapper.setY(newY);
-                selfVideoViewWrapper.setX(newX);
+                float newY = event.getRawY() - binding.selfVideoViewWrapper.getHeight() / (float) 2;
+                float newX = event.getRawX() - binding.selfVideoViewWrapper.getWidth() / (float) 2;
+                binding.selfVideoViewWrapper.setY(newY);
+                binding.selfVideoViewWrapper.setX(newX);
             } else if (event.getActionMasked() == MotionEvent.ACTION_UP && duration < 100) {
                 switchCamera();
             }
diff --git a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
deleted file mode 100644
index c9220d7ba..000000000
--- a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Nextcloud Talk application
- *
- * @author Mario Danic
- * @author Andy Scherzinger
- * Copyright (C) 2021 Andy Scherzinger (infoi@andy-scherzinger.de)
- * Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.nextcloud.talk.activities
-
-import android.app.KeyguardManager
-import android.app.PictureInPictureParams
-import android.content.res.Configuration
-import android.os.Build
-import android.os.Bundle
-import android.util.Log
-import android.util.Rational
-import android.view.Window
-import android.view.WindowManager
-import androidx.annotation.RequiresApi
-import autodagger.AutoInjector
-import com.bluelinelabs.conductor.Conductor
-import com.bluelinelabs.conductor.Router
-import com.bluelinelabs.conductor.RouterTransaction
-import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler
-import com.nextcloud.talk.R
-import com.nextcloud.talk.application.NextcloudTalkApplication
-import com.nextcloud.talk.controllers.CallController
-import com.nextcloud.talk.controllers.CallNotificationController
-import com.nextcloud.talk.databinding.ActivityMagicCallBinding
-import com.nextcloud.talk.events.ConfigurationChangeEvent
-import com.nextcloud.talk.utils.bundle.BundleKeys
-
-@AutoInjector(NextcloudTalkApplication::class)
-class MagicCallActivity : BaseActivity() {
-    lateinit var binding: ActivityMagicCallBinding
-    private var router: Router? = null
-    var isInPipMode: Boolean = false
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        Log.d(TAG, "onCreate")
-        NextcloudTalkApplication.sharedApplication!!.componentApplication.inject(this)
-        setTheme(R.style.CallTheme)
-
-        requestWindowFeature(Window.FEATURE_NO_TITLE)
-        dismissKeyguard()
-        window.addFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN or
-                WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
-        )
-
-        binding = ActivityMagicCallBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        router = Conductor.attachRouter(this, binding.controllerContainer, savedInstanceState)
-        router!!.setPopsLastView(false)
-
-        if (!router!!.hasRootController()) {
-            if (intent.getBooleanExtra(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL, false)) {
-                router!!.setRoot(
-                    RouterTransaction.with(CallNotificationController(intent.extras))
-                        .pushChangeHandler(HorizontalChangeHandler())
-                        .popChangeHandler(HorizontalChangeHandler())
-                        .tag(CallNotificationController.TAG)
-                )
-            } else {
-                router!!.setRoot(
-                    RouterTransaction.with(CallController(intent.extras))
-                        .pushChangeHandler(HorizontalChangeHandler())
-                        .popChangeHandler(HorizontalChangeHandler())
-                        .tag(CallController.TAG)
-                )
-            }
-        }
-
-    }
-
-    override fun onBackPressed() {
-        enterPipMode()
-    }
-
-    override fun onUserLeaveHint() {
-        enterPipMode()
-    }
-
-    fun enterPipMode() {
-        enableKeyguard()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            enterPictureInPictureMode(getPipParams())
-        } else {
-            finish()
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    private fun getPipParams(): PictureInPictureParams {
-        val pipRatio = Rational(
-            300,
-            500
-        )
-        return PictureInPictureParams.Builder()
-            .setAspectRatio(pipRatio)
-            .build()
-    }
-
-    override fun onConfigurationChanged(newConfig: Configuration) {
-        super.onConfigurationChanged(newConfig)
-        eventBus.post(ConfigurationChangeEvent())
-    }
-
-    private fun dismissKeyguard() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-            setShowWhenLocked(true)
-            setTurnScreenOn(true)
-            val keyguardManager = getSystemService(KEYGUARD_SERVICE) as KeyguardManager
-            keyguardManager.requestDismissKeyguard(this, null)
-        } else {
-            window.addFlags(
-                WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD or
-                    WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
-                    WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
-            )
-        }
-    }
-
-    private fun enableKeyguard() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-            setShowWhenLocked(false)
-        } else {
-            window.clearFlags(
-                WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD or
-                    WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
-                    WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
-            )
-        }
-    }
-
-    override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, newConfig: Configuration) {
-        super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
-        isInPipMode = isInPictureInPictureMode
-
-        if (router?.getControllerWithTag(CallNotificationController.TAG) != null) {
-            val callNotificationController = router?.getControllerWithTag(CallNotificationController.TAG) as CallNotificationController
-            if (isInPictureInPictureMode) {
-                // callNotificationController.updateUiForPipMode()
-            } else {
-                // callNotificationController.updateUiForNormalMode()
-            }
-        } else if (router?.getControllerWithTag(CallController.TAG) != null) {
-            val callController = router?.getControllerWithTag(CallController.TAG) as CallController
-            if (isInPictureInPictureMode) {
-                callController.updateUiForPipMode()
-            } else {
-                callController.updateUiForNormalMode()
-            }
-        }
-    }
-
-    override fun onStop() {
-        super.onStop()
-        if (isInPipMode) {
-            finish()
-        }
-    }
-
-    companion object {
-        private val TAG = "MagicCallActivity"
-    }
-}
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
index a013f25a5..73cc307ec 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
@@ -22,6 +22,7 @@ package com.nextcloud.talk.controllers;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
@@ -41,8 +42,6 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.bluelinelabs.conductor.RouterTransaction;
-import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler;
 import com.bluelinelabs.logansquare.LoganSquare;
 import com.facebook.common.executors.UiThreadImmediateExecutorService;
 import com.facebook.common.references.CloseableReference;
@@ -55,6 +54,7 @@ import com.facebook.imagepipeline.image.CloseableImage;
 import com.facebook.imagepipeline.postprocessors.BlurPostProcessor;
 import com.facebook.imagepipeline.request.ImageRequest;
 import com.nextcloud.talk.R;
+import com.nextcloud.talk.activities.CallActivity;
 import com.nextcloud.talk.api.NcApi;
 import com.nextcloud.talk.application.NextcloudTalkApplication;
 import com.nextcloud.talk.controllers.base.BaseController;
@@ -173,7 +173,7 @@ public class CallNotificationController extends BaseController {
         callAnswerVoiceOnlyView.setVisibility(View.VISIBLE);
     }
 
-    @OnClick(R.id.callControlHangupView)
+    @OnClick(R.id.hangupButton)
     void hangup() {
         leavingScreen = true;
 
@@ -198,10 +198,14 @@ public class CallNotificationController extends BaseController {
         originalBundle.putString(BundleKeys.INSTANCE.getKEY_ROOM_TOKEN(), currentConversation.getToken());
         originalBundle.putString(BundleKeys.INSTANCE.getKEY_CONVERSATION_NAME(), currentConversation.getDisplayName());
 
-        getRouter().replaceTopController(RouterTransaction.with(new CallController(originalBundle))
-                                                 .popChangeHandler(new HorizontalChangeHandler())
-                                                 .pushChangeHandler(new HorizontalChangeHandler())
-                                                 .tag(CallController.TAG));
+//        getRouter().replaceTopController(RouterTransaction.with(new CallActivity(originalBundle))
+//                                                 .popChangeHandler(new HorizontalChangeHandler())
+//                                                 .pushChangeHandler(new HorizontalChangeHandler())
+//                                                 .tag(CallActivity.TAG));
+
+        Intent intent = new Intent(this.getActivity(), CallActivity.class);
+        intent.putExtras(originalBundle);
+        startActivity(intent);
     }
 
     private void checkIfAnyParticipantsRemainInRoom() {
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
index d8708bdf3..703c21ee0 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -94,7 +94,7 @@ import com.facebook.imagepipeline.datasource.BaseBitmapDataSubscriber
 import com.facebook.imagepipeline.image.CloseableImage
 import com.google.android.flexbox.FlexboxLayout
 import com.nextcloud.talk.R
-import com.nextcloud.talk.activities.MagicCallActivity
+import com.nextcloud.talk.activities.CallActivity
 import com.nextcloud.talk.activities.MainActivity
 import com.nextcloud.talk.adapters.messages.IncomingLocationMessageViewHolder
 import com.nextcloud.talk.adapters.messages.IncomingPreviewMessageViewHolder
@@ -2142,7 +2142,7 @@ class ChatController(args: Bundle) :
             }
 
             return if (activity != null) {
-                val callIntent = Intent(activity, MagicCallActivity::class.java)
+                val callIntent = Intent(activity, CallActivity::class.java)
                 callIntent.putExtras(bundle)
                 callIntent
             } else {
@@ -2500,7 +2500,7 @@ class ChatController(args: Bundle) :
                     }
 
                     override fun onNext(roomOverall: RoomOverall) {
-                        val conversationIntent = Intent(activity, MagicCallActivity::class.java)
+                        val conversationIntent = Intent(activity, CallActivity::class.java)
                         val bundle = Bundle()
                         bundle.putParcelable(KEY_USER_ENTITY, conversationUser)
                         bundle.putString(KEY_ROOM_TOKEN, roomOverall.ocs.data.token)
diff --git a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java
index d11134a45..9f2a2e09e 100644
--- a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java
+++ b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java
@@ -48,7 +48,7 @@ import com.facebook.imagepipeline.image.CloseableImage;
 import com.facebook.imagepipeline.postprocessors.RoundAsCirclePostprocessor;
 import com.facebook.imagepipeline.request.ImageRequest;
 import com.nextcloud.talk.R;
-import com.nextcloud.talk.activities.MagicCallActivity;
+import com.nextcloud.talk.activities.CallActivity;
 import com.nextcloud.talk.activities.MainActivity;
 import com.nextcloud.talk.api.NcApi;
 import com.nextcloud.talk.application.NextcloudTalkApplication;
@@ -590,7 +590,7 @@ public class NotificationWorker extends Worker {
 
                             boolean startACall = decryptedPushMessage.getType().equals("call");
                             if (startACall) {
-                                intent = new Intent(context, MagicCallActivity.class);
+                                intent = new Intent(context, CallActivity.class);
                             } else {
                                 intent = new Intent(context, MainActivity.class);
                             }
diff --git a/app/src/main/res/layout/activity_magic_call.xml b/app/src/main/res/layout/activity_magic_call.xml
deleted file mode 100644
index 046293920..000000000
--- a/app/src/main/res/layout/activity_magic_call.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Nextcloud Talk application
-  ~
-  ~ @author Mario Danic
-  ~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com>
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    tools:context=".activities.MagicCallActivity">
-
-    <com.bluelinelabs.conductor.ChangeHandlerFrameLayout
-        android:id="@+id/controller_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</RelativeLayout>
diff --git a/app/src/main/res/layout/call_states.xml b/app/src/main/res/layout/call_states.xml
index 136805f57..1e2a354d6 100644
--- a/app/src/main/res/layout/call_states.xml
+++ b/app/src/main/res/layout/call_states.xml
@@ -21,7 +21,7 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/callStateRelativeLayoutView"
+    android:id="@+id/callStateRelativeLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
diff --git a/app/src/main/res/layout/controller_call.xml b/app/src/main/res/layout/controller_call.xml
index 2195a1b79..4edd83635 100644
--- a/app/src/main/res/layout/controller_call.xml
+++ b/app/src/main/res/layout/controller_call.xml
@@ -28,7 +28,7 @@
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
     android:orientation="vertical"
-    tools:context=".activities.MagicCallActivity">
+    tools:context=".activities.CallActivity">
 
     <LinearLayout
         android:id="@+id/linearWrapperLayout"
@@ -37,7 +37,7 @@
         android:orientation="vertical">
 
         <RelativeLayout
-            android:id="@+id/conversationRelativeLayoutView"
+            android:id="@+id/conversationRelativeLayout"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
@@ -70,7 +70,7 @@
                     tools:visibility="visible" />
 
                 <com.facebook.drawee.view.SimpleDraweeView
-                    android:id="@+id/call_control_switch_camera"
+                    android:id="@+id/switchSelfVideoButton"
                     android:layout_width="40dp"
                     android:layout_height="40dp"
                     android:layout_gravity="center_horizontal|bottom"
@@ -89,7 +89,7 @@
                 android:paddingTop="20dp">
 
                 <TextView
-                    android:id="@+id/callVoiceOrVideoTextView"
+                    android:id="@+id/callModeTextView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:textAlignment="center"
@@ -122,6 +122,7 @@
                 android:layout_centerVertical="true" />
 
             <include
+                android:id="@+id/callStates"
                 layout="@layout/call_states"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -132,7 +133,7 @@
     </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/callControlsLinearLayout"
+        android:id="@+id/callControls"
         android:layout_width="match_parent"
         android:layout_height="@dimen/call_controls_height"
         android:layout_alignBottom="@id/linearWrapperLayout"
@@ -144,7 +145,7 @@
         android:layout_marginEnd="40dp">
 
         <com.facebook.drawee.view.SimpleDraweeView
-            android:id="@+id/callControlEnterPip"
+            android:id="@+id/pictureInPictureButton"
             android:layout_width="60dp"
             android:layout_height="match_parent"
             android:layout_marginEnd="10dp"
@@ -154,7 +155,7 @@
             app:roundAsCircle="true" />
 
         <com.facebook.drawee.view.SimpleDraweeView
-            android:id="@+id/callControlEnableSpeaker"
+            android:id="@+id/speakerButton"
             android:layout_width="60dp"
             android:layout_height="match_parent"
             android:layout_marginStart="10dp"
@@ -164,7 +165,7 @@
             app:roundAsCircle="true" />
 
         <com.facebook.drawee.view.SimpleDraweeView
-            android:id="@+id/call_control_camera"
+            android:id="@+id/cameraButton"
             android:layout_width="60dp"
             android:layout_height="match_parent"
             android:layout_marginStart="10dp"
@@ -175,7 +176,7 @@
             app:roundAsCircle="true" />
 
         <com.facebook.drawee.view.SimpleDraweeView
-            android:id="@+id/call_control_microphone"
+            android:id="@+id/microphoneButton"
             android:layout_width="60dp"
             android:layout_height="match_parent"
             android:layout_marginStart="10dp"
@@ -186,7 +187,7 @@
             app:roundAsCircle="true" />
 
         <com.facebook.drawee.view.SimpleDraweeView
-            android:id="@+id/callControlHangupView"
+            android:id="@+id/hangupButton"
             android:layout_width="60dp"
             android:layout_height="match_parent"
             android:layout_marginStart="10dp"
diff --git a/app/src/main/res/layout/controller_call_notification.xml b/app/src/main/res/layout/controller_call_notification.xml
index 76b47fa45..647f5423c 100644
--- a/app/src/main/res/layout/controller_call_notification.xml
+++ b/app/src/main/res/layout/controller_call_notification.xml
@@ -54,7 +54,7 @@
             tools:visibility="visible" />
 
         <com.facebook.drawee.view.SimpleDraweeView
-            android:id="@+id/callControlHangupView"
+            android:id="@+id/hangupButton"
             android:layout_width="60dp"
             android:layout_height="60dp"
             android:layout_margin="24dp"

From c7e38e4859b23a5309f10c6daa60c1e3a2ec35a7 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Thu, 28 Oct 2021 12:19:07 +0200
Subject: [PATCH 23/50] replace CallNotificationController with Activity (WIP)

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../firebase/MagicFirebaseMessagingService.kt |   4 +-
 app/src/main/AndroidManifest.xml              |   8 +
 .../CallNotificationActivity.java}            | 254 +++++++-----------
 .../nextcloud/talk/activities/MainActivity.kt |  17 +-
 ...ion.xml => call_notification_activity.xml} |   0
 5 files changed, 123 insertions(+), 160 deletions(-)
 rename app/src/main/java/com/nextcloud/talk/{controllers/CallNotificationController.java => activities/CallNotificationActivity.java} (70%)
 rename app/src/main/res/layout/{controller_call_notification.xml => call_notification_activity.xml} (100%)

diff --git a/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt b/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt
index 42c18b51c..0c0ec6dff 100644
--- a/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt
+++ b/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt
@@ -41,7 +41,7 @@ import com.bluelinelabs.logansquare.LoganSquare
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 import com.nextcloud.talk.R
-import com.nextcloud.talk.activities.CallActivity
+import com.nextcloud.talk.activities.CallNotificationActivity
 import com.nextcloud.talk.api.NcApi
 import com.nextcloud.talk.application.NextcloudTalkApplication
 import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
@@ -178,7 +178,7 @@ class MagicFirebaseMessagingService : FirebaseMessagingService() {
                                 )
                             }
                         } else if (type == "call") {
-                            val fullScreenIntent = Intent(applicationContext, CallActivity::class.java)
+                            val fullScreenIntent = Intent(applicationContext, CallNotificationActivity::class.java)
                             val bundle = Bundle()
                             bundle.putString(BundleKeys.KEY_ROOM_ID, decryptedPushMessage!!.id)
                             bundle.putParcelable(KEY_USER_ENTITY, signatureVerification!!.userEntity)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a1f1ae7e5..d7f47844b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -131,6 +131,14 @@
             android:taskAffinity=".call"
             android:excludeFromRecents="true" />
 
+        <activity
+            android:name=".activities.CallNotificationActivity"
+            android:theme="@style/AppTheme.CallLauncher"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:launchMode="singleTask"
+            android:taskAffinity=".call"
+            android:excludeFromRecents="true" />
+
         <activity
             android:name=".activities.FullScreenImageActivity"
             android:theme="@style/FullScreenImageTheme"
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java b/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
similarity index 70%
rename from app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
rename to app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
index 73cc307ec..aaa1cda0f 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.nextcloud.talk.controllers;
+package com.nextcloud.talk.activities;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -32,32 +32,24 @@ import android.media.MediaPlayer;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
-import android.renderscript.RenderScript;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
 
 import com.bluelinelabs.logansquare.LoganSquare;
 import com.facebook.common.executors.UiThreadImmediateExecutorService;
 import com.facebook.common.references.CloseableReference;
 import com.facebook.datasource.DataSource;
 import com.facebook.drawee.backends.pipeline.Fresco;
-import com.facebook.drawee.view.SimpleDraweeView;
 import com.facebook.imagepipeline.core.ImagePipeline;
 import com.facebook.imagepipeline.datasource.BaseBitmapDataSubscriber;
 import com.facebook.imagepipeline.image.CloseableImage;
 import com.facebook.imagepipeline.postprocessors.BlurPostProcessor;
 import com.facebook.imagepipeline.request.ImageRequest;
 import com.nextcloud.talk.R;
-import com.nextcloud.talk.activities.CallActivity;
 import com.nextcloud.talk.api.NcApi;
 import com.nextcloud.talk.application.NextcloudTalkApplication;
-import com.nextcloud.talk.controllers.base.BaseController;
+import com.nextcloud.talk.databinding.CallNotificationActivityBinding;
 import com.nextcloud.talk.events.CallNotificationClick;
 import com.nextcloud.talk.events.ConfigurationChangeEvent;
 import com.nextcloud.talk.models.RingtoneSettings;
@@ -86,11 +78,9 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import autodagger.AutoInjector;
-import butterknife.BindView;
 import butterknife.OnClick;
 import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -99,9 +89,9 @@ import io.reactivex.schedulers.Schedulers;
 import okhttp3.Cache;
 
 @AutoInjector(NextcloudTalkApplication.class)
-public class CallNotificationController extends BaseController {
+public class CallNotificationActivity extends BaseActivity {
 
-    public static final String TAG = "CallNotificationController";
+    public static final String TAG = "CallNotificationActivity";
 
     @Inject
     NcApi ncApi;
@@ -118,27 +108,6 @@ public class CallNotificationController extends BaseController {
     @Inject
     Context context;
 
-    @BindView(R.id.incomingCallVoiceOrVideoTextView)
-    TextView incomingCallVoiceOrVideoTextView;
-
-    @BindView(R.id.conversationNameTextView)
-    TextView conversationNameTextView;
-
-    @BindView(R.id.avatarImageView)
-    SimpleDraweeView avatarImageView;
-
-    @BindView(R.id.callAnswerVoiceOnlyView)
-    SimpleDraweeView callAnswerVoiceOnlyView;
-
-    @BindView(R.id.callAnswerCameraView)
-    SimpleDraweeView callAnswerCameraView;
-
-    @BindView(R.id.backgroundImageView)
-    ImageView backgroundImageView;
-
-    @BindView(R.id.incomingTextRelativeLayout)
-    RelativeLayout incomingTextRelativeLayout;
-
     private List<Disposable> disposablesList = new ArrayList<>();
     private Bundle originalBundle;
     private String roomId;
@@ -147,63 +116,97 @@ public class CallNotificationController extends BaseController {
     private Conversation currentConversation;
     private MediaPlayer mediaPlayer;
     private boolean leavingScreen = false;
-    private RenderScript renderScript;
     private Handler handler;
+    private CallNotificationActivityBinding binding;
 
-    public CallNotificationController(Bundle args) {
-        super(args);
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
         NextcloudTalkApplication.Companion.getSharedApplication().getComponentApplication().inject(this);
 
         eventBus.post(new CallNotificationClick());
-        this.roomId = args.getString(BundleKeys.INSTANCE.getKEY_ROOM_ID(), "");
-        this.currentConversation = Parcels.unwrap(args.getParcelable(BundleKeys.INSTANCE.getKEY_ROOM()));
-        this.userBeingCalled = args.getParcelable(BundleKeys.INSTANCE.getKEY_USER_ENTITY());
 
-        this.originalBundle = args;
+        binding = CallNotificationActivityBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        Bundle extras = getIntent().getExtras();
+        this.roomId = extras.getString(BundleKeys.INSTANCE.getKEY_ROOM_ID(), "");
+        this.currentConversation = Parcels.unwrap(extras.getParcelable(BundleKeys.INSTANCE.getKEY_ROOM()));
+        this.userBeingCalled = extras.getParcelable(BundleKeys.INSTANCE.getKEY_USER_ENTITY());
+
+        this.originalBundle = extras;
         credentials = ApiUtils.getCredentials(userBeingCalled.getUsername(), userBeingCalled.getToken());
+
+        setCallDescriptionText();
+
+        if (currentConversation == null) {
+            handleFromNotification();
+        } else {
+            runAllThings();
+        }
+
+        if (DoNotDisturbUtils.INSTANCE.shouldPlaySound()) {
+            playRingtoneSound();
+        }
+
+        initClickListeners();
     }
 
+    @SuppressLint({"LongLogTag"})
     @Override
-    protected View inflateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup container) {
-        return inflater.inflate(R.layout.controller_call_notification, container, false);
+    public void onStart() {
+        super.onStart();
+
+        if (handler == null) {
+            handler = new Handler();
+
+            try {
+                cache.evictAll();
+            } catch (IOException e) {
+                Log.e(TAG, "Failed to evict cache");
+            }
+        }
+    }
+
+    private void initClickListeners() {
+        binding.callAnswerVoiceOnlyView.setOnClickListener(l -> {
+            originalBundle.putBoolean(BundleKeys.INSTANCE.getKEY_CALL_VOICE_ONLY(), true);
+            proceedToCall();
+        });
+
+        binding.callAnswerCameraView.setOnClickListener(l -> {
+            originalBundle.putBoolean(BundleKeys.INSTANCE.getKEY_CALL_VOICE_ONLY(), false);
+            proceedToCall();
+        });
+
+        binding.hangupButton.setOnClickListener(l -> hangup());
+    }
+
+    private void setCallDescriptionText() {
+        String callDescriptionWithoutTypeInfo =
+            String.format(
+                getResources().getString(R.string.nc_call_unknown),
+                getResources().getString(R.string.nc_app_product_name));
+
+        binding.incomingCallVoiceOrVideoTextView.setText(callDescriptionWithoutTypeInfo);
     }
 
     private void showAnswerControls() {
-        callAnswerCameraView.setVisibility(View.VISIBLE);
-        callAnswerVoiceOnlyView.setVisibility(View.VISIBLE);
+        binding.callAnswerCameraView.setVisibility(View.VISIBLE);
+        binding.callAnswerVoiceOnlyView.setVisibility(View.VISIBLE);
     }
 
     @OnClick(R.id.hangupButton)
     void hangup() {
         leavingScreen = true;
-
-        if (getActivity() != null) {
-            getActivity().finish();
-        }
-    }
-
-    @OnClick(R.id.callAnswerCameraView)
-    void answerWithCamera() {
-        originalBundle.putBoolean(BundleKeys.INSTANCE.getKEY_CALL_VOICE_ONLY(), false);
-        proceedToCall();
-    }
-
-    @OnClick(R.id.callAnswerVoiceOnlyView)
-    void answerVoiceOnly() {
-        originalBundle.putBoolean(BundleKeys.INSTANCE.getKEY_CALL_VOICE_ONLY(), true);
-        proceedToCall();
+        finish();
     }
 
     private void proceedToCall() {
         originalBundle.putString(BundleKeys.INSTANCE.getKEY_ROOM_TOKEN(), currentConversation.getToken());
         originalBundle.putString(BundleKeys.INSTANCE.getKEY_CONVERSATION_NAME(), currentConversation.getDisplayName());
 
-//        getRouter().replaceTopController(RouterTransaction.with(new CallActivity(originalBundle))
-//                                                 .popChangeHandler(new HorizontalChangeHandler())
-//                                                 .pushChangeHandler(new HorizontalChangeHandler())
-//                                                 .tag(CallActivity.TAG));
-
-        Intent intent = new Intent(this.getActivity(), CallActivity.class);
+        Intent intent = new Intent(this, CallActivity.class);
         intent.putExtras(originalBundle);
         startActivity(intent);
     }
@@ -239,9 +242,7 @@ public class CallNotificationController extends BaseController {
                         }
 
                         if (!hasParticipantsInCall || inCallOnDifferentDevice) {
-                            if (getActivity() != null) {
-                                getActivity().runOnUiThread(() -> hangup());
-                            }
+                            runOnUiThread(() -> hangup());
                         }
                     }
 
@@ -285,11 +286,11 @@ public class CallNotificationController extends BaseController {
                                                                                 "conversation-call-flags");
                             if (hasCallFlags) {
                                 if (isInCallWithVideo(currentConversation.callFlag)) {
-                                    incomingCallVoiceOrVideoTextView.setText(
+                                    binding.incomingCallVoiceOrVideoTextView.setText(
                                             String.format(getResources().getString(R.string.nc_call_video),
                                                           getResources().getString(R.string.nc_app_product_name)));
                                 } else {
-                                    incomingCallVoiceOrVideoTextView.setText(
+                                    binding.incomingCallVoiceOrVideoTextView.setText(
                                             String.format(getResources().getString(R.string.nc_call_voice),
                                                           getResources().getString(R.string.nc_app_product_name)));
                                 }
@@ -316,9 +317,7 @@ public class CallNotificationController extends BaseController {
     }
 
     private void runAllThings() {
-        if (conversationNameTextView != null) {
-            conversationNameTextView.setText(currentConversation.getDisplayName());
-        }
+        binding.conversationNameTextView.setText(currentConversation.getDisplayName());
 
         // TODO: load avatar, but don't block UI!
 //        loadAvatar();
@@ -326,67 +325,21 @@ public class CallNotificationController extends BaseController {
         showAnswerControls();
     }
 
-    @SuppressLint({"LongLogTag"})
-    @Override
-    protected void onViewBound(@NonNull View view) {
-        super.onViewBound(view);
-
-        String callDescriptionWithoutTypeInfo =
-                String.format(
-                        getResources().getString(R.string.nc_call_unknown),
-                        getResources().getString(R.string.nc_app_product_name));
-
-        incomingCallVoiceOrVideoTextView.setText(callDescriptionWithoutTypeInfo);
-
-        renderScript = RenderScript.create(getActivity());
-
-        if (handler == null) {
-            handler = new Handler();
-
-            try {
-                cache.evictAll();
-            } catch (IOException e) {
-                Log.e(TAG, "Failed to evict cache");
-            }
-        }
-
-        if (currentConversation == null) {
-            handleFromNotification();
-        } else {
-            runAllThings();
-        }
-
-        if (DoNotDisturbUtils.INSTANCE.shouldPlaySound()) {
-            playRingtoneSound();
-        }
-    }
-
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMessageEvent(ConfigurationChangeEvent configurationChangeEvent) {
-        ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams) avatarImageView.getLayoutParams();
+        ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams) binding.avatarImageView.getLayoutParams();
         int dimen = (int) getResources().getDimension(R.dimen.avatar_size_very_big);
 
         layoutParams.width = dimen;
         layoutParams.height = dimen;
-        avatarImageView.setLayoutParams(layoutParams);
+        binding.avatarImageView.setLayoutParams(layoutParams);
     }
 
-    @Override
-    protected void onDetach(@NonNull View view) {
-        super.onDetach(view);
-        eventBus.unregister(this);
-    }
-
-    @Override
-    protected void onAttach(@NonNull View view) {
-        super.onAttach(view);
-        eventBus.register(this);
-    }
 
     private void loadAvatar() {
         switch (currentConversation.getType()) {
             case ROOM_TYPE_ONE_TO_ONE_CALL:
-                avatarImageView.setVisibility(View.VISIBLE);
+                binding.avatarImageView.setVisibility(View.VISIBLE);
 
                 ImageRequest imageRequest =
                         DisplayUtils.getImageRequestForUrl(
@@ -401,33 +354,30 @@ public class CallNotificationController extends BaseController {
                 dataSource.subscribe(new BaseBitmapDataSubscriber() {
                     @Override
                     protected void onNewResultImpl(@Nullable Bitmap bitmap) {
-                        if (avatarImageView != null) {
-                            avatarImageView.getHierarchy().setImage(new BitmapDrawable(bitmap), 100,
-                                                                    true);
+                        binding.avatarImageView.getHierarchy().setImage(new BitmapDrawable(bitmap), 100,
+                                                                true);
+                        if (getResources() != null) {
+                            binding.incomingTextRelativeLayout.setBackground(
+                                    getResources().getDrawable(R.drawable.incoming_gradient));
+                        }
 
-                            if (getResources() != null) {
-                                incomingTextRelativeLayout.setBackground(
-                                        getResources().getDrawable(R.drawable.incoming_gradient));
-                            }
+                        if (AvatarStatusCodeHolder.getInstance().getStatusCode() == 200 ||
+                                AvatarStatusCodeHolder.getInstance().getStatusCode() == 0) {
 
-                            if (AvatarStatusCodeHolder.getInstance().getStatusCode() == 200 ||
-                                    AvatarStatusCodeHolder.getInstance().getStatusCode() == 0) {
-                                if (getActivity() != null) {
-                                    Bitmap backgroundBitmap = bitmap.copy(bitmap.getConfig(), true);
-                                    new BlurPostProcessor(5, getActivity()).process(backgroundBitmap);
-                                    backgroundImageView.setImageDrawable(new BitmapDrawable(backgroundBitmap));
-                                }
-                            } else if (AvatarStatusCodeHolder.getInstance().getStatusCode() == 201) {
-                                ColorArt colorArt = new ColorArt(bitmap);
-                                int color = colorArt.getBackgroundColor();
+                                Bitmap backgroundBitmap = bitmap.copy(bitmap.getConfig(), true);
+                                new BlurPostProcessor(5, context).process(backgroundBitmap);
+                                binding.backgroundImageView.setImageDrawable(new BitmapDrawable(backgroundBitmap));
 
-                                float[] hsv = new float[3];
-                                Color.colorToHSV(color, hsv);
-                                hsv[2] *= 0.75f;
-                                color = Color.HSVToColor(hsv);
+                        } else if (AvatarStatusCodeHolder.getInstance().getStatusCode() == 201) {
+                            ColorArt colorArt = new ColorArt(bitmap);
+                            int color = colorArt.getBackgroundColor();
 
-                                backgroundImageView.setImageDrawable(new ColorDrawable(color));
-                            }
+                            float[] hsv = new float[3];
+                            Color.colorToHSV(color, hsv);
+                            hsv[2] *= 0.75f;
+                            color = Color.HSVToColor(hsv);
+
+                            binding.backgroundImageView.setImageDrawable(new ColorDrawable(color));
                         }
                     }
 
@@ -439,9 +389,9 @@ public class CallNotificationController extends BaseController {
 
                 break;
             case ROOM_GROUP_CALL:
-                avatarImageView.setImageResource(R.drawable.ic_circular_group);
+                binding.avatarImageView.setImageResource(R.drawable.ic_circular_group);
             case ROOM_PUBLIC_CALL:
-                avatarImageView.setImageResource(R.drawable.ic_circular_group);
+                binding.avatarImageView.setImageResource(R.drawable.ic_circular_group);
                 break;
             default:
         }
@@ -502,10 +452,10 @@ public class CallNotificationController extends BaseController {
             }
         }
 
-        if (ringtoneUri != null && getActivity() != null) {
+        if (ringtoneUri != null) {
             mediaPlayer = new MediaPlayer();
             try {
-                mediaPlayer.setDataSource(getActivity(), ringtoneUri);
+                mediaPlayer.setDataSource(this, ringtoneUri);
 
                 mediaPlayer.setLooping(true);
                 AudioAttributes audioAttributes = new AudioAttributes
diff --git a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
index 7e803a7a7..88b043616 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
@@ -40,7 +40,6 @@ import com.google.android.material.snackbar.Snackbar
 import com.nextcloud.talk.R
 import com.nextcloud.talk.api.NcApi
 import com.nextcloud.talk.application.NextcloudTalkApplication
-import com.nextcloud.talk.controllers.CallNotificationController
 import com.nextcloud.talk.controllers.ConversationsListController
 import com.nextcloud.talk.controllers.LockedController
 import com.nextcloud.talk.controllers.ServerSelectionController
@@ -310,11 +309,17 @@ class MainActivity : BaseActivity(), ActionBarProvider {
         handleActionFromContact(intent)
         if (intent.hasExtra(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL)) {
             if (intent.getBooleanExtra(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL, false)) {
-                router!!.pushController(
-                    RouterTransaction.with(CallNotificationController(intent.extras))
-                        .pushChangeHandler(HorizontalChangeHandler())
-                        .popChangeHandler(HorizontalChangeHandler())
-                )
+
+                // router!!.pushController(
+                //     RouterTransaction.with(CallNotificationController(intent.extras))
+                //         .pushChangeHandler(HorizontalChangeHandler())
+                //         .popChangeHandler(HorizontalChangeHandler())
+                // )
+
+                val callNotificationIntent = Intent(this, CallNotificationActivity::class.java)
+                intent.extras?.let { callNotificationIntent.putExtras(it) }
+                startActivity(callNotificationIntent)
+
             } else {
                 ConductorRemapping.remapChatController(
                     router!!, intent.getLongExtra(BundleKeys.KEY_INTERNAL_USER_ID, -1),
diff --git a/app/src/main/res/layout/controller_call_notification.xml b/app/src/main/res/layout/call_notification_activity.xml
similarity index 100%
rename from app/src/main/res/layout/controller_call_notification.xml
rename to app/src/main/res/layout/call_notification_activity.xml

From 3326b6a7f35f39bafffd490f0c25a296a123bfb7 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Thu, 28 Oct 2021 12:20:04 +0200
Subject: [PATCH 24/50] rename design for CallActivity

move methods

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../talk/activities/CallActivity.java         | 78 ++++++++++---------
 ...{controller_call.xml => call_activity.xml} |  0
 2 files changed, 40 insertions(+), 38 deletions(-)
 rename app/src/main/res/layout/{controller_call.xml => call_activity.xml} (100%)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
index cd5787547..923260581 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -54,7 +54,7 @@ import com.nextcloud.talk.adapters.ParticipantDisplayItem;
 import com.nextcloud.talk.adapters.ParticipantsAdapter;
 import com.nextcloud.talk.api.NcApi;
 import com.nextcloud.talk.application.NextcloudTalkApplication;
-import com.nextcloud.talk.databinding.ControllerCallBinding;
+import com.nextcloud.talk.databinding.CallActivityBinding;
 import com.nextcloud.talk.events.ConfigurationChangeEvent;
 import com.nextcloud.talk.events.MediaStreamEvent;
 import com.nextcloud.talk.events.NetworkEvent;
@@ -242,7 +242,7 @@ public class CallActivity extends BaseActivity {
 
     private Boolean isInPipMode = false;
 
-    private ControllerCallBinding binding;
+    private CallActivityBinding binding;
 
     @Parcel
     public enum CallStatus {
@@ -262,7 +262,7 @@ public class CallActivity extends BaseActivity {
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
-        binding = ControllerCallBinding.inflate(getLayoutInflater());
+        binding = CallActivityBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
         Bundle extras = getIntent().getExtras();
@@ -312,6 +312,43 @@ public class CallActivity extends BaseActivity {
         initClickListeners();
     }
 
+    @SuppressLint("ClickableViewAccessibility")
+    @Override
+    public void onStart() {
+        super.onStart();
+        // TODO: move some lines to onCreate!?!
+
+        binding.microphoneButton.setOnTouchListener(new MicrophoneButtonTouchListener());
+
+        pulseAnimation = PulseAnimation.create().with(binding.microphoneButton)
+            .setDuration(310)
+            .setRepeatCount(PulseAnimation.INFINITE)
+            .setRepeatMode(PulseAnimation.REVERSE);
+
+
+        try {
+            cache.evictAll();
+        } catch (IOException e) {
+            Log.e(TAG, "Failed to evict cache");
+        }
+
+        binding.callControls.setZ(100.0f);
+        basicInitialization();
+        participantDisplayItems = new HashMap<>();
+        initViews();
+        updateSelfVideoViewPosition();
+        if (!isConnectionEstablished()){
+            initiateCall();
+        }
+    }
+
+    public void onStop() {
+        super.onStop();
+        if (isInPipMode) {
+            finish();
+        }
+    }
+
     private void initClickListeners() {
         binding.pictureInPictureButton.setOnClickListener(l -> enterPipMode());
 
@@ -2380,34 +2417,6 @@ public class CallActivity extends BaseActivity {
         }
     }
 
-    @SuppressLint("ClickableViewAccessibility")
-    @Override
-    public void onStart() {
-        super.onStart();
-        binding.microphoneButton.setOnTouchListener(new MicrophoneButtonTouchListener());
-
-        pulseAnimation = PulseAnimation.create().with(binding.microphoneButton)
-            .setDuration(310)
-            .setRepeatCount(PulseAnimation.INFINITE)
-            .setRepeatMode(PulseAnimation.REVERSE);
-
-
-        try {
-            cache.evictAll();
-        } catch (IOException e) {
-            Log.e(TAG, "Failed to evict cache");
-        }
-
-        binding.callControls.setZ(100.0f);
-        basicInitialization();
-        participantDisplayItems = new HashMap<>();
-        initViews();
-        updateSelfVideoViewPosition();
-        if (!isConnectionEstablished()){
-            initiateCall();
-        }
-    }
-
     private class MicrophoneButtonTouchListener implements View.OnTouchListener {
 
         @SuppressLint("ClickableViewAccessibility")
@@ -2505,13 +2514,6 @@ public class CallActivity extends BaseActivity {
         }
     }
 
-    public void onStop() {
-        super.onStop();
-        if (isInPipMode) {
-            finish();
-        }
-    }
-
     private class SelfVideoTouchListener implements View.OnTouchListener {
 
         @SuppressLint("ClickableViewAccessibility")
diff --git a/app/src/main/res/layout/controller_call.xml b/app/src/main/res/layout/call_activity.xml
similarity index 100%
rename from app/src/main/res/layout/controller_call.xml
rename to app/src/main/res/layout/call_activity.xml

From 7e68ecbde9b43bbe19406bacb91318cc76249177 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Thu, 28 Oct 2021 12:30:43 +0200
Subject: [PATCH 25/50] rename "runAllThings"

:D :D
setUpAfterConversationIsKnown might not be the best name, but i'm not sure when in onCreate the currentConversation can be null. depending on that it might even not be necessary to have the "things" in a method..

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../nextcloud/talk/activities/CallNotificationActivity.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
index aaa1cda0f..475b145c2 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
@@ -142,7 +142,7 @@ public class CallNotificationActivity extends BaseActivity {
         if (currentConversation == null) {
             handleFromNotification();
         } else {
-            runAllThings();
+            setUpAfterConversationIsKnown();
         }
 
         if (DoNotDisturbUtils.INSTANCE.shouldPlaySound()) {
@@ -278,7 +278,7 @@ public class CallNotificationActivity extends BaseActivity {
                     @Override
                     public void onNext(@io.reactivex.annotations.NonNull RoomOverall roomOverall) {
                         currentConversation = roomOverall.getOcs().data;
-                        runAllThings();
+                        setUpAfterConversationIsKnown();
 
                         if (apiVersion >= 3) {
                             boolean hasCallFlags =
@@ -316,7 +316,7 @@ public class CallNotificationActivity extends BaseActivity {
                 || Participant.ParticipantFlags.IN_CALL_WITH_AUDIO_AND_VIDEO.getValue() == callFlag);
     }
 
-    private void runAllThings() {
+    private void setUpAfterConversationIsKnown() {
         binding.conversationNameTextView.setText(currentConversation.getDisplayName());
 
         // TODO: load avatar, but don't block UI!

From e05334cb9a8a99279cfdb211dfee256bb8bc90e6 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Thu, 28 Oct 2021 13:02:18 +0200
Subject: [PATCH 26/50] enable pip support for CallNotificationActivity

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 app/src/main/AndroidManifest.xml              |  1 +
 .../talk/activities/CallActivity.java         | 77 +++++++++----------
 .../activities/CallNotificationActivity.java  | 55 ++++++++++++-
 .../res/layout/call_notification_activity.xml |  3 +-
 4 files changed, 95 insertions(+), 41 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d7f47844b..28470ec9d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -134,6 +134,7 @@
         <activity
             android:name=".activities.CallNotificationActivity"
             android:theme="@style/AppTheme.CallLauncher"
+            android:supportsPictureInPicture="true"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
             android:launchMode="singleTask"
             android:taskAffinity=".call"
diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
index 923260581..2dee04b95 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -2340,33 +2340,6 @@ public class CallActivity extends BaseActivity {
         }
     }
 
-    public void updateUiForPipMode(){
-        RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                                                                             ViewGroup.LayoutParams.WRAP_CONTENT);
-        params.setMargins(0,0,0, 0);
-        binding.gridview.setLayoutParams(params);
-
-
-        binding.callControls.setVisibility(View.GONE);
-        binding.callInfosLinearLayout.setVisibility(View.GONE);
-        binding.selfVideoViewWrapper.setVisibility(View.GONE);
-        binding.callStates.callStateRelativeLayout.setVisibility(View.GONE);
-
-        binding.selfVideoRenderer.release();
-    }
-
-    public void updateUiForNormalMode(){
-        if (isVoiceOnlyCall) {
-            binding.callControls.setVisibility(View.VISIBLE);
-        } else {
-            binding.callControls.setVisibility(View.INVISIBLE); // animateCallControls needs this to be invisible for a check.
-        }
-        initViews();
-
-        binding.callInfosLinearLayout.setVisibility(View.VISIBLE);
-        binding.selfVideoViewWrapper.setVisibility(View.VISIBLE);
-    }
-
     private String getDescriptionForCallType() {
         String appName = getResources().getString(R.string.nc_app_product_name);
         if (isVoiceOnlyCall) {
@@ -2474,6 +2447,44 @@ public class CallActivity extends BaseActivity {
             .build();
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    @Override
+    public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode, Configuration newConfig) {
+        super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig);
+        isInPipMode = isInPictureInPictureMode;
+        if (isInPictureInPictureMode) {
+            updateUiForPipMode();
+        } else {
+            updateUiForNormalMode();
+        }
+    }
+    public void updateUiForPipMode(){
+        RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+                                                                             ViewGroup.LayoutParams.WRAP_CONTENT);
+        params.setMargins(0,0,0, 0);
+        binding.gridview.setLayoutParams(params);
+
+
+        binding.callControls.setVisibility(View.GONE);
+        binding.callInfosLinearLayout.setVisibility(View.GONE);
+        binding.selfVideoViewWrapper.setVisibility(View.GONE);
+        binding.callStates.callStateRelativeLayout.setVisibility(View.GONE);
+
+        binding.selfVideoRenderer.release();
+    }
+
+    public void updateUiForNormalMode(){
+        if (isVoiceOnlyCall) {
+            binding.callControls.setVisibility(View.VISIBLE);
+        } else {
+            binding.callControls.setVisibility(View.INVISIBLE); // animateCallControls needs this to be invisible for a check.
+        }
+        initViews();
+
+        binding.callInfosLinearLayout.setVisibility(View.VISIBLE);
+        binding.selfVideoViewWrapper.setVisibility(View.VISIBLE);
+    }
+
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
         eventBus.post(new ConfigurationChangeEvent());
@@ -2502,18 +2513,6 @@ public class CallActivity extends BaseActivity {
         }
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.O)
-    @Override
-    public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode, Configuration newConfig) {
-        super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig);
-        isInPipMode = isInPictureInPictureMode;
-        if (isInPictureInPictureMode) {
-            updateUiForPipMode();
-        } else {
-            updateUiForNormalMode();
-        }
-    }
-
     private class SelfVideoTouchListener implements View.OnTouchListener {
 
         @SuppressLint("ClickableViewAccessibility")
diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
index 475b145c2..b1cf0f1a9 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
@@ -21,8 +21,10 @@
 package com.nextcloud.talk.activities;
 
 import android.annotation.SuppressLint;
+import android.app.PictureInPictureParams;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
@@ -30,10 +32,12 @@ import android.graphics.drawable.ColorDrawable;
 import android.media.AudioAttributes;
 import android.media.MediaPlayer;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.TextUtils;
 import android.util.Log;
+import android.util.Rational;
 import android.view.View;
 
 import com.bluelinelabs.logansquare.LoganSquare;
@@ -79,6 +83,7 @@ import java.util.List;
 import javax.inject.Inject;
 
 import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import autodagger.AutoInjector;
 import butterknife.OnClick;
@@ -118,6 +123,7 @@ public class CallNotificationActivity extends BaseActivity {
     private boolean leavingScreen = false;
     private Handler handler;
     private CallNotificationActivityBinding binding;
+    private Boolean isInPipMode = false;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -357,7 +363,7 @@ public class CallNotificationActivity extends BaseActivity {
                         binding.avatarImageView.getHierarchy().setImage(new BitmapDrawable(bitmap), 100,
                                                                 true);
                         if (getResources() != null) {
-                            binding.incomingTextRelativeLayout.setBackground(
+                            binding.incomingCallRelativeLayout.setBackground(
                                     getResources().getDrawable(R.drawable.incoming_gradient));
                         }
 
@@ -473,4 +479,51 @@ public class CallNotificationActivity extends BaseActivity {
             }
         }
     }
+
+    public void onBackPressed() {
+        enterPipMode();
+    }
+
+    public void onUserLeaveHint() {
+        enterPipMode();
+    }
+
+    void enterPipMode() {
+//        enableKeyguard();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            enterPictureInPictureMode(getPipParams());
+        } else {
+            finish();
+        }
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    public PictureInPictureParams getPipParams() {
+        Rational pipRatio = new Rational(300, 500);
+        return new PictureInPictureParams.Builder()
+            .setAspectRatio(pipRatio)
+            .build();
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    @Override
+    public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode, Configuration newConfig) {
+        super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig);
+        isInPipMode = isInPictureInPictureMode;
+        if (isInPictureInPictureMode) {
+            updateUiForPipMode();
+        } else {
+            updateUiForNormalMode();
+        }
+    }
+
+    public void updateUiForPipMode(){
+        binding.callAnswerButtons.setVisibility(View.INVISIBLE);
+        binding.incomingCallRelativeLayout.setVisibility(View.INVISIBLE);
+    }
+
+    public void updateUiForNormalMode(){
+        binding.callAnswerButtons.setVisibility(View.VISIBLE);
+        binding.incomingCallRelativeLayout.setVisibility(View.VISIBLE);
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/call_notification_activity.xml b/app/src/main/res/layout/call_notification_activity.xml
index 647f5423c..e015f3acc 100644
--- a/app/src/main/res/layout/call_notification_activity.xml
+++ b/app/src/main/res/layout/call_notification_activity.xml
@@ -35,6 +35,7 @@
         tools:srcCompat="@tools:sample/backgrounds/scenic" />
 
     <LinearLayout
+        android:id="@+id/callAnswerButtons"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
@@ -75,7 +76,7 @@
     </LinearLayout>
 
     <RelativeLayout
-        android:id="@+id/incomingTextRelativeLayout"
+        android:id="@+id/incomingCallRelativeLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 

From 57804c8d6208da3ddb5d328ba720f1af39b00853 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Thu, 28 Oct 2021 16:26:03 +0200
Subject: [PATCH 27/50] dismiss keyguard for CallNotificationActivity (WIP, see
 TODO)

Whenever i click the button to accept the call, CallActivity is started by intent.
CallActivity itself has the same logic to dismiss the keyguard.

The problem is: When switching from CallNotificationActivity to CallActivity the lockscreen is shown indeed!
So i guess Android recognizes "oh, CallNotificationActivity is gone. Let's show the lockscreen" before it recognizes that
the new activity also dismiss the lockscreen ?!

I fear for this scenario it was not the best idea to have 2 different activies.. (before it was only 1 activity and 2 condcutor controllers..)

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 app/src/main/AndroidManifest.xml              |  6 +++--
 .../activities/CallNotificationActivity.java  | 22 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 28470ec9d..1d0260733 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -129,7 +129,8 @@
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
             android:launchMode="singleTask"
             android:taskAffinity=".call"
-            android:excludeFromRecents="true" />
+            android:excludeFromRecents="true"
+            android:showOnLockScreen="true"/>
 
         <activity
             android:name=".activities.CallNotificationActivity"
@@ -138,7 +139,8 @@
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
             android:launchMode="singleTask"
             android:taskAffinity=".call"
-            android:excludeFromRecents="true" />
+            android:excludeFromRecents="true"
+            android:showOnLockScreen="true" />
 
         <activity
             android:name=".activities.FullScreenImageActivity"
diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
index b1cf0f1a9..a9e9245e3 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
@@ -21,6 +21,7 @@
 package com.nextcloud.talk.activities;
 
 import android.annotation.SuppressLint;
+import android.app.KeyguardManager;
 import android.app.PictureInPictureParams;
 import android.content.Context;
 import android.content.Intent;
@@ -39,6 +40,7 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.util.Rational;
 import android.view.View;
+import android.view.WindowManager;
 
 import com.bluelinelabs.logansquare.LoganSquare;
 import com.facebook.common.executors.UiThreadImmediateExecutorService;
@@ -130,6 +132,10 @@ public class CallNotificationActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         NextcloudTalkApplication.Companion.getSharedApplication().getComponentApplication().inject(this);
 
+        dismissKeyguard();
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+
         eventBus.post(new CallNotificationClick());
 
         binding = CallNotificationActivityBinding.inflate(getLayoutInflater());
@@ -489,7 +495,6 @@ public class CallNotificationActivity extends BaseActivity {
     }
 
     void enterPipMode() {
-//        enableKeyguard();
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             enterPictureInPictureMode(getPipParams());
         } else {
@@ -526,4 +531,19 @@ public class CallNotificationActivity extends BaseActivity {
         binding.callAnswerButtons.setVisibility(View.VISIBLE);
         binding.incomingCallRelativeLayout.setVisibility(View.VISIBLE);
     }
+
+    // TODO: dismiss keyguard works, but whenever accepting the call and switch to CallActivity by intent, the
+    //  lockscreen is shown (although CallActivity also dismisses the keyguard in the same way.)
+    private void dismissKeyguard() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+            setShowWhenLocked(true);
+            setTurnScreenOn(true);
+            KeyguardManager keyguardManager = (KeyguardManager) getSystemService(KEYGUARD_SERVICE);
+            keyguardManager.requestDismissKeyguard(this, null);
+        } else {
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
+        }
+    }
 }
\ No newline at end of file

From a0c95113bf5aaa0e2b8106d05e4b2d31c4ddc6cb Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Sat, 30 Oct 2021 00:35:41 +0200
Subject: [PATCH 28/50] display overlay instead of grid in pip view for group
 calls

this is a quick and dirty solution until "speaker view" is introduced in the future which should be used for the pip view.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../talk/activities/CallActivity.java         | 90 ++++++++++---------
 app/src/main/res/layout/call_activity.xml     | 32 +++++++
 2 files changed, 82 insertions(+), 40 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
index 2dee04b95..30b25ce49 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -559,52 +559,53 @@ public class CallActivity extends BaseActivity {
     }
 
     private void initGridAdapter() {
-        if (binding.conversationRelativeLayout != null) {
-
-            int columns;
-            int participantsInGrid = participantDisplayItems.size();
-            if (getResources() != null && getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
-                if (participantsInGrid > 2) {
-                    columns = 2;
-                } else {
-                    columns = 1;
-                }
+        int columns;
+        int participantsInGrid = participantDisplayItems.size();
+        if (getResources() != null && getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
+            if (participantsInGrid > 2) {
+                columns = 2;
             } else {
-                if (participantsInGrid > 2) {
-                    columns = 3;
-                } else if (participantsInGrid > 1) {
-                    columns = 2;
-                } else {
-                    columns = 1;
-                }
+                columns = 1;
             }
+        } else {
+            if (participantsInGrid > 2) {
+                columns = 3;
+            } else if (participantsInGrid > 1) {
+                columns = 2;
+            } else {
+                columns = 1;
+            }
+        }
 
-            binding.gridview.setNumColumns(columns);
+        binding.gridview.setNumColumns(columns);
 
-            binding.conversationRelativeLayout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-                @Override
-                public void onGlobalLayout() {
-                    binding.conversationRelativeLayout.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-                    int height = binding.conversationRelativeLayout.getMeasuredHeight();
-                    binding.gridview.setMinimumHeight(height);
-                }
-            });
+        binding.conversationRelativeLayout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+                binding.conversationRelativeLayout.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                int height = binding.conversationRelativeLayout.getMeasuredHeight();
+                binding.gridview.setMinimumHeight(height);
+            }
+        });
 
-            binding.callInfosLinearLayout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-                @Override
-                public void onGlobalLayout() {
-                    binding.callInfosLinearLayout.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-                }
-            });
+        binding.callInfosLinearLayout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+                binding.callInfosLinearLayout.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+            }
+        });
 
-            participantsAdapter = new ParticipantsAdapter(
-                    this,
-                    participantDisplayItems,
-                    binding.conversationRelativeLayout,
-                    binding.callInfosLinearLayout,
-                    columns,
-                    isVoiceOnlyCall);
-            binding.gridview.setAdapter(participantsAdapter);
+        participantsAdapter = new ParticipantsAdapter(
+                this,
+                participantDisplayItems,
+                binding.conversationRelativeLayout,
+                binding.callInfosLinearLayout,
+                columns,
+                isVoiceOnlyCall);
+        binding.gridview.setAdapter(participantsAdapter);
+
+        if (isInPipMode){
+            updateUiForPipMode();
         }
     }
 
@@ -2470,6 +2471,13 @@ public class CallActivity extends BaseActivity {
         binding.selfVideoViewWrapper.setVisibility(View.GONE);
         binding.callStates.callStateRelativeLayout.setVisibility(View.GONE);
 
+        if (participantDisplayItems.size() > 1){
+            binding.pipCallConversationNameTextView.setText(conversationName);
+            binding.pipGroupCallOverlay.setVisibility(View.VISIBLE);
+        } else {
+            binding.pipGroupCallOverlay.setVisibility(View.INVISIBLE);
+        }
+
         binding.selfVideoRenderer.release();
     }
 
@@ -2483,6 +2491,8 @@ public class CallActivity extends BaseActivity {
 
         binding.callInfosLinearLayout.setVisibility(View.VISIBLE);
         binding.selfVideoViewWrapper.setVisibility(View.VISIBLE);
+
+        binding.pipGroupCallOverlay.setVisibility(View.INVISIBLE);
     }
 
     public void onConfigurationChanged(Configuration newConfig) {
diff --git a/app/src/main/res/layout/call_activity.xml b/app/src/main/res/layout/call_activity.xml
index 4edd83635..dfd43d51b 100644
--- a/app/src/main/res/layout/call_activity.xml
+++ b/app/src/main/res/layout/call_activity.xml
@@ -197,4 +197,36 @@
             app:roundAsCircle="true" />
     </LinearLayout>
 
+    <LinearLayout
+        android:id="@+id/pipGroupCallOverlay"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="@color/black"
+        android:gravity="center"
+        android:visibility="invisible">
+
+        <TextView
+            android:id="@+id/pipCallConversationNameTextView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="-30dp"
+            android:layout_marginBottom="15dp"
+            android:layout_marginStart="5dp"
+            android:layout_marginEnd="5dp"
+            android:textAlignment="center"
+            android:maxLines="3"
+            android:ellipsize="end"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            tools:text="our group call" />
+
+        <com.facebook.drawee.view.SimpleDraweeView
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            app:backgroundImage="@drawable/ic_circular_group"
+            app:roundAsCircle="true" />
+
+    </LinearLayout>
+
 </RelativeLayout>

From 4a1c637efc423814a820b51f193a1856bfe83530 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Mon, 1 Nov 2021 09:17:49 +0100
Subject: [PATCH 29/50] add checks if pip is supported by device

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../com/nextcloud/talk/activities/CallActivity.java  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
index 30b25ce49..48f854862 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -26,6 +26,7 @@ import android.animation.AnimatorListenerAdapter;
 import android.annotation.SuppressLint;
 import android.app.KeyguardManager;
 import android.app.PictureInPictureParams;
+import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.graphics.Color;
 import android.media.AudioAttributes;
@@ -499,7 +500,7 @@ public class CallActivity extends BaseActivity {
         binding.callInfosLinearLayout.setVisibility(View.VISIBLE);
         binding.selfVideoViewWrapper.setVisibility(View.VISIBLE);
 
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+        if (!deviceSupportsPipMode()) {
             binding.pictureInPictureButton.setVisibility(View.GONE);
         }
 
@@ -2423,23 +2424,30 @@ public class CallActivity extends BaseActivity {
         }
     }
 
+    @Override
     public void onBackPressed() {
         enterPipMode();
     }
 
+    @Override
     public void onUserLeaveHint() {
         enterPipMode();
     }
 
     void enterPipMode() {
         enableKeyguard();
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        if (deviceSupportsPipMode()) {
             enterPictureInPictureMode(getPipParams());
         } else {
             finish();
         }
     }
 
+    private boolean deviceSupportsPipMode() {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
+            && getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE);
+    }
+
     @RequiresApi(Build.VERSION_CODES.O)
     public PictureInPictureParams getPipParams() {
         Rational pipRatio = new Rational(300, 500);

From 0bfeb1b320275811fa7aeb4715f20b2251227401 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Mon, 1 Nov 2021 11:04:21 +0100
Subject: [PATCH 30/50] add action button to mute/unmute in pip mode

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../talk/activities/CallActivity.java         | 145 +++++++++++++-----
 app/src/main/res/values/strings.xml           |   5 +
 2 files changed, 110 insertions(+), 40 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
index 48f854862..f8fbd4a0d 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -25,10 +25,17 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.annotation.SuppressLint;
 import android.app.KeyguardManager;
+import android.app.PendingIntent;
 import android.app.PictureInPictureParams;
+import android.app.RemoteAction;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.graphics.Color;
+import android.graphics.drawable.Icon;
 import android.media.AudioAttributes;
 import android.media.MediaPlayer;
 import android.net.Uri;
@@ -136,6 +143,7 @@ import java.util.concurrent.TimeUnit;
 
 import javax.inject.Inject;
 
+import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
@@ -155,6 +163,17 @@ import pub.devrel.easypermissions.AfterPermissionGranted;
 @AutoInjector(NextcloudTalkApplication.class)
 public class CallActivity extends BaseActivity {
 
+    @Inject
+    NcApi ncApi;
+    @Inject
+    EventBus eventBus;
+    @Inject
+    UserUtils userUtils;
+    @Inject
+    AppPreferences appPreferences;
+    @Inject
+    Cache cache;
+
     public static final String TAG = "CallActivity";
 
     private static final String[] PERMISSIONS_CALL = {
@@ -170,16 +189,12 @@ public class CallActivity extends BaseActivity {
             Manifest.permission.RECORD_AUDIO
     };
 
-    @Inject
-    NcApi ncApi;
-    @Inject
-    EventBus eventBus;
-    @Inject
-    UserUtils userUtils;
-    @Inject
-    AppPreferences appPreferences;
-    @Inject
-    Cache cache;
+    private static final String MICROPHONE_PIP_INTENT_NAME = "microphone_pip_intent";
+    private static final String MICROPHONE_PIP_INTENT_EXTRA_ACTION = "microphone_pip_action";
+    private static final int MICROPHONE_PIP_REQUEST_MUTE = 1;
+    private static final int MICROPHONE_PIP_REQUEST_UNMUTE = 2;
+    private PictureInPictureParams.Builder mPictureInPictureParamsBuilder;
+    private BroadcastReceiver mReceiver;
 
     private PeerConnectionFactory peerConnectionFactory;
     private MediaConstraints audioConstraints;
@@ -206,7 +221,7 @@ public class CallActivity extends BaseActivity {
     private Map<String, Participant> participantMap = new HashMap<>();
 
     private boolean videoOn = false;
-    private boolean audioOn = false;
+    private boolean microphoneOn = false;
 
     private boolean isVoiceOnlyCall;
     private boolean isIncomingCallFromNotification;
@@ -294,21 +309,9 @@ public class CallActivity extends BaseActivity {
             setCallState(CallStatus.CONNECTING);
         }
 
-        binding.microphoneButton.setOnClickListener(l -> onMicrophoneClick());
-        binding.microphoneButton.setOnLongClickListener(l -> {
-            if (!audioOn) {
-                callControlHandler.removeCallbacksAndMessages(null);
-                callInfosHandler.removeCallbacksAndMessages(null);
-                cameraSwitchHandler.removeCallbacksAndMessages(null);
-                isPTTActive = true;
-                binding.callControls.setVisibility(View.VISIBLE);
-                if (!isVoiceOnlyCall) {
-                    binding.switchSelfVideoButton.setVisibility(View.VISIBLE);
-                }
-            }
-            onMicrophoneClick();
-            return true;
-        });
+        if (deviceSupportsPipMode()) {
+            mPictureInPictureParamsBuilder = new PictureInPictureParams.Builder();
+        }
 
         initClickListeners();
     }
@@ -364,6 +367,22 @@ public class CallActivity extends BaseActivity {
             }
         });
 
+        binding.microphoneButton.setOnClickListener(l -> onMicrophoneClick());
+        binding.microphoneButton.setOnLongClickListener(l -> {
+            if (!microphoneOn) {
+                callControlHandler.removeCallbacksAndMessages(null);
+                callInfosHandler.removeCallbacksAndMessages(null);
+                cameraSwitchHandler.removeCallbacksAndMessages(null);
+                isPTTActive = true;
+                binding.callControls.setVisibility(View.VISIBLE);
+                if (!isVoiceOnlyCall) {
+                    binding.switchSelfVideoButton.setVisibility(View.VISIBLE);
+                }
+            }
+            onMicrophoneClick();
+            return true;
+        });
+
         binding.cameraButton.setOnClickListener(l -> onCameraClick());
 
         binding.hangupButton.setOnClickListener(l -> {
@@ -635,7 +654,7 @@ public class CallActivity extends BaseActivity {
                 onCameraClick();
             }
 
-            if (!audioOn) {
+            if (!microphoneOn) {
                 onMicrophoneClick();
             }
 
@@ -680,7 +699,7 @@ public class CallActivity extends BaseActivity {
         }
 
         if (EffortlessPermissions.hasPermissions(this, PERMISSIONS_MICROPHONE)) {
-            if (!audioOn) {
+            if (!microphoneOn) {
                 onMicrophoneClick();
             }
         } else {
@@ -812,15 +831,21 @@ public class CallActivity extends BaseActivity {
             }
 
             if (!isPTTActive) {
-                audioOn = !audioOn;
+                microphoneOn = !microphoneOn;
 
-                if (audioOn) {
+                if (microphoneOn) {
                     binding.microphoneButton.getHierarchy().setPlaceholderImage(R.drawable.ic_mic_white_24px);
+                    updatePictureInPictureActions(R.drawable.ic_mic_white_24px,
+                                                  getResources().getString(R.string.nc_pip_microphone_mute),
+                                                  MICROPHONE_PIP_REQUEST_MUTE);
                 } else {
                     binding.microphoneButton.getHierarchy().setPlaceholderImage(R.drawable.ic_mic_off_white_24px);
+                    updatePictureInPictureActions(R.drawable.ic_mic_off_white_24px,
+                                                  getResources().getString(R.string.nc_pip_microphone_unmute),
+                                                  MICROPHONE_PIP_REQUEST_UNMUTE);
                 }
 
-                toggleMedia(audioOn, false);
+                toggleMedia(microphoneOn, false);
             } else {
                 binding.microphoneButton.getHierarchy().setPlaceholderImage(R.drawable.ic_mic_white_24px);
                 pulseAnimation.start();
@@ -2437,7 +2462,9 @@ public class CallActivity extends BaseActivity {
     void enterPipMode() {
         enableKeyguard();
         if (deviceSupportsPipMode()) {
-            enterPictureInPictureMode(getPipParams());
+            Rational pipRatio = new Rational(300, 500);
+            mPictureInPictureParamsBuilder.setAspectRatio(pipRatio);
+            enterPictureInPictureMode(mPictureInPictureParamsBuilder.build());
         } else {
             finish();
         }
@@ -2448,25 +2475,63 @@ public class CallActivity extends BaseActivity {
             && getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE);
     }
 
-    @RequiresApi(Build.VERSION_CODES.O)
-    public PictureInPictureParams getPipParams() {
-        Rational pipRatio = new Rational(300, 500);
-        return new PictureInPictureParams.Builder()
-            .setAspectRatio(pipRatio)
-            .build();
-    }
-
     @RequiresApi(api = Build.VERSION_CODES.O)
     @Override
     public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode, Configuration newConfig) {
         super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig);
         isInPipMode = isInPictureInPictureMode;
         if (isInPictureInPictureMode) {
+            mReceiver =
+                new BroadcastReceiver() {
+                    @Override
+                    public void onReceive(Context context, Intent intent) {
+                        if (intent == null || !MICROPHONE_PIP_INTENT_NAME.equals(intent.getAction())) {
+                            return;
+                        }
+
+                        final int action = intent.getIntExtra(MICROPHONE_PIP_INTENT_EXTRA_ACTION, 0);
+                        switch (action) {
+                            case MICROPHONE_PIP_REQUEST_MUTE:
+                            case MICROPHONE_PIP_REQUEST_UNMUTE:
+                                onMicrophoneClick();
+                                break;
+                        }
+                    }
+                };
+            registerReceiver(mReceiver, new IntentFilter(MICROPHONE_PIP_INTENT_NAME));
+
             updateUiForPipMode();
         } else {
+            unregisterReceiver(mReceiver);
+            mReceiver = null;
+
             updateUiForNormalMode();
         }
     }
+
+    void updatePictureInPictureActions(
+        @DrawableRes int iconId,
+        String title,
+        int requestCode) {
+
+        if (deviceSupportsPipMode()) {
+            final ArrayList<RemoteAction> actions = new ArrayList<>();
+
+            final Icon icon = Icon.createWithResource(this, iconId);
+            final PendingIntent intent =
+                PendingIntent.getBroadcast(
+                    this,
+                    requestCode,
+                    new Intent(MICROPHONE_PIP_INTENT_NAME).putExtra(MICROPHONE_PIP_INTENT_EXTRA_ACTION, requestCode),
+                    0);
+
+            actions.add(new RemoteAction(icon, title, title, intent));
+
+            mPictureInPictureParamsBuilder.setActions(actions);
+            setPictureInPictureParams(mPictureInPictureParamsBuilder.build());
+        }
+    }
+
     public void updateUiForPipMode(){
         RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
                                                                              ViewGroup.LayoutParams.WRAP_CONTENT);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 501acb52c..c9f38ab88 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -221,6 +221,10 @@
     <string name="nc_call_state_with_phone">%1$s with phone</string>
     <string name="nc_call_state_with_video">%1$s with video</string>
 
+    <!-- Picture in Picture -->
+    <string name="nc_pip_microphone_mute">mute microphone</string>
+    <string name="nc_pip_microphone_unmute">enable microphone</string>
+
     <!-- Notification channels -->
     <string name="nc_notification_channel">%1$s on %2$s notification channel</string>
     <string name="nc_notification_channel_calls">Calls notification channel</string>
@@ -468,4 +472,5 @@
     <string name="filename_progress">%1$s (%2$d)</string>
     <string name="nc_dialog_invalid_password">Invalid password</string>
     <string name="nc_dialog_reauth_or_delete">Do you want to reauthorize or delete this account?</string>
+
 </resources>

From 71ae7eddc21fbe05f3ebb5465944ed17f7609256 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Tue, 2 Nov 2021 14:56:07 +0100
Subject: [PATCH 31/50] move code from onStart to onCreate

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../talk/activities/CallActivity.java         | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
index f8fbd4a0d..3a18a676a 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -265,6 +265,7 @@ public class CallActivity extends BaseActivity {
         CONNECTING, CALLING_TIMEOUT, JOINED, IN_CONVERSATION, RECONNECTING, OFFLINE, LEAVING, PUBLISHER_FAILED
     }
 
+    @SuppressLint("ClickableViewAccessibility")
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -296,7 +297,6 @@ public class CallActivity extends BaseActivity {
         credentials = ApiUtils.getCredentials(conversationUser.getUsername(), conversationUser.getToken());
 
         baseUrl = extras.getString(BundleKeys.INSTANCE.getKEY_MODIFIED_BASE_URL(), "");
-
         if (TextUtils.isEmpty(baseUrl)) {
             baseUrl = conversationUser.getBaseUrl();
         }
@@ -314,14 +314,6 @@ public class CallActivity extends BaseActivity {
         }
 
         initClickListeners();
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    @Override
-    public void onStart() {
-        super.onStart();
-        // TODO: move some lines to onCreate!?!
-
         binding.microphoneButton.setOnTouchListener(new MicrophoneButtonTouchListener());
 
         pulseAnimation = PulseAnimation.create().with(binding.microphoneButton)
@@ -329,21 +321,24 @@ public class CallActivity extends BaseActivity {
             .setRepeatCount(PulseAnimation.INFINITE)
             .setRepeatMode(PulseAnimation.REVERSE);
 
-
-        try {
-            cache.evictAll();
-        } catch (IOException e) {
-            Log.e(TAG, "Failed to evict cache");
-        }
-
         binding.callControls.setZ(100.0f);
         basicInitialization();
         participantDisplayItems = new HashMap<>();
         initViews();
-        updateSelfVideoViewPosition();
         if (!isConnectionEstablished()){
             initiateCall();
         }
+        updateSelfVideoViewPosition();
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        try {
+            cache.evictAll();
+        } catch (IOException e) {
+            Log.e(TAG, "Failed to evict cache");
+        }
     }
 
     public void onStop() {

From 7a7888f5d1dca1e49f896d5dbe48b80024468496 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Tue, 2 Nov 2021 15:45:11 +0100
Subject: [PATCH 32/50] reformat code in CallActivity

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../talk/activities/CallActivity.java         | 982 +++++++++---------
 1 file changed, 491 insertions(+), 491 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
index 3a18a676a..e769fa36c 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -177,16 +177,16 @@ public class CallActivity extends BaseActivity {
     public static final String TAG = "CallActivity";
 
     private static final String[] PERMISSIONS_CALL = {
-            android.Manifest.permission.CAMERA,
-            android.Manifest.permission.RECORD_AUDIO,
+        android.Manifest.permission.CAMERA,
+        android.Manifest.permission.RECORD_AUDIO,
     };
 
     private static final String[] PERMISSIONS_CAMERA = {
-            Manifest.permission.CAMERA
+        Manifest.permission.CAMERA
     };
 
     private static final String[] PERMISSIONS_MICROPHONE = {
-            Manifest.permission.RECORD_AUDIO
+        Manifest.permission.RECORD_AUDIO
     };
 
     private static final String MICROPHONE_PIP_INTENT_NAME = "microphone_pip_intent";
@@ -325,7 +325,7 @@ public class CallActivity extends BaseActivity {
         basicInitialization();
         participantDisplayItems = new HashMap<>();
         initViews();
-        if (!isConnectionEstablished()){
+        if (!isConnectionEstablished()) {
             initiateCall();
         }
         updateSelfVideoViewPosition();
@@ -419,14 +419,14 @@ public class CallActivity extends BaseActivity {
         //Create a new PeerConnectionFactory instance.
         PeerConnectionFactory.Options options = new PeerConnectionFactory.Options();
         DefaultVideoEncoderFactory defaultVideoEncoderFactory = new DefaultVideoEncoderFactory(
-                rootEglBase.getEglBaseContext(), true, true);
+            rootEglBase.getEglBaseContext(), true, true);
         DefaultVideoDecoderFactory defaultVideoDecoderFactory = new DefaultVideoDecoderFactory(rootEglBase.getEglBaseContext());
 
         peerConnectionFactory = PeerConnectionFactory.builder()
-                .setOptions(options)
-                .setVideoEncoderFactory(defaultVideoEncoderFactory)
-                .setVideoDecoderFactory(defaultVideoDecoderFactory)
-                .createPeerConnectionFactory();
+            .setOptions(options)
+            .setVideoEncoderFactory(defaultVideoEncoderFactory)
+            .setVideoDecoderFactory(defaultVideoDecoderFactory)
+            .createPeerConnectionFactory();
 
         //Create MediaConstraints - Will be useful for specifying video and audio constraints.
         audioConstraints = new MediaConstraints();
@@ -473,40 +473,40 @@ public class CallActivity extends BaseActivity {
     }
 
     private void handleFromNotification() {
-        int apiVersion = ApiUtils.getConversationApiVersion(conversationUser, new int[] {ApiUtils.APIv4, 1});
+        int apiVersion = ApiUtils.getConversationApiVersion(conversationUser, new int[]{ApiUtils.APIv4, 1});
 
         ncApi.getRooms(credentials, ApiUtils.getUrlForRooms(apiVersion, baseUrl))
-                .retry(3)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<RoomsOverall>() {
-                    @Override
-                    public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
-                        // unused atm
-                    }
+            .retry(3)
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(new Observer<RoomsOverall>() {
+                @Override
+                public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
+                    // unused atm
+                }
 
-                    @Override
-                    public void onNext(@io.reactivex.annotations.NonNull RoomsOverall roomsOverall) {
-                        for (Conversation conversation : roomsOverall.getOcs().getData()) {
-                            if (roomId.equals(conversation.getRoomId())) {
-                                roomToken = conversation.getToken();
-                                break;
-                            }
+                @Override
+                public void onNext(@io.reactivex.annotations.NonNull RoomsOverall roomsOverall) {
+                    for (Conversation conversation : roomsOverall.getOcs().getData()) {
+                        if (roomId.equals(conversation.getRoomId())) {
+                            roomToken = conversation.getToken();
+                            break;
                         }
-
-                        checkPermissions();
                     }
 
-                    @Override
-                    public void onError(@io.reactivex.annotations.NonNull Throwable e) {
-                        // unused atm
-                    }
+                    checkPermissions();
+                }
 
-                    @Override
-                    public void onComplete() {
-                        // unused atm
-                    }
-                });
+                @Override
+                public void onError(@io.reactivex.annotations.NonNull Throwable e) {
+                    // unused atm
+                }
+
+                @Override
+                public void onComplete() {
+                    // unused atm
+                }
+            });
     }
 
     @SuppressLint("ClickableViewAccessibility")
@@ -528,12 +528,12 @@ public class CallActivity extends BaseActivity {
                                                                                  ViewGroup.LayoutParams.WRAP_CONTENT);
             params.addRule(RelativeLayout.BELOW, R.id.callInfosLinearLayout);
             int callControlsHeight = Math.round(getApplicationContext().getResources().getDimension(R.dimen.call_controls_height));
-            params.setMargins(0,0,0, callControlsHeight);
+            params.setMargins(0, 0, 0, callControlsHeight);
             binding.gridview.setLayoutParams(params);
         } else {
             RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
                                                                                  ViewGroup.LayoutParams.WRAP_CONTENT);
-            params.setMargins(0,0,0, 0);
+            params.setMargins(0, 0, 0, 0);
             binding.gridview.setLayoutParams(params);
 
             binding.speakerButton.setVisibility(View.GONE);
@@ -560,9 +560,9 @@ public class CallActivity extends BaseActivity {
 
     @SuppressLint("ClickableViewAccessibility")
     private void initSelfVideoView() {
-        try{
+        try {
             binding.selfVideoRenderer.init(rootEglBase.getEglBaseContext(), null);
-        } catch(IllegalStateException e) {
+        } catch (IllegalStateException e) {
             Log.d(TAG, "selfVideoRenderer already initialized", e);
         }
 
@@ -611,15 +611,15 @@ public class CallActivity extends BaseActivity {
         });
 
         participantsAdapter = new ParticipantsAdapter(
-                this,
-                participantDisplayItems,
-                binding.conversationRelativeLayout,
-                binding.callInfosLinearLayout,
-                columns,
-                isVoiceOnlyCall);
+            this,
+            participantDisplayItems,
+            binding.conversationRelativeLayout,
+            binding.callInfosLinearLayout,
+            columns,
+            isVoiceOnlyCall);
         binding.gridview.setAdapter(participantsAdapter);
 
-        if (isInPipMode){
+        if (isInPipMode) {
             updateUiForPipMode();
         }
     }
@@ -717,7 +717,7 @@ public class CallActivity extends BaseActivity {
         }
 
         if ((EffortlessPermissions.hasPermissions(this, PERMISSIONS_CAMERA) ||
-                EffortlessPermissions.hasPermissions(this, PERMISSIONS_MICROPHONE))) {
+            EffortlessPermissions.hasPermissions(this, PERMISSIONS_MICROPHONE))) {
             checkIfSomeAreApproved();
         } else if (!isConnectionEstablished()) {
             fetchSignalingSettings();
@@ -725,13 +725,13 @@ public class CallActivity extends BaseActivity {
     }
 
     private void onAudioManagerDevicesChanged(
-            final MagicAudioManager.AudioDevice device, final Set<MagicAudioManager.AudioDevice> availableDevices) {
+        final MagicAudioManager.AudioDevice device, final Set<MagicAudioManager.AudioDevice> availableDevices) {
         Log.d(TAG, "onAudioManagerDevicesChanged: " + availableDevices + ", "
-                + "selected: " + device);
+            + "selected: " + device);
 
         final boolean shouldDisableProximityLock = (device.equals(MagicAudioManager.AudioDevice.WIRED_HEADSET)
-                || device.equals(MagicAudioManager.AudioDevice.SPEAKER_PHONE)
-                || device.equals(MagicAudioManager.AudioDevice.BLUETOOTH));
+            || device.equals(MagicAudioManager.AudioDevice.SPEAKER_PHONE)
+            || device.equals(MagicAudioManager.AudioDevice.BLUETOOTH));
 
         if (shouldDisableProximityLock) {
             powerManagerUtils.updatePhoneState(PowerManagerUtils.PhoneState.WITHOUT_PROXIMITY_SENSOR_LOCK);
@@ -803,24 +803,24 @@ public class CallActivity extends BaseActivity {
 
             if (!appPreferences.getPushToTalkIntroShown()) {
                 spotlightView = new SpotlightView.Builder(this)
-                        .introAnimationDuration(300)
-                        .enableRevealAnimation(true)
-                        .performClick(false)
-                        .fadeinTextDuration(400)
-                        .headingTvColor(getResources().getColor(R.color.colorPrimary))
-                        .headingTvSize(20)
-                        .headingTvText(getResources().getString(R.string.nc_push_to_talk))
-                        .subHeadingTvColor(getResources().getColor(R.color.bg_default))
-                        .subHeadingTvSize(16)
-                        .subHeadingTvText(getResources().getString(R.string.nc_push_to_talk_desc))
-                        .maskColor(Color.parseColor("#dc000000"))
-                        .target(binding.microphoneButton)
-                        .lineAnimDuration(400)
-                        .lineAndArcColor(getResources().getColor(R.color.colorPrimary))
-                        .enableDismissAfterShown(true)
-                        .dismissOnBackPress(true)
-                        .usageId("pushToTalk")
-                        .show();
+                    .introAnimationDuration(300)
+                    .enableRevealAnimation(true)
+                    .performClick(false)
+                    .fadeinTextDuration(400)
+                    .headingTvColor(getResources().getColor(R.color.colorPrimary))
+                    .headingTvSize(20)
+                    .headingTvText(getResources().getString(R.string.nc_push_to_talk))
+                    .subHeadingTvColor(getResources().getColor(R.color.bg_default))
+                    .subHeadingTvSize(16)
+                    .subHeadingTvText(getResources().getString(R.string.nc_push_to_talk_desc))
+                    .maskColor(Color.parseColor("#dc000000"))
+                    .target(binding.microphoneButton)
+                    .lineAnimDuration(400)
+                    .lineAndArcColor(getResources().getColor(R.color.colorPrimary))
+                    .enableDismissAfterShown(true)
+                    .dismissOnBackPress(true)
+                    .usageId("pushToTalk")
+                    .show();
 
                 appPreferences.setPushToTalkIntroShown(true);
             }
@@ -855,8 +855,8 @@ public class CallActivity extends BaseActivity {
             // Microphone permission is permanently denied so we cannot request it normally.
 
             OpenAppDetailsDialogFragment.show(
-                    R.string.nc_microphone_permission_permanently_denied,
-                    R.string.nc_permissions_settings, (AppCompatActivity) this);
+                R.string.nc_microphone_permission_permanently_denied,
+                R.string.nc_permissions_settings, (AppCompatActivity) this);
         } else {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 requestPermissions(PERMISSIONS_MICROPHONE, 100);
@@ -884,8 +884,8 @@ public class CallActivity extends BaseActivity {
         } else if (EffortlessPermissions.somePermissionPermanentlyDenied(this, PERMISSIONS_CAMERA)) {
             // Camera permission is permanently denied so we cannot request it normally.
             OpenAppDetailsDialogFragment.show(
-                    R.string.nc_camera_permission_permanently_denied,
-                    R.string.nc_permissions_settings, (AppCompatActivity) this);
+                R.string.nc_camera_permission_permanently_denied,
+                R.string.nc_permissions_settings, (AppCompatActivity) this);
         } else {
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
@@ -1010,88 +1010,88 @@ public class CallActivity extends BaseActivity {
             if (binding.callControls != null) {
                 binding.callControls.setEnabled(false);
                 binding.callControls.animate()
-                        .translationY(0)
-                        .alpha(alpha)
-                        .setDuration(duration)
-                        .setStartDelay(startDelay)
-                        .setListener(new AnimatorListenerAdapter() {
-                            @Override
-                            public void onAnimationEnd(Animator animation) {
-                                super.onAnimationEnd(animation);
-                                if (binding.callControls != null) {
-                                    if (!show) {
-                                        binding.callControls.setVisibility(View.GONE);
-                                        if (spotlightView != null && spotlightView.getVisibility() != View.GONE) {
-                                            spotlightView.setVisibility(View.GONE);
-                                        }
-                                    } else {
-                                        callControlHandler.postDelayed(new Runnable() {
-                                            @Override
-                                            public void run() {
-                                                if (!isPTTActive) {
-                                                    animateCallControls(false, 0);
-                                                }
-                                            }
-                                        }, 7500);
+                    .translationY(0)
+                    .alpha(alpha)
+                    .setDuration(duration)
+                    .setStartDelay(startDelay)
+                    .setListener(new AnimatorListenerAdapter() {
+                        @Override
+                        public void onAnimationEnd(Animator animation) {
+                            super.onAnimationEnd(animation);
+                            if (binding.callControls != null) {
+                                if (!show) {
+                                    binding.callControls.setVisibility(View.GONE);
+                                    if (spotlightView != null && spotlightView.getVisibility() != View.GONE) {
+                                        spotlightView.setVisibility(View.GONE);
                                     }
-
-                                    binding.callControls.setEnabled(true);
+                                } else {
+                                    callControlHandler.postDelayed(new Runnable() {
+                                        @Override
+                                        public void run() {
+                                            if (!isPTTActive) {
+                                                animateCallControls(false, 0);
+                                            }
+                                        }
+                                    }, 7500);
                                 }
+
+                                binding.callControls.setEnabled(true);
                             }
-                        });
+                        }
+                    });
             }
 
             if (binding.callInfosLinearLayout != null) {
                 binding.callInfosLinearLayout.setEnabled(false);
                 binding.callInfosLinearLayout.animate()
-                        .translationY(0)
-                        .alpha(alpha)
-                        .setDuration(duration)
-                        .setStartDelay(startDelay)
-                        .setListener(new AnimatorListenerAdapter() {
-                            @Override
-                            public void onAnimationEnd(Animator animation) {
-                                super.onAnimationEnd(animation);
-                                if (binding.callInfosLinearLayout != null) {
-                                    if (!show) {
-                                        binding.callInfosLinearLayout.setVisibility(View.GONE);
-                                    } else {
-                                        callInfosHandler.postDelayed(new Runnable() {
-                                            @Override
-                                            public void run() {
-                                                if (!isPTTActive) {
-                                                    animateCallControls(false, 0);
-                                                }
+                    .translationY(0)
+                    .alpha(alpha)
+                    .setDuration(duration)
+                    .setStartDelay(startDelay)
+                    .setListener(new AnimatorListenerAdapter() {
+                        @Override
+                        public void onAnimationEnd(Animator animation) {
+                            super.onAnimationEnd(animation);
+                            if (binding.callInfosLinearLayout != null) {
+                                if (!show) {
+                                    binding.callInfosLinearLayout.setVisibility(View.GONE);
+                                } else {
+                                    callInfosHandler.postDelayed(new Runnable() {
+                                        @Override
+                                        public void run() {
+                                            if (!isPTTActive) {
+                                                animateCallControls(false, 0);
                                             }
-                                        }, 7500);
-                                    }
-
-                                    binding.callInfosLinearLayout.setEnabled(true);
+                                        }
+                                    }, 7500);
                                 }
+
+                                binding.callInfosLinearLayout.setEnabled(true);
                             }
-                        });
+                        }
+                    });
             }
 
             if (binding.switchSelfVideoButton != null) {
                 binding.switchSelfVideoButton.setEnabled(false);
                 binding.switchSelfVideoButton.animate()
-                        .translationY(0)
-                        .alpha(alpha)
-                        .setDuration(duration)
-                        .setStartDelay(startDelay)
-                        .setListener(new AnimatorListenerAdapter() {
-                            @Override
-                            public void onAnimationEnd(Animator animation) {
-                                super.onAnimationEnd(animation);
-                                if (binding.switchSelfVideoButton != null) {
-                                    if (!show) {
-                                        binding.switchSelfVideoButton.setVisibility(View.GONE);
-                                    }
-
-                                    binding.switchSelfVideoButton.setEnabled(true);
+                    .translationY(0)
+                    .alpha(alpha)
+                    .setDuration(duration)
+                    .setStartDelay(startDelay)
+                    .setListener(new AnimatorListenerAdapter() {
+                        @Override
+                        public void onAnimationEnd(Animator animation) {
+                            super.onAnimationEnd(animation);
+                            if (binding.switchSelfVideoButton != null) {
+                                if (!show) {
+                                    binding.switchSelfVideoButton.setVisibility(View.GONE);
                                 }
+
+                                binding.switchSelfVideoButton.setEnabled(true);
                             }
-                        });
+                        }
+                    });
             }
 
         }
@@ -1108,139 +1108,139 @@ public class CallActivity extends BaseActivity {
     }
 
     private void fetchSignalingSettings() {
-        int apiVersion = ApiUtils.getSignalingApiVersion(conversationUser, new int[] {ApiUtils.APIv3, 2, 1});
+        int apiVersion = ApiUtils.getSignalingApiVersion(conversationUser, new int[]{ApiUtils.APIv3, 2, 1});
 
         ncApi.getSignalingSettings(credentials, ApiUtils.getUrlForSignalingSettings(apiVersion, baseUrl))
-                .subscribeOn(Schedulers.io())
-                .retry(3)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<SignalingSettingsOverall>() {
-                    @Override
-                    public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
-                        // unused atm
-                    }
+            .subscribeOn(Schedulers.io())
+            .retry(3)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(new Observer<SignalingSettingsOverall>() {
+                @Override
+                public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
+                    // unused atm
+                }
 
-                    @Override
-                    public void onNext(@io.reactivex.annotations.NonNull SignalingSettingsOverall signalingSettingsOverall) {
-                        if (signalingSettingsOverall != null && signalingSettingsOverall.getOcs() != null &&
-                                signalingSettingsOverall.getOcs().getSettings() != null) {
+                @Override
+                public void onNext(@io.reactivex.annotations.NonNull SignalingSettingsOverall signalingSettingsOverall) {
+                    if (signalingSettingsOverall != null && signalingSettingsOverall.getOcs() != null &&
+                        signalingSettingsOverall.getOcs().getSettings() != null) {
 
+                        externalSignalingServer = new ExternalSignalingServer();
+
+                        if (!TextUtils.isEmpty(signalingSettingsOverall.getOcs().getSettings().getExternalSignalingServer()) &&
+                            !TextUtils.isEmpty(signalingSettingsOverall.getOcs().getSettings().getExternalSignalingTicket())) {
                             externalSignalingServer = new ExternalSignalingServer();
+                            externalSignalingServer.setExternalSignalingServer(signalingSettingsOverall.getOcs().getSettings().getExternalSignalingServer());
+                            externalSignalingServer.setExternalSignalingTicket(signalingSettingsOverall.getOcs().getSettings().getExternalSignalingTicket());
+                            hasExternalSignalingServer = true;
+                        } else {
+                            hasExternalSignalingServer = false;
+                        }
 
-                            if (!TextUtils.isEmpty(signalingSettingsOverall.getOcs().getSettings().getExternalSignalingServer()) &&
-                                    !TextUtils.isEmpty(signalingSettingsOverall.getOcs().getSettings().getExternalSignalingTicket())) {
-                                externalSignalingServer = new ExternalSignalingServer();
-                                externalSignalingServer.setExternalSignalingServer(signalingSettingsOverall.getOcs().getSettings().getExternalSignalingServer());
-                                externalSignalingServer.setExternalSignalingTicket(signalingSettingsOverall.getOcs().getSettings().getExternalSignalingTicket());
-                                hasExternalSignalingServer = true;
-                            } else {
-                                hasExternalSignalingServer = false;
+                        if (!conversationUser.getUserId().equals("?")) {
+                            try {
+                                userUtils.createOrUpdateUser(null, null, null, null, null, null, null,
+                                                             conversationUser.getId(), null, null, LoganSquare.serialize(externalSignalingServer))
+                                    .subscribeOn(Schedulers.io())
+                                    .subscribe();
+                            } catch (IOException exception) {
+                                Log.e(TAG, "Failed to serialize external signaling server", exception);
                             }
+                        } else {
+                            try {
+                                conversationUser.setExternalSignalingServer(LoganSquare.serialize(externalSignalingServer));
+                            } catch (IOException exception) {
+                                Log.e(TAG, "Failed to serialize external signaling server", exception);
+                            }
+                        }
 
-                            if (!conversationUser.getUserId().equals("?")) {
-                                try {
-                                    userUtils.createOrUpdateUser(null, null, null, null, null, null, null,
-                                                                 conversationUser.getId(), null, null, LoganSquare.serialize(externalSignalingServer))
-                                            .subscribeOn(Schedulers.io())
-                                            .subscribe();
-                                } catch (IOException exception) {
-                                    Log.e(TAG, "Failed to serialize external signaling server", exception);
+                        if (signalingSettingsOverall.getOcs().getSettings().getStunServers() != null) {
+                            List<IceServer> stunServers =
+                                signalingSettingsOverall.getOcs().getSettings().getStunServers();
+                            if (apiVersion == ApiUtils.APIv3) {
+                                for (IceServer stunServer : stunServers) {
+                                    if (stunServer.getUrls() != null) {
+                                        for (String url : stunServer.getUrls()) {
+                                            iceServers.add(new PeerConnection.IceServer(url));
+                                        }
+                                    }
                                 }
                             } else {
-                                try {
-                                    conversationUser.setExternalSignalingServer(LoganSquare.serialize(externalSignalingServer));
-                                } catch (IOException exception) {
-                                    Log.e(TAG, "Failed to serialize external signaling server", exception);
-                                }
-                            }
-
-                            if (signalingSettingsOverall.getOcs().getSettings().getStunServers() != null) {
-                                List<IceServer> stunServers =
-                                        signalingSettingsOverall.getOcs().getSettings().getStunServers();
-                                if (apiVersion == ApiUtils.APIv3) {
+                                if (signalingSettingsOverall.getOcs().getSettings().getStunServers() != null) {
                                     for (IceServer stunServer : stunServers) {
-                                        if (stunServer.getUrls() != null) {
-                                            for (String url : stunServer.getUrls()) {
-                                                iceServers.add(new PeerConnection.IceServer(url));
-                                            }
-                                        }
-                                    }
-                                } else {
-                                    if (signalingSettingsOverall.getOcs().getSettings().getStunServers() != null) {
-                                        for (IceServer stunServer : stunServers) {
-                                            iceServers.add(new PeerConnection.IceServer(stunServer.getUrl()));
-                                        }
-                                    }
-                                }
-                            }
-
-                            if (signalingSettingsOverall.getOcs().getSettings().getTurnServers() != null) {
-                                List<IceServer> turnServers =
-                                        signalingSettingsOverall.getOcs().getSettings().getTurnServers();
-                                for (IceServer turnServer : turnServers) {
-                                    if (turnServer.getUrls() != null) {
-                                        for (String url : turnServer.getUrls()) {
-                                            iceServers.add(new PeerConnection.IceServer(
-                                                    url, turnServer.getUsername(), turnServer.getCredential()
-                                            ));
-                                        }
+                                        iceServers.add(new PeerConnection.IceServer(stunServer.getUrl()));
                                     }
                                 }
                             }
                         }
 
-                        checkCapabilities();
+                        if (signalingSettingsOverall.getOcs().getSettings().getTurnServers() != null) {
+                            List<IceServer> turnServers =
+                                signalingSettingsOverall.getOcs().getSettings().getTurnServers();
+                            for (IceServer turnServer : turnServers) {
+                                if (turnServer.getUrls() != null) {
+                                    for (String url : turnServer.getUrls()) {
+                                        iceServers.add(new PeerConnection.IceServer(
+                                            url, turnServer.getUsername(), turnServer.getCredential()
+                                        ));
+                                    }
+                                }
+                            }
+                        }
                     }
 
-                    @Override
-                    public void onError(@io.reactivex.annotations.NonNull Throwable e) {
-                        Log.e(TAG, e.getMessage(), e);
-                    }
+                    checkCapabilities();
+                }
 
-                    @Override
-                    public void onComplete() {
-                        // unused atm
-                    }
-                });
+                @Override
+                public void onError(@io.reactivex.annotations.NonNull Throwable e) {
+                    Log.e(TAG, e.getMessage(), e);
+                }
+
+                @Override
+                public void onComplete() {
+                    // unused atm
+                }
+            });
     }
 
     private void checkCapabilities() {
         ncApi.getCapabilities(credentials, ApiUtils.getUrlForCapabilities(baseUrl))
-                .retry(3)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<CapabilitiesOverall>() {
-                    @Override
-                    public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
-                        // unused atm
-                    }
+            .retry(3)
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(new Observer<CapabilitiesOverall>() {
+                @Override
+                public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
+                    // unused atm
+                }
 
-                    @Override
-                    public void onNext(@io.reactivex.annotations.NonNull CapabilitiesOverall capabilitiesOverall) {
-                        // FIXME check for compatible Call API version
-                        if (hasExternalSignalingServer) {
-                            setupAndInitiateWebSocketsConnection();
-                        } else {
-                            joinRoomAndCall();
-                        }
+                @Override
+                public void onNext(@io.reactivex.annotations.NonNull CapabilitiesOverall capabilitiesOverall) {
+                    // FIXME check for compatible Call API version
+                    if (hasExternalSignalingServer) {
+                        setupAndInitiateWebSocketsConnection();
+                    } else {
+                        joinRoomAndCall();
                     }
+                }
 
-                    @Override
-                    public void onError(@io.reactivex.annotations.NonNull Throwable e) {
-                        // unused atm
-                    }
+                @Override
+                public void onError(@io.reactivex.annotations.NonNull Throwable e) {
+                    // unused atm
+                }
 
-                    @Override
-                    public void onComplete() {
-                        // unused atm
-                    }
-                });
+                @Override
+                public void onComplete() {
+                    // unused atm
+                }
+            });
     }
 
     private void joinRoomAndCall() {
         callSession = ApplicationWideCurrentRoomHolder.getInstance().getSession();
 
-        int apiVersion = ApiUtils.getConversationApiVersion(conversationUser,  new int[] {ApiUtils.APIv4, 1});
+        int apiVersion = ApiUtils.getConversationApiVersion(conversationUser, new int[]{ApiUtils.APIv4, 1});
 
         Log.d(TAG, "joinRoomAndCall");
         Log.d(TAG, "   baseUrl= " + baseUrl);
@@ -1252,37 +1252,37 @@ public class CallActivity extends BaseActivity {
 
         if (TextUtils.isEmpty(callSession)) {
             ncApi.joinRoom(credentials, url, conversationPassword)
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .retry(3)
-                    .subscribe(new Observer<RoomOverall>() {
-                        @Override
-                        public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
-                            // unused atm
-                        }
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .retry(3)
+                .subscribe(new Observer<RoomOverall>() {
+                    @Override
+                    public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
+                        // unused atm
+                    }
 
-                        @Override
-                        public void onNext(@io.reactivex.annotations.NonNull RoomOverall roomOverall) {
-                            callSession = roomOverall.getOcs().getData().getSessionId();
-                            Log.d(TAG, " new callSession by joinRoom= " + callSession);
+                    @Override
+                    public void onNext(@io.reactivex.annotations.NonNull RoomOverall roomOverall) {
+                        callSession = roomOverall.getOcs().getData().getSessionId();
+                        Log.d(TAG, " new callSession by joinRoom= " + callSession);
 
-                            ApplicationWideCurrentRoomHolder.getInstance().setSession(callSession);
-                            ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomId(roomId);
-                            ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomToken(roomToken);
-                            ApplicationWideCurrentRoomHolder.getInstance().setUserInRoom(conversationUser);
-                            callOrJoinRoomViaWebSocket();
-                        }
+                        ApplicationWideCurrentRoomHolder.getInstance().setSession(callSession);
+                        ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomId(roomId);
+                        ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomToken(roomToken);
+                        ApplicationWideCurrentRoomHolder.getInstance().setUserInRoom(conversationUser);
+                        callOrJoinRoomViaWebSocket();
+                    }
 
-                        @Override
-                        public void onError(@io.reactivex.annotations.NonNull Throwable e) {
-                            Log.e(TAG, "joinRoom onError", e);
-                        }
+                    @Override
+                    public void onError(@io.reactivex.annotations.NonNull Throwable e) {
+                        Log.e(TAG, "joinRoom onError", e);
+                    }
 
-                        @Override
-                        public void onComplete() {
-                            Log.d(TAG, "joinRoom onComplete");
-                        }
-                    });
+                    @Override
+                    public void onComplete() {
+                        Log.d(TAG, "joinRoom onComplete");
+                    }
+                });
         } else {
             // we are in a room and start a call -> same session needs to be used
             callOrJoinRoomViaWebSocket();
@@ -1305,82 +1305,82 @@ public class CallActivity extends BaseActivity {
             inCallFlag = (int) Participant.ParticipantFlags.IN_CALL_WITH_AUDIO_AND_VIDEO.getValue();
         }
 
-        int apiVersion = ApiUtils.getCallApiVersion(conversationUser, new int[] {ApiUtils.APIv4, 1});
+        int apiVersion = ApiUtils.getCallApiVersion(conversationUser, new int[]{ApiUtils.APIv4, 1});
 
         ncApi.joinCall(credentials, ApiUtils.getUrlForCall(apiVersion, baseUrl, roomToken), inCallFlag)
-                .subscribeOn(Schedulers.io())
-                .retry(3)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<GenericOverall>() {
-                    @Override
-                    public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
-                        // unused atm
-                    }
+            .subscribeOn(Schedulers.io())
+            .retry(3)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(new Observer<GenericOverall>() {
+                @Override
+                public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
+                    // unused atm
+                }
 
-                    @Override
-                    public void onNext(@io.reactivex.annotations.NonNull GenericOverall genericOverall) {
-                        if (!currentCallStatus.equals(CallStatus.LEAVING)) {
-                            setCallState(CallStatus.JOINED);
+                @Override
+                public void onNext(@io.reactivex.annotations.NonNull GenericOverall genericOverall) {
+                    if (!currentCallStatus.equals(CallStatus.LEAVING)) {
+                        setCallState(CallStatus.JOINED);
 
-                            ApplicationWideCurrentRoomHolder.getInstance().setInCall(true);
-                            ApplicationWideCurrentRoomHolder.getInstance().setDialing(false);
+                        ApplicationWideCurrentRoomHolder.getInstance().setInCall(true);
+                        ApplicationWideCurrentRoomHolder.getInstance().setDialing(false);
 
-                            if (!TextUtils.isEmpty(roomToken)) {
-                                NotificationUtils.INSTANCE.cancelExistingNotificationsForRoom(getApplicationContext(),
-                                                                                              conversationUser,
-                                                                                              roomToken);
-                            }
+                        if (!TextUtils.isEmpty(roomToken)) {
+                            NotificationUtils.INSTANCE.cancelExistingNotificationsForRoom(getApplicationContext(),
+                                                                                          conversationUser,
+                                                                                          roomToken);
+                        }
 
-                            if (!hasExternalSignalingServer) {
-                                int apiVersion = ApiUtils.getSignalingApiVersion(conversationUser,
-                                                                                 new int[] {ApiUtils.APIv3, 2, 1});
+                        if (!hasExternalSignalingServer) {
+                            int apiVersion = ApiUtils.getSignalingApiVersion(conversationUser,
+                                                                             new int[]{ApiUtils.APIv3, 2, 1});
 
-                                ncApi.pullSignalingMessages(credentials,
-                                                            ApiUtils.getUrlForSignaling(apiVersion,
-                                                                                        baseUrl,
-                                                                                        roomToken))
-                                        .subscribeOn(Schedulers.io())
-                                        .observeOn(AndroidSchedulers.mainThread())
-                                        .repeatWhen(observable -> observable)
-                                        .takeWhile(observable -> isConnectionEstablished())
-                                        .retry(3, observable -> isConnectionEstablished())
-                                        .subscribe(new Observer<SignalingOverall>() {
-                                            @Override
-                                            public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
-                                                signalingDisposable = d;
-                                            }
+                            ncApi.pullSignalingMessages(credentials,
+                                                        ApiUtils.getUrlForSignaling(apiVersion,
+                                                                                    baseUrl,
+                                                                                    roomToken))
+                                .subscribeOn(Schedulers.io())
+                                .observeOn(AndroidSchedulers.mainThread())
+                                .repeatWhen(observable -> observable)
+                                .takeWhile(observable -> isConnectionEstablished())
+                                .retry(3, observable -> isConnectionEstablished())
+                                .subscribe(new Observer<SignalingOverall>() {
+                                    @Override
+                                    public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
+                                        signalingDisposable = d;
+                                    }
 
-                                            @Override
-                                            public void onNext(
-                                                    @io.reactivex.annotations.NonNull
-                                                            SignalingOverall signalingOverall) {
-                                                receivedSignalingMessages(signalingOverall.getOcs().getSignalings());
-                                            }
+                                    @Override
+                                    public void onNext(
+                                        @io.reactivex.annotations.NonNull
+                                            SignalingOverall signalingOverall) {
+                                        receivedSignalingMessages(signalingOverall.getOcs().getSignalings());
+                                    }
 
-                                            @Override
-                                            public void onError(@io.reactivex.annotations.NonNull Throwable e) {
-                                                dispose(signalingDisposable);
-                                            }
+                                    @Override
+                                    public void onError(@io.reactivex.annotations.NonNull Throwable e) {
+                                        dispose(signalingDisposable);
+                                    }
 
-                                            @Override
-                                            public void onComplete() {
-                                                dispose(signalingDisposable);
-                                            }
-                                        });
-                            }
+                                    @Override
+                                    public void onComplete() {
+                                        dispose(signalingDisposable);
+                                    }
+                                });
                         }
                     }
+                }
 
-                    @Override
-                    public void onError(@io.reactivex.annotations.NonNull Throwable e) {
-                        // unused atm
-                    }
+                @Override
+                public void onError(@io.reactivex.annotations.NonNull Throwable e) {
+                    // unused atm
+                }
 
-                    @Override
-                    public void onComplete() {
-                        // unused atm
-                    }
-                });
+                @Override
+                public void onComplete() {
+                    // unused atm
+                }
+            });
     }
 
     private void setupAndInitiateWebSocketsConnection() {
@@ -1390,9 +1390,9 @@ public class CallActivity extends BaseActivity {
 
         if (webSocketClient == null) {
             webSocketClient = WebSocketConnectionHelper.getExternalSignalingInstanceForServer(
-                    externalSignalingServer.getExternalSignalingServer(),
-                    conversationUser, externalSignalingServer.getExternalSignalingTicket(),
-                    TextUtils.isEmpty(credentials));
+                externalSignalingServer.getExternalSignalingServer(),
+                conversationUser, externalSignalingServer.getExternalSignalingTicket(),
+                TextUtils.isEmpty(credentials));
         } else {
             if (webSocketClient.isConnected() && currentCallStatus.equals(CallStatus.PUBLISHER_FAILED)) {
                 webSocketClient.restartWebSocket();
@@ -1432,18 +1432,18 @@ public class CallActivity extends BaseActivity {
             case "participantsUpdate":
                 if (webSocketCommunicationEvent.getHashMap().get("roomToken").equals(roomToken)) {
                     processUsersInRoom(
-                            (List<HashMap<String, Object>>) webSocketClient
-                                    .getJobWithId(
-                                            Integer.valueOf(webSocketCommunicationEvent.getHashMap().get("jobId"))));
+                        (List<HashMap<String, Object>>) webSocketClient
+                            .getJobWithId(
+                                Integer.valueOf(webSocketCommunicationEvent.getHashMap().get("jobId"))));
                 }
                 break;
             case "signalingMessage":
                 processMessage((NCSignalingMessage) webSocketClient.getJobWithId(
-                        Integer.valueOf(webSocketCommunicationEvent.getHashMap().get("jobId"))));
+                    Integer.valueOf(webSocketCommunicationEvent.getHashMap().get("jobId"))));
                 break;
             case "peerReadyForRequestingOffer":
                 webSocketClient.requestOfferForSessionIdWithType(
-                        webSocketCommunicationEvent.getHashMap().get("sessionId"), "video");
+                    webSocketCommunicationEvent.getHashMap().get("sessionId"), "video");
                 break;
         }
     }
@@ -1492,8 +1492,8 @@ public class CallActivity extends BaseActivity {
     private void processMessage(NCSignalingMessage ncSignalingMessage) {
         if (ncSignalingMessage.getRoomType().equals("video") || ncSignalingMessage.getRoomType().equals("screen")) {
             MagicPeerConnectionWrapper magicPeerConnectionWrapper =
-                    getPeerConnectionWrapperForSessionIdAndType(ncSignalingMessage.getFrom(),
-                                                                ncSignalingMessage.getRoomType(), false);
+                getPeerConnectionWrapperForSessionIdAndType(ncSignalingMessage.getFrom(),
+                                                            ncSignalingMessage.getRoomType(), false);
 
             String type = null;
             if (ncSignalingMessage.getPayload() != null && ncSignalingMessage.getPayload().getType() != null) {
@@ -1513,16 +1513,16 @@ public class CallActivity extends BaseActivity {
                         SessionDescription sessionDescriptionWithPreferredCodec;
 
                         String sessionDescriptionStringWithPreferredCodec = MagicWebRTCUtils.preferCodec
-                                (ncSignalingMessage.getPayload().getSdp(),
-                                 "H264", false);
+                            (ncSignalingMessage.getPayload().getSdp(),
+                             "H264", false);
 
                         sessionDescriptionWithPreferredCodec = new SessionDescription(
-                                SessionDescription.Type.fromCanonicalForm(type),
-                                sessionDescriptionStringWithPreferredCodec);
+                            SessionDescription.Type.fromCanonicalForm(type),
+                            sessionDescriptionStringWithPreferredCodec);
 
                         if (magicPeerConnectionWrapper.getPeerConnection() != null) {
                             magicPeerConnectionWrapper.getPeerConnection().setRemoteDescription(magicPeerConnectionWrapper
-                                                                                                        .getMagicSdpObserver(), sessionDescriptionWithPreferredCodec);
+                                                                                                    .getMagicSdpObserver(), sessionDescriptionWithPreferredCodec);
                         }
                         break;
                     case "candidate":
@@ -1600,70 +1600,70 @@ public class CallActivity extends BaseActivity {
     }
 
     private void hangupNetworkCalls(boolean shutDownView) {
-        int apiVersion = ApiUtils.getCallApiVersion(conversationUser, new int[] {ApiUtils.APIv4, 1});
+        int apiVersion = ApiUtils.getCallApiVersion(conversationUser, new int[]{ApiUtils.APIv4, 1});
 
         ncApi.leaveCall(credentials, ApiUtils.getUrlForCall(apiVersion, baseUrl, roomToken))
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<GenericOverall>() {
-                    @Override
-                    public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
-                        // unused atm
-                    }
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(new Observer<GenericOverall>() {
+                @Override
+                public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
+                    // unused atm
+                }
 
-                    @Override
-                    public void onNext(@io.reactivex.annotations.NonNull GenericOverall genericOverall) {
-                        if (shutDownView) {
-                            finish();
-                        } else if (!shutDownView &&
-                                (currentCallStatus == CallStatus.RECONNECTING ||
-                                        currentCallStatus == CallStatus.PUBLISHER_FAILED)) {
-                            initiateCall();
-                        }
+                @Override
+                public void onNext(@io.reactivex.annotations.NonNull GenericOverall genericOverall) {
+                    if (shutDownView) {
+                        finish();
+                    } else if (!shutDownView &&
+                        (currentCallStatus == CallStatus.RECONNECTING ||
+                            currentCallStatus == CallStatus.PUBLISHER_FAILED)) {
+                        initiateCall();
                     }
+                }
 
-                    @Override
-                    public void onError(@io.reactivex.annotations.NonNull Throwable e) {
-                        // unused atm
-                    }
+                @Override
+                public void onError(@io.reactivex.annotations.NonNull Throwable e) {
+                    // unused atm
+                }
 
-                    @Override
-                    public void onComplete() {
-                        // unused atm
-                    }
-                });
+                @Override
+                public void onComplete() {
+                    // unused atm
+                }
+            });
     }
 
     // TODO: why is this never called?!
     private void leaveRoom(boolean shutDownView) {
-        int apiVersion = ApiUtils.getConversationApiVersion(conversationUser, new int[] {ApiUtils.APIv4, 1});
+        int apiVersion = ApiUtils.getConversationApiVersion(conversationUser, new int[]{ApiUtils.APIv4, 1});
 
         ncApi.leaveRoom(credentials, ApiUtils.getUrlForParticipantsActive(apiVersion, baseUrl, roomToken))
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<GenericOverall>() {
-                    @Override
-                    public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
-                        // unused atm
-                    }
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(new Observer<GenericOverall>() {
+                @Override
+                public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
+                    // unused atm
+                }
 
-                    @Override
-                    public void onNext(@io.reactivex.annotations.NonNull GenericOverall genericOverall) {
-                        if (shutDownView) {
-                            finish();
-                        }
+                @Override
+                public void onNext(@io.reactivex.annotations.NonNull GenericOverall genericOverall) {
+                    if (shutDownView) {
+                        finish();
                     }
+                }
 
-                    @Override
-                    public void onError(@io.reactivex.annotations.NonNull Throwable e) {
-                        // unused atm
-                    }
+                @Override
+                public void onError(@io.reactivex.annotations.NonNull Throwable e) {
+                    // unused atm
+                }
 
-                    @Override
-                    public void onComplete() {
-                        // unused atm
-                    }
-                });
+                @Override
+                public void onComplete() {
+                    // unused atm
+                }
+            });
     }
 
     private void startVideoCapture() {
@@ -1742,34 +1742,34 @@ public class CallActivity extends BaseActivity {
 
     private void getPeersForCall() {
         Log.d(TAG, "getPeersForCall");
-        int apiVersion = ApiUtils.getCallApiVersion(conversationUser, new int[] {ApiUtils.APIv4, 1});
+        int apiVersion = ApiUtils.getCallApiVersion(conversationUser, new int[]{ApiUtils.APIv4, 1});
 
         ncApi.getPeersForCall(credentials, ApiUtils.getUrlForCall(apiVersion, baseUrl, roomToken))
-                .subscribeOn(Schedulers.io())
-                .subscribe(new Observer<ParticipantsOverall>() {
-                    @Override
-                    public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
-                        // unused atm
-                    }
+            .subscribeOn(Schedulers.io())
+            .subscribe(new Observer<ParticipantsOverall>() {
+                @Override
+                public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
+                    // unused atm
+                }
 
-                    @Override
-                    public void onNext(@io.reactivex.annotations.NonNull ParticipantsOverall participantsOverall) {
-                        participantMap = new HashMap<>();
-                        for (Participant participant : participantsOverall.getOcs().getData()) {
-                            participantMap.put(participant.getSessionId(), participant);
-                        }
+                @Override
+                public void onNext(@io.reactivex.annotations.NonNull ParticipantsOverall participantsOverall) {
+                    participantMap = new HashMap<>();
+                    for (Participant participant : participantsOverall.getOcs().getData()) {
+                        participantMap.put(participant.getSessionId(), participant);
                     }
+                }
 
-                    @Override
-                    public void onError(@io.reactivex.annotations.NonNull Throwable e) {
-                        Log.e(TAG, "error while executing getPeersForCall", e);
-                    }
+                @Override
+                public void onError(@io.reactivex.annotations.NonNull Throwable e) {
+                    Log.e(TAG, "error while executing getPeersForCall", e);
+                }
 
-                    @Override
-                    public void onComplete() {
-                        // unused atm
-                    }
-                });
+                @Override
+                public void onComplete() {
+                    // unused atm
+                }
+            });
     }
 
     private void deleteMagicPeerConnection(MagicPeerConnectionWrapper magicPeerConnectionWrapper) {
@@ -1931,19 +1931,19 @@ public class CallActivity extends BaseActivity {
         String sessionId = peerConnectionEvent.getSessionId();
 
         if (peerConnectionEvent.getPeerConnectionEventType().equals(PeerConnectionEvent.PeerConnectionEventType
-                                                                            .PEER_CLOSED)) {
+                                                                        .PEER_CLOSED)) {
             endPeerConnection(sessionId, peerConnectionEvent.getVideoStreamType().equals("screen"));
         } else if (peerConnectionEvent.getPeerConnectionEventType().equals(PeerConnectionEvent
-                                                                                   .PeerConnectionEventType.SENSOR_FAR) ||
-                peerConnectionEvent.getPeerConnectionEventType().equals(PeerConnectionEvent
-                                                                                .PeerConnectionEventType.SENSOR_NEAR)) {
+                                                                               .PeerConnectionEventType.SENSOR_FAR) ||
+            peerConnectionEvent.getPeerConnectionEventType().equals(PeerConnectionEvent
+                                                                        .PeerConnectionEventType.SENSOR_NEAR)) {
 
             if (!isVoiceOnlyCall) {
                 boolean enableVideo = peerConnectionEvent.getPeerConnectionEventType().equals(PeerConnectionEvent
-                                                                                                      .PeerConnectionEventType.SENSOR_FAR) && videoOn;
+                                                                                                  .PeerConnectionEventType.SENSOR_FAR) && videoOn;
                 if (EffortlessPermissions.hasPermissions(this, PERMISSIONS_CAMERA) &&
-                        (currentCallStatus.equals(CallStatus.CONNECTING) || isConnectionEstablished()) && videoOn
-                        && enableVideo != localVideoTrack.enabled()) {
+                    (currentCallStatus.equals(CallStatus.CONNECTING) || isConnectionEstablished()) && videoOn
+                    && enableVideo != localVideoTrack.enabled()) {
                     toggleMedia(enableVideo, true);
                 }
             }
@@ -1984,30 +1984,30 @@ public class CallActivity extends BaseActivity {
             if (magicPeerConnectionWrapperList.get(i).isMCUPublisher()) {
                 magicPeerConnectionWrapper = magicPeerConnectionWrapperList.get(i);
                 Observable
-                        .interval(1, TimeUnit.SECONDS)
-                        .repeatUntil(() -> (!isConnectionEstablished() || isDestroyed()))
-                        .observeOn(Schedulers.io())
-                        .subscribe(new Observer<Long>() {
-                            @Override
-                            public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
-                                // unused atm
-                            }
+                    .interval(1, TimeUnit.SECONDS)
+                    .repeatUntil(() -> (!isConnectionEstablished() || isDestroyed()))
+                    .observeOn(Schedulers.io())
+                    .subscribe(new Observer<Long>() {
+                        @Override
+                        public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
+                            // unused atm
+                        }
 
-                            @Override
-                            public void onNext(@io.reactivex.annotations.NonNull Long aLong) {
-                                magicPeerConnectionWrapper.sendNickChannelData(dataChannelMessage);
-                            }
+                        @Override
+                        public void onNext(@io.reactivex.annotations.NonNull Long aLong) {
+                            magicPeerConnectionWrapper.sendNickChannelData(dataChannelMessage);
+                        }
 
-                            @Override
-                            public void onError(@io.reactivex.annotations.NonNull Throwable e) {
-                                // unused atm
-                            }
+                        @Override
+                        public void onError(@io.reactivex.annotations.NonNull Throwable e) {
+                            // unused atm
+                        }
 
-                            @Override
-                            public void onComplete() {
-                                // unused atm
-                            }
-                        });
+                        @Override
+                        public void onComplete() {
+                            // unused atm
+                        }
+                    });
                 break;
             }
 
@@ -2018,19 +2018,19 @@ public class CallActivity extends BaseActivity {
     public void onMessageEvent(MediaStreamEvent mediaStreamEvent) {
         if (mediaStreamEvent.getMediaStream() != null) {
             boolean hasAtLeastOneVideoStream = mediaStreamEvent.getMediaStream().videoTracks != null
-                    && mediaStreamEvent.getMediaStream().videoTracks.size() > 0;
+                && mediaStreamEvent.getMediaStream().videoTracks.size() > 0;
 
             setupVideoStreamForLayout(
-                    mediaStreamEvent.getMediaStream(),
-                    mediaStreamEvent.getSession(),
-                    hasAtLeastOneVideoStream,
-                    mediaStreamEvent.getVideoStreamType());
+                mediaStreamEvent.getMediaStream(),
+                mediaStreamEvent.getSession(),
+                hasAtLeastOneVideoStream,
+                mediaStreamEvent.getVideoStreamType());
         } else {
             setupVideoStreamForLayout(
-                    null,
-                    mediaStreamEvent.getSession(),
-                    false,
-                    mediaStreamEvent.getVideoStreamType());
+                null,
+                mediaStreamEvent.getSession(),
+                false,
+                mediaStreamEvent.getVideoStreamType());
         }
     }
 
@@ -2062,46 +2062,46 @@ public class CallActivity extends BaseActivity {
         if (!hasExternalSignalingServer) {
             StringBuilder stringBuilder = new StringBuilder();
             stringBuilder.append("{")
-                    .append("\"fn\":\"")
-                    .append(StringEscapeUtils.escapeJson(LoganSquare.serialize(ncMessageWrapper.getSignalingMessage()))).append("\"")
-                    .append(",")
-                    .append("\"sessionId\":")
-                    .append("\"").append(StringEscapeUtils.escapeJson(callSession)).append("\"")
-                    .append(",")
-                    .append("\"ev\":\"message\"")
-                    .append("}");
+                .append("\"fn\":\"")
+                .append(StringEscapeUtils.escapeJson(LoganSquare.serialize(ncMessageWrapper.getSignalingMessage()))).append("\"")
+                .append(",")
+                .append("\"sessionId\":")
+                .append("\"").append(StringEscapeUtils.escapeJson(callSession)).append("\"")
+                .append(",")
+                .append("\"ev\":\"message\"")
+                .append("}");
 
             List<String> strings = new ArrayList<>();
             String stringToSend = stringBuilder.toString();
             strings.add(stringToSend);
 
-            int apiVersion = ApiUtils.getSignalingApiVersion(conversationUser, new int[] {ApiUtils.APIv3, 2, 1});
+            int apiVersion = ApiUtils.getSignalingApiVersion(conversationUser, new int[]{ApiUtils.APIv3, 2, 1});
 
             ncApi.sendSignalingMessages(credentials, ApiUtils.getUrlForSignaling(apiVersion, baseUrl, roomToken),
                                         strings.toString())
-                    .retry(3)
-                    .subscribeOn(Schedulers.io())
-                    .subscribe(new Observer<SignalingOverall>() {
-                        @Override
-                        public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
-                            // unused atm
-                        }
+                .retry(3)
+                .subscribeOn(Schedulers.io())
+                .subscribe(new Observer<SignalingOverall>() {
+                    @Override
+                    public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
+                        // unused atm
+                    }
 
-                        @Override
-                        public void onNext(@io.reactivex.annotations.NonNull SignalingOverall signalingOverall) {
-                            receivedSignalingMessages(signalingOverall.getOcs().getSignalings());
-                        }
+                    @Override
+                    public void onNext(@io.reactivex.annotations.NonNull SignalingOverall signalingOverall) {
+                        receivedSignalingMessages(signalingOverall.getOcs().getSignalings());
+                    }
 
-                        @Override
-                        public void onError(@io.reactivex.annotations.NonNull Throwable e) {
-                            Log.e(TAG, "", e);
-                        }
+                    @Override
+                    public void onError(@io.reactivex.annotations.NonNull Throwable e) {
+                        Log.e(TAG, "", e);
+                    }
 
-                        @Override
-                        public void onComplete() {
-                            // unused atm
-                        }
-                    });
+                    @Override
+                    public void onComplete() {
+                        // unused atm
+                    }
+                });
         } else {
             webSocketClient.sendCallMessage(ncMessageWrapper);
         }
@@ -2376,10 +2376,10 @@ public class CallActivity extends BaseActivity {
         Uri ringtoneUri;
         if (isIncomingCallFromNotification) {
             ringtoneUri = Uri.parse("android.resource://" + getApplicationContext().getPackageName() +
-                                            "/raw/librem_by_feandesign_call");
+                                        "/raw/librem_by_feandesign_call");
         } else {
             ringtoneUri = Uri.parse("android.resource://" + getApplicationContext().getPackageName() + "/raw" +
-                                            "/tr110_1_kap8_3_freiton1");
+                                        "/tr110_1_kap8_3_freiton1");
         }
 
         mediaPlayer = new MediaPlayer();
@@ -2387,9 +2387,9 @@ public class CallActivity extends BaseActivity {
             mediaPlayer.setDataSource(this, ringtoneUri);
             mediaPlayer.setLooping(true);
             AudioAttributes audioAttributes = new AudioAttributes.Builder().setContentType(
-                    AudioAttributes.CONTENT_TYPE_SONIFICATION)
-                    .setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION)
-                    .build();
+                AudioAttributes.CONTENT_TYPE_SONIFICATION)
+                .setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION)
+                .build();
             mediaPlayer.setAudioAttributes(audioAttributes);
 
             mediaPlayer.setOnPreparedListener(mp -> mediaPlayer.start());
@@ -2432,12 +2432,12 @@ public class CallActivity extends BaseActivity {
     @Subscribe(threadMode = ThreadMode.BACKGROUND)
     public void onMessageEvent(NetworkEvent networkEvent) {
         if (networkEvent.getNetworkConnectionEvent()
-                .equals(NetworkEvent.NetworkConnectionEvent.NETWORK_CONNECTED)) {
+            .equals(NetworkEvent.NetworkConnectionEvent.NETWORK_CONNECTED)) {
             if (handler != null) {
                 handler.removeCallbacksAndMessages(null);
             }
         } else if (networkEvent.getNetworkConnectionEvent()
-                .equals(NetworkEvent.NetworkConnectionEvent.NETWORK_DISCONNECTED)) {
+            .equals(NetworkEvent.NetworkConnectionEvent.NETWORK_DISCONNECTED)) {
             if (handler != null) {
                 handler.removeCallbacksAndMessages(null);
             }
@@ -2527,10 +2527,10 @@ public class CallActivity extends BaseActivity {
         }
     }
 
-    public void updateUiForPipMode(){
+    public void updateUiForPipMode() {
         RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
                                                                              ViewGroup.LayoutParams.WRAP_CONTENT);
-        params.setMargins(0,0,0, 0);
+        params.setMargins(0, 0, 0, 0);
         binding.gridview.setLayoutParams(params);
 
 
@@ -2539,7 +2539,7 @@ public class CallActivity extends BaseActivity {
         binding.selfVideoViewWrapper.setVisibility(View.GONE);
         binding.callStates.callStateRelativeLayout.setVisibility(View.GONE);
 
-        if (participantDisplayItems.size() > 1){
+        if (participantDisplayItems.size() > 1) {
             binding.pipCallConversationNameTextView.setText(conversationName);
             binding.pipGroupCallOverlay.setVisibility(View.VISIBLE);
         } else {
@@ -2549,7 +2549,7 @@ public class CallActivity extends BaseActivity {
         binding.selfVideoRenderer.release();
     }
 
-    public void updateUiForNormalMode(){
+    public void updateUiForNormalMode() {
         if (isVoiceOnlyCall) {
             binding.callControls.setVisibility(View.VISIBLE);
         } else {

From b3f8a36c627f7a93590a358eef1ddee5edf0e102 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Tue, 2 Nov 2021 15:46:36 +0100
Subject: [PATCH 33/50] load avatar again in CallNotificationActivity

was only disabled for debugging. still needs to be fixed with https://github.com/nextcloud/talk-android/issues/1234

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../nextcloud/talk/activities/CallNotificationActivity.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
index a9e9245e3..e1a52d962 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
@@ -331,8 +331,7 @@ public class CallNotificationActivity extends BaseActivity {
     private void setUpAfterConversationIsKnown() {
         binding.conversationNameTextView.setText(currentConversation.getDisplayName());
 
-        // TODO: load avatar, but don't block UI!
-//        loadAvatar();
+        loadAvatar();
         checkIfAnyParticipantsRemainInRoom();
         showAnswerControls();
     }

From b822eb8417a828770a27528df7fc56af3572eacb Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Tue, 2 Nov 2021 15:47:25 +0100
Subject: [PATCH 34/50] reformat code in CallNotificationActivity

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../activities/CallNotificationActivity.java  | 184 +++++++++---------
 1 file changed, 92 insertions(+), 92 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
index e1a52d962..150a054ae 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
@@ -224,108 +224,108 @@ public class CallNotificationActivity extends BaseActivity {
     }
 
     private void checkIfAnyParticipantsRemainInRoom() {
-        int apiVersion = ApiUtils.getCallApiVersion(userBeingCalled, new int[] {ApiUtils.APIv4, 1});
+        int apiVersion = ApiUtils.getCallApiVersion(userBeingCalled, new int[]{ApiUtils.APIv4, 1});
 
         ncApi.getPeersForCall(credentials, ApiUtils.getUrlForCall(apiVersion, userBeingCalled.getBaseUrl(),
                                                                   currentConversation.getToken()))
-                .subscribeOn(Schedulers.io())
-                .takeWhile(observable -> !leavingScreen)
-                .subscribe(new Observer<ParticipantsOverall>() {
-                    @Override
-                    public void onSubscribe(Disposable d) {
-                        disposablesList.add(d);
-                    }
+            .subscribeOn(Schedulers.io())
+            .takeWhile(observable -> !leavingScreen)
+            .subscribe(new Observer<ParticipantsOverall>() {
+                @Override
+                public void onSubscribe(Disposable d) {
+                    disposablesList.add(d);
+                }
 
-                    @Override
-                    public void onNext(ParticipantsOverall participantsOverall) {
-                        boolean hasParticipantsInCall = false;
-                        boolean inCallOnDifferentDevice = false;
-                        List<Participant> participantList = participantsOverall.getOcs().getData();
-                        hasParticipantsInCall = participantList.size() > 0;
+                @Override
+                public void onNext(ParticipantsOverall participantsOverall) {
+                    boolean hasParticipantsInCall = false;
+                    boolean inCallOnDifferentDevice = false;
+                    List<Participant> participantList = participantsOverall.getOcs().getData();
+                    hasParticipantsInCall = participantList.size() > 0;
 
-                        if (hasParticipantsInCall) {
-                            for (Participant participant : participantList) {
-                                if (participant.getActorType() == Participant.ActorType.USERS &&
-                                        participant.getActorId().equals(userBeingCalled.getUserId())) {
-                                    inCallOnDifferentDevice = true;
-                                    break;
-                                }
+                    if (hasParticipantsInCall) {
+                        for (Participant participant : participantList) {
+                            if (participant.getActorType() == Participant.ActorType.USERS &&
+                                participant.getActorId().equals(userBeingCalled.getUserId())) {
+                                inCallOnDifferentDevice = true;
+                                break;
                             }
                         }
-
-                        if (!hasParticipantsInCall || inCallOnDifferentDevice) {
-                            runOnUiThread(() -> hangup());
-                        }
                     }
 
-                    @Override
-                    public void onError(Throwable e) {
-
+                    if (!hasParticipantsInCall || inCallOnDifferentDevice) {
+                        runOnUiThread(() -> hangup());
                     }
+                }
 
-                    @Override
-                    public void onComplete() {
-                        if (!leavingScreen) {
-                            handler.postDelayed(() -> checkIfAnyParticipantsRemainInRoom(), 5000);
-                        }
+                @Override
+                public void onError(Throwable e) {
+
+                }
+
+                @Override
+                public void onComplete() {
+                    if (!leavingScreen) {
+                        handler.postDelayed(() -> checkIfAnyParticipantsRemainInRoom(), 5000);
                     }
-                });
+                }
+            });
 
     }
 
     private void handleFromNotification() {
-        int apiVersion = ApiUtils.getConversationApiVersion(userBeingCalled, new int[] {ApiUtils.APIv4,
-                ApiUtils.APIv3, 1});
+        int apiVersion = ApiUtils.getConversationApiVersion(userBeingCalled, new int[]{ApiUtils.APIv4,
+            ApiUtils.APIv3, 1});
 
         ncApi.getRoom(credentials, ApiUtils.getUrlForRoom(apiVersion, userBeingCalled.getBaseUrl(), roomId))
-                .subscribeOn(Schedulers.io())
-                .retry(3)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<RoomOverall>() {
-                    @Override
-                    public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
-                        disposablesList.add(d);
-                    }
+            .subscribeOn(Schedulers.io())
+            .retry(3)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(new Observer<RoomOverall>() {
+                @Override
+                public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
+                    disposablesList.add(d);
+                }
 
-                    @Override
-                    public void onNext(@io.reactivex.annotations.NonNull RoomOverall roomOverall) {
-                        currentConversation = roomOverall.getOcs().data;
-                        setUpAfterConversationIsKnown();
+                @Override
+                public void onNext(@io.reactivex.annotations.NonNull RoomOverall roomOverall) {
+                    currentConversation = roomOverall.getOcs().data;
+                    setUpAfterConversationIsKnown();
 
-                        if (apiVersion >= 3) {
-                            boolean hasCallFlags =
-                                    CapabilitiesUtil.hasSpreedFeatureCapability(userBeingCalled,
-                                                                                "conversation-call-flags");
-                            if (hasCallFlags) {
-                                if (isInCallWithVideo(currentConversation.callFlag)) {
-                                    binding.incomingCallVoiceOrVideoTextView.setText(
-                                            String.format(getResources().getString(R.string.nc_call_video),
-                                                          getResources().getString(R.string.nc_app_product_name)));
-                                } else {
-                                    binding.incomingCallVoiceOrVideoTextView.setText(
-                                            String.format(getResources().getString(R.string.nc_call_voice),
-                                                          getResources().getString(R.string.nc_app_product_name)));
-                                }
+                    if (apiVersion >= 3) {
+                        boolean hasCallFlags =
+                            CapabilitiesUtil.hasSpreedFeatureCapability(userBeingCalled,
+                                                                        "conversation-call-flags");
+                        if (hasCallFlags) {
+                            if (isInCallWithVideo(currentConversation.callFlag)) {
+                                binding.incomingCallVoiceOrVideoTextView.setText(
+                                    String.format(getResources().getString(R.string.nc_call_video),
+                                                  getResources().getString(R.string.nc_app_product_name)));
+                            } else {
+                                binding.incomingCallVoiceOrVideoTextView.setText(
+                                    String.format(getResources().getString(R.string.nc_call_voice),
+                                                  getResources().getString(R.string.nc_app_product_name)));
                             }
                         }
                     }
+                }
 
-                    @SuppressLint("LongLogTag")
-                    @Override
-                    public void onError(@io.reactivex.annotations.NonNull Throwable e) {
-                        Log.e(TAG, e.getMessage(), e);
-                    }
+                @SuppressLint("LongLogTag")
+                @Override
+                public void onError(@io.reactivex.annotations.NonNull Throwable e) {
+                    Log.e(TAG, e.getMessage(), e);
+                }
 
-                    @Override
-                    public void onComplete() {
+                @Override
+                public void onComplete() {
 
-                    }
-                });
+                }
+            });
     }
 
     private boolean isInCallWithVideo(int callFlag) {
         return (Participant.ParticipantFlags.IN_CALL_WITH_VIDEO.getValue() == callFlag
-                || Participant.ParticipantFlags.IN_CALL_WITH_AUDIO_AND_VIDEO.getValue() == callFlag);
+            || Participant.ParticipantFlags.IN_CALL_WITH_AUDIO_AND_VIDEO.getValue() == callFlag);
     }
 
     private void setUpAfterConversationIsKnown() {
@@ -353,11 +353,11 @@ public class CallNotificationActivity extends BaseActivity {
                 binding.avatarImageView.setVisibility(View.VISIBLE);
 
                 ImageRequest imageRequest =
-                        DisplayUtils.getImageRequestForUrl(
-                                ApiUtils.getUrlForAvatarWithName(userBeingCalled.getBaseUrl(),
-                                                                 currentConversation.getName(),
-                                                                 R.dimen.avatar_size_very_big),
-                                null);
+                    DisplayUtils.getImageRequestForUrl(
+                        ApiUtils.getUrlForAvatarWithName(userBeingCalled.getBaseUrl(),
+                                                         currentConversation.getName(),
+                                                         R.dimen.avatar_size_very_big),
+                        null);
 
                 ImagePipeline imagePipeline = Fresco.getImagePipeline();
                 DataSource<CloseableReference<CloseableImage>> dataSource = imagePipeline.fetchDecodedImage(imageRequest, null);
@@ -366,18 +366,18 @@ public class CallNotificationActivity extends BaseActivity {
                     @Override
                     protected void onNewResultImpl(@Nullable Bitmap bitmap) {
                         binding.avatarImageView.getHierarchy().setImage(new BitmapDrawable(bitmap), 100,
-                                                                true);
+                                                                        true);
                         if (getResources() != null) {
                             binding.incomingCallRelativeLayout.setBackground(
-                                    getResources().getDrawable(R.drawable.incoming_gradient));
+                                getResources().getDrawable(R.drawable.incoming_gradient));
                         }
 
                         if (AvatarStatusCodeHolder.getInstance().getStatusCode() == 200 ||
-                                AvatarStatusCodeHolder.getInstance().getStatusCode() == 0) {
+                            AvatarStatusCodeHolder.getInstance().getStatusCode() == 0) {
 
-                                Bitmap backgroundBitmap = bitmap.copy(bitmap.getConfig(), true);
-                                new BlurPostProcessor(5, context).process(backgroundBitmap);
-                                binding.backgroundImageView.setImageDrawable(new BitmapDrawable(backgroundBitmap));
+                            Bitmap backgroundBitmap = bitmap.copy(bitmap.getConfig(), true);
+                            new BlurPostProcessor(5, context).process(backgroundBitmap);
+                            binding.backgroundImageView.setImageDrawable(new BitmapDrawable(backgroundBitmap));
 
                         } else if (AvatarStatusCodeHolder.getInstance().getStatusCode() == 201) {
                             ColorArt colorArt = new ColorArt(bitmap);
@@ -450,16 +450,16 @@ public class CallNotificationActivity extends BaseActivity {
         if (TextUtils.isEmpty(callRingtonePreferenceString)) {
             // play default sound
             ringtoneUri = Uri.parse("android.resource://" + getApplicationContext().getPackageName() +
-                                            "/raw/librem_by_feandesign_call");
+                                        "/raw/librem_by_feandesign_call");
         } else {
             try {
                 RingtoneSettings ringtoneSettings = LoganSquare.parse(
-                        callRingtonePreferenceString, RingtoneSettings.class);
+                    callRingtonePreferenceString, RingtoneSettings.class);
                 ringtoneUri = ringtoneSettings.getRingtoneUri();
             } catch (IOException e) {
                 Log.e(TAG, "Failed to parse ringtone settings");
                 ringtoneUri = Uri.parse("android.resource://" + getApplicationContext().getPackageName() +
-                                                "/raw/librem_by_feandesign_call");
+                                            "/raw/librem_by_feandesign_call");
             }
         }
 
@@ -470,10 +470,10 @@ public class CallNotificationActivity extends BaseActivity {
 
                 mediaPlayer.setLooping(true);
                 AudioAttributes audioAttributes = new AudioAttributes
-                        .Builder()
-                        .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
-                        .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
-                        .build();
+                    .Builder()
+                    .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+                    .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
+                    .build();
                 mediaPlayer.setAudioAttributes(audioAttributes);
 
                 mediaPlayer.setOnPreparedListener(mp -> mediaPlayer.start());
@@ -521,12 +521,12 @@ public class CallNotificationActivity extends BaseActivity {
         }
     }
 
-    public void updateUiForPipMode(){
+    public void updateUiForPipMode() {
         binding.callAnswerButtons.setVisibility(View.INVISIBLE);
         binding.incomingCallRelativeLayout.setVisibility(View.INVISIBLE);
     }
 
-    public void updateUiForNormalMode(){
+    public void updateUiForNormalMode() {
         binding.callAnswerButtons.setVisibility(View.VISIBLE);
         binding.incomingCallRelativeLayout.setVisibility(View.VISIBLE);
     }

From 052dc588aadb1a6e5092859a09e3b6f606c11fdb Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Tue, 2 Nov 2021 15:54:23 +0100
Subject: [PATCH 35/50] remove comment

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../java/com/nextcloud/talk/activities/MainActivity.kt     | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
index 88b043616..11498816f 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
@@ -309,13 +309,6 @@ class MainActivity : BaseActivity(), ActionBarProvider {
         handleActionFromContact(intent)
         if (intent.hasExtra(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL)) {
             if (intent.getBooleanExtra(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL, false)) {
-
-                // router!!.pushController(
-                //     RouterTransaction.with(CallNotificationController(intent.extras))
-                //         .pushChangeHandler(HorizontalChangeHandler())
-                //         .popChangeHandler(HorizontalChangeHandler())
-                // )
-
                 val callNotificationIntent = Intent(this, CallNotificationActivity::class.java)
                 intent.extras?.let { callNotificationIntent.putExtras(it) }
                 startActivity(callNotificationIntent)

From 63593df03e0881bf0fb2dd9f5e52ea7de6cda7de Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Thu, 4 Nov 2021 09:57:27 +0100
Subject: [PATCH 36/50] hide peer name when in pip mode

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../talk/activities/CallActivity.java         |  2 +-
 .../talk/adapters/ParticipantsAdapter.java    | 26 ++++++-------------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
index e769fa36c..00c853492 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -256,7 +256,7 @@ public class CallActivity extends BaseActivity {
     private Map<String, ParticipantDisplayItem> participantDisplayItems;
     private ParticipantsAdapter participantsAdapter;
 
-    private Boolean isInPipMode = false;
+    public Boolean isInPipMode = false;
 
     private CallActivityBinding binding;
 
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/ParticipantsAdapter.java b/app/src/main/java/com/nextcloud/talk/adapters/ParticipantsAdapter.java
index 493a17cbc..9a383552a 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/ParticipantsAdapter.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/ParticipantsAdapter.java
@@ -15,6 +15,7 @@ import com.facebook.drawee.backends.pipeline.Fresco;
 import com.facebook.drawee.interfaces.DraweeController;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.nextcloud.talk.R;
+import com.nextcloud.talk.activities.CallActivity;
 import com.nextcloud.talk.utils.DisplayUtils;
 
 import org.webrtc.MediaStream;
@@ -98,7 +99,6 @@ public class ParticipantsAdapter extends BaseAdapter {
         layoutParams.height = scaleGridViewItemHeight();
         convertView.setLayoutParams(layoutParams);
 
-
         TextView nickTextView = convertView.findViewById(R.id.peer_nick_text_view);
         SimpleDraweeView imageView = convertView.findViewById(R.id.avatarImageView);
 
@@ -112,8 +112,13 @@ public class ParticipantsAdapter extends BaseAdapter {
         } else {
             imageView.setVisibility(View.VISIBLE);
             surfaceViewRenderer.setVisibility(View.INVISIBLE);
-            nickTextView.setVisibility(View.VISIBLE);
-            nickTextView.setText(participantDisplayItem.getNick());
+
+            if (((CallActivity) mContext).isInPipMode) {
+                nickTextView.setVisibility(View.GONE);
+            } else {
+                nickTextView.setVisibility(View.VISIBLE);
+                nickTextView.setText(participantDisplayItem.getNick());
+            }
 
             imageView.setController(null);
             DraweeController draweeController = Fresco.newDraweeControllerBuilder()
@@ -130,21 +135,6 @@ public class ParticipantsAdapter extends BaseAdapter {
             audioOffView.setVisibility(View.INVISIBLE);
         }
 
-
-        convertView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
-
-            @Override
-            public void onViewAttachedToWindow(View v) {
-                Log.d(TAG,"onViewAttachedToWindow");
-            }
-
-            @Override
-            public void onViewDetachedFromWindow(View v) {
-                Log.d(TAG,"onViewDetachedFromWindow");
-            }
-        });
-
-
         return convertView;
 
     }

From 289bd2fa0086f63a3ac145dd1c88abf01256c85b Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Thu, 4 Nov 2021 10:41:37 +0100
Subject: [PATCH 37/50] fix klint error

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
index 11498816f..de8dbf73b 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
@@ -312,7 +312,6 @@ class MainActivity : BaseActivity(), ActionBarProvider {
                 val callNotificationIntent = Intent(this, CallNotificationActivity::class.java)
                 intent.extras?.let { callNotificationIntent.putExtras(it) }
                 startActivity(callNotificationIntent)
-
             } else {
                 ConductorRemapping.remapChatController(
                     router!!, intent.getLongExtra(BundleKeys.KEY_INTERNAL_USER_ID, -1),

From 43b54e015fdd7671597464b9ef91228e62d6a040 Mon Sep 17 00:00:00 2001
From: drone <drone@nextcloud.com>
Date: Thu, 4 Nov 2021 13:13:21 +0000
Subject: [PATCH 38/50] Drone: update Lint results to reflect reduced
 error/warning count [skip ci]

Signed-off-by: drone <drone@nextcloud.com>
---
 scripts/analysis/lint-results.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt
index b9a60ede1..920b4bab3 100644
--- a/scripts/analysis/lint-results.txt
+++ b/scripts/analysis/lint-results.txt
@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 1 error and 269 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 1 error and 239 warnings</span>

From f9a28cb0aa4a1c7da3baa7eb8bb1c709af205278 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Mon, 8 Nov 2021 16:14:01 +0100
Subject: [PATCH 39/50] fix to hide selfVideo when pip-view is tapped

on some devices (reproduced with Pixel2 on api level30) the own video became visible when the pip view was tapped. This fix should hide the own video.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../talk/activities/CallActivity.java         | 62 +++++++++++--------
 1 file changed, 36 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
index 00c853492..a0a2ad124 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -269,6 +269,7 @@ public class CallActivity extends BaseActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        Log.d(TAG, "onCreate");
 
         NextcloudTalkApplication.Companion.getSharedApplication().getComponentApplication().inject(this);
 
@@ -511,6 +512,7 @@ public class CallActivity extends BaseActivity {
 
     @SuppressLint("ClickableViewAccessibility")
     private void initViews() {
+        Log.d(TAG, "initViews");
         binding.callInfosLinearLayout.setVisibility(View.VISIBLE);
         binding.selfVideoViewWrapper.setVisibility(View.VISIBLE);
 
@@ -574,6 +576,7 @@ public class CallActivity extends BaseActivity {
     }
 
     private void initGridAdapter() {
+        Log.d(TAG, "initGridAdapter");
         int columns;
         int participantsInGrid = participantDisplayItems.size();
         if (getResources() != null && getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
@@ -1894,36 +1897,39 @@ public class CallActivity extends BaseActivity {
     }
 
     private void updateSelfVideoViewPosition() {
-        FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) binding.selfVideoRenderer.getLayoutParams();
+        Log.d(TAG, "updateSelfVideoViewPosition");
+        if (!isInPipMode) {
+            FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) binding.selfVideoRenderer.getLayoutParams();
 
-        DisplayMetrics displayMetrics = getApplicationContext().getResources().getDisplayMetrics();
-        int screenWidthPx = displayMetrics.widthPixels;
+            DisplayMetrics displayMetrics = getApplicationContext().getResources().getDisplayMetrics();
+            int screenWidthPx = displayMetrics.widthPixels;
 
-        int screenWidthDp = (int) DisplayUtils.convertPixelToDp(screenWidthPx, getApplicationContext());
+            int screenWidthDp = (int) DisplayUtils.convertPixelToDp(screenWidthPx, getApplicationContext());
 
-        float newXafterRotate = 0;
-        float newYafterRotate;
-        if (binding.callInfosLinearLayout.getVisibility() == View.VISIBLE) {
-            newYafterRotate = 250;
-        } else {
-            newYafterRotate = 20;
+            float newXafterRotate = 0;
+            float newYafterRotate;
+            if (binding.callInfosLinearLayout.getVisibility() == View.VISIBLE) {
+                newYafterRotate = 250;
+            } else {
+                newYafterRotate = 20;
+            }
+
+            if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
+                layoutParams.height = (int) getResources().getDimension(R.dimen.large_preview_dimension);
+                layoutParams.width = FrameLayout.LayoutParams.WRAP_CONTENT;
+                newXafterRotate = (float) (screenWidthDp - getResources().getDimension(R.dimen.large_preview_dimension) * 0.8);
+
+            } else if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
+                layoutParams.height = FrameLayout.LayoutParams.WRAP_CONTENT;
+                layoutParams.width = (int) getResources().getDimension(R.dimen.large_preview_dimension);
+                newXafterRotate = (float) (screenWidthDp - getResources().getDimension(R.dimen.large_preview_dimension) * 0.5);
+            }
+            binding.selfVideoRenderer.setLayoutParams(layoutParams);
+
+            int newXafterRotatePx = (int) DisplayUtils.convertDpToPixel(newXafterRotate, getApplicationContext());
+            binding.selfVideoViewWrapper.setY(newYafterRotate);
+            binding.selfVideoViewWrapper.setX(newXafterRotatePx);
         }
-
-        if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
-            layoutParams.height = (int) getResources().getDimension(R.dimen.large_preview_dimension);
-            layoutParams.width = FrameLayout.LayoutParams.WRAP_CONTENT;
-            newXafterRotate = (float) (screenWidthDp - getResources().getDimension(R.dimen.large_preview_dimension) * 0.8);
-
-        } else if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
-            layoutParams.height = FrameLayout.LayoutParams.WRAP_CONTENT;
-            layoutParams.width = (int) getResources().getDimension(R.dimen.large_preview_dimension);
-            newXafterRotate = (float) (screenWidthDp - getResources().getDimension(R.dimen.large_preview_dimension) * 0.5);
-        }
-        binding.selfVideoRenderer.setLayoutParams(layoutParams);
-
-        int newXafterRotatePx = (int) DisplayUtils.convertDpToPixel(newXafterRotate, getApplicationContext());
-        binding.selfVideoViewWrapper.setY(newYafterRotate);
-        binding.selfVideoViewWrapper.setX(newXafterRotatePx);
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
@@ -2474,6 +2480,8 @@ public class CallActivity extends BaseActivity {
     @Override
     public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode, Configuration newConfig) {
         super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig);
+        Log.d(TAG, "onPictureInPictureModeChanged");
+        Log.d(TAG, "isInPictureInPictureMode= " + isInPictureInPictureMode);
         isInPipMode = isInPictureInPictureMode;
         if (isInPictureInPictureMode) {
             mReceiver =
@@ -2528,6 +2536,7 @@ public class CallActivity extends BaseActivity {
     }
 
     public void updateUiForPipMode() {
+        Log.d(TAG, "updateUiForPipMode");
         RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
                                                                              ViewGroup.LayoutParams.WRAP_CONTENT);
         params.setMargins(0, 0, 0, 0);
@@ -2550,6 +2559,7 @@ public class CallActivity extends BaseActivity {
     }
 
     public void updateUiForNormalMode() {
+        Log.d(TAG, "updateUiForNormalMode");
         if (isVoiceOnlyCall) {
             binding.callControls.setVisibility(View.VISIBLE);
         } else {

From 39a3c9edb5222581556e275281f7c74f6a482a5f Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Mon, 8 Nov 2021 16:16:33 +0100
Subject: [PATCH 40/50] fix to fully view call controls

(were cut at left and right on some devices)

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 app/src/main/res/layout/call_activity.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/call_activity.xml b/app/src/main/res/layout/call_activity.xml
index dfd43d51b..42d739733 100644
--- a/app/src/main/res/layout/call_activity.xml
+++ b/app/src/main/res/layout/call_activity.xml
@@ -140,9 +140,7 @@
         android:animateLayoutChanges="true"
         android:background="@android:color/transparent"
         android:gravity="center"
-        android:orientation="horizontal"
-        android:layout_marginStart="40dp"
-        android:layout_marginEnd="40dp">
+        android:orientation="horizontal">
 
         <com.facebook.drawee.view.SimpleDraweeView
             android:id="@+id/pictureInPictureButton"

From f5106e60504784cec9d41fe36eaab5cf669e5319 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Tue, 9 Nov 2021 11:20:03 +0100
Subject: [PATCH 41/50] check if pip mode is granted on device, otherwise hide
 button

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../talk/activities/CallActivity.java         | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
index a0a2ad124..791771caa 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -24,6 +24,7 @@ import android.Manifest;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.annotation.SuppressLint;
+import android.app.AppOpsManager;
 import android.app.KeyguardManager;
 import android.app.PendingIntent;
 import android.app.PictureInPictureParams;
@@ -310,7 +311,7 @@ public class CallActivity extends BaseActivity {
             setCallState(CallStatus.CONNECTING);
         }
 
-        if (deviceSupportsPipMode()) {
+        if (isGreaterEqualOreo() && isPipModePossible()) {
             mPictureInPictureParamsBuilder = new PictureInPictureParams.Builder();
         }
 
@@ -516,7 +517,7 @@ public class CallActivity extends BaseActivity {
         binding.callInfosLinearLayout.setVisibility(View.VISIBLE);
         binding.selfVideoViewWrapper.setVisibility(View.VISIBLE);
 
-        if (!deviceSupportsPipMode()) {
+        if (!isPipModePossible()) {
             binding.pictureInPictureButton.setVisibility(View.GONE);
         }
 
@@ -2462,7 +2463,7 @@ public class CallActivity extends BaseActivity {
 
     void enterPipMode() {
         enableKeyguard();
-        if (deviceSupportsPipMode()) {
+        if (isGreaterEqualOreo() && isPipModePossible()) {
             Rational pipRatio = new Rational(300, 500);
             mPictureInPictureParamsBuilder.setAspectRatio(pipRatio);
             enterPictureInPictureMode(mPictureInPictureParamsBuilder.build());
@@ -2471,9 +2472,21 @@ public class CallActivity extends BaseActivity {
         }
     }
 
-    private boolean deviceSupportsPipMode() {
-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
-            && getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE);
+    private boolean isPipModePossible() {
+        if (isGreaterEqualOreo()) {
+            boolean deviceHasPipFeature = getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE);
+
+            AppOpsManager appOpsManager = (AppOpsManager) getSystemService(Context.APP_OPS_SERVICE);
+            boolean isPipFeatureGranted = appOpsManager.checkOpNoThrow(AppOpsManager.OPSTR_PICTURE_IN_PICTURE,
+                                                                       android.os.Process.myUid(),
+                                                                       "com.nextcloud.talk2") == AppOpsManager.MODE_ALLOWED; // TODO: no hardcoding (-> branding!)
+            return deviceHasPipFeature && isPipFeatureGranted;
+        }
+        return false;
+    }
+
+    private boolean isGreaterEqualOreo(){
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
     }
 
     @RequiresApi(api = Build.VERSION_CODES.O)
@@ -2517,7 +2530,7 @@ public class CallActivity extends BaseActivity {
         String title,
         int requestCode) {
 
-        if (deviceSupportsPipMode()) {
+        if (isGreaterEqualOreo() && isPipModePossible()) {
             final ArrayList<RemoteAction> actions = new ArrayList<>();
 
             final Icon icon = Icon.createWithResource(this, iconId);

From 89d0bcfc785c24fdf8623e78937d73150b5b624d Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Tue, 9 Nov 2021 13:35:29 +0100
Subject: [PATCH 42/50] hide navigation bar if pip is not available

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../java/com/nextcloud/talk/activities/CallActivity.java  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
index 791771caa..480f7d3c4 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -284,6 +284,14 @@ public class CallActivity extends BaseActivity {
         binding = CallActivityBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
+        if (!isPipModePossible()){
+            getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE |
+                                                                 View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+                                                                 View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
+                                                                 View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
+            binding.controllerCallLayout.setFitsSystemWindows(false);
+        }
+
         Bundle extras = getIntent().getExtras();
         roomId = extras.getString(BundleKeys.INSTANCE.getKEY_ROOM_ID(), "");
         roomToken = extras.getString(BundleKeys.INSTANCE.getKEY_ROOM_TOKEN(), "");

From e6da2fcc1992511955a285b2f42ec19f243d0dc2 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Tue, 9 Nov 2021 13:36:37 +0100
Subject: [PATCH 43/50] replace hardcoded applicationId for pip permission
 check

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../java/com/nextcloud/talk/activities/CallActivity.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
index 480f7d3c4..388815283 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -58,6 +58,7 @@ import android.widget.FrameLayout;
 import android.widget.RelativeLayout;
 
 import com.bluelinelabs.logansquare.LoganSquare;
+import com.nextcloud.talk.BuildConfig;
 import com.nextcloud.talk.R;
 import com.nextcloud.talk.adapters.ParticipantDisplayItem;
 import com.nextcloud.talk.adapters.ParticipantsAdapter;
@@ -2485,9 +2486,10 @@ public class CallActivity extends BaseActivity {
             boolean deviceHasPipFeature = getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE);
 
             AppOpsManager appOpsManager = (AppOpsManager) getSystemService(Context.APP_OPS_SERVICE);
-            boolean isPipFeatureGranted = appOpsManager.checkOpNoThrow(AppOpsManager.OPSTR_PICTURE_IN_PICTURE,
-                                                                       android.os.Process.myUid(),
-                                                                       "com.nextcloud.talk2") == AppOpsManager.MODE_ALLOWED; // TODO: no hardcoding (-> branding!)
+            boolean isPipFeatureGranted = appOpsManager.checkOpNoThrow(
+                AppOpsManager.OPSTR_PICTURE_IN_PICTURE,
+                android.os.Process.myUid(),
+                BuildConfig.APPLICATION_ID) == AppOpsManager.MODE_ALLOWED;
             return deviceHasPipFeature && isPipFeatureGranted;
         }
         return false;

From be9971ad7ac9e13817dfe7ce15cbd9893d405fbe Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Tue, 9 Nov 2021 14:00:34 +0100
Subject: [PATCH 44/50] disable back button when pip is not available

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../java/com/nextcloud/talk/activities/CallActivity.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
index 388815283..5aef775e0 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -352,6 +352,7 @@ public class CallActivity extends BaseActivity {
         }
     }
 
+    @Override
     public void onStop() {
         super.onStop();
         if (isInPipMode) {
@@ -2462,7 +2463,9 @@ public class CallActivity extends BaseActivity {
 
     @Override
     public void onBackPressed() {
-        enterPipMode();
+        if (isPipModePossible()) {
+            enterPipMode();
+        }
     }
 
     @Override

From 9070153d5cd0f2b00e6550458fbdf64610fbe934 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Tue, 9 Nov 2021 19:37:26 +0100
Subject: [PATCH 45/50] create abstract class for CallActivity and
 CallNotificationActivity

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../talk/activities/CallActivity.java         | 112 ++-------------
 .../talk/activities/CallActivityBase.java     | 131 ++++++++++++++++++
 .../activities/CallNotificationActivity.java  |  64 ++-------
 .../res/layout/call_notification_activity.xml |   1 +
 app/src/main/res/values/styles.xml            |  10 +-
 5 files changed, 156 insertions(+), 162 deletions(-)
 create mode 100644 app/src/main/java/com/nextcloud/talk/activities/CallActivityBase.java

diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
index 5aef775e0..b16cb920c 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -24,16 +24,12 @@ import android.Manifest;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.annotation.SuppressLint;
-import android.app.AppOpsManager;
-import android.app.KeyguardManager;
 import android.app.PendingIntent;
-import android.app.PictureInPictureParams;
 import android.app.RemoteAction;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.graphics.Color;
 import android.graphics.drawable.Icon;
@@ -47,18 +43,14 @@ import android.os.Looper;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;
-import android.util.Rational;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
-import android.view.Window;
-import android.view.WindowManager;
 import android.widget.FrameLayout;
 import android.widget.RelativeLayout;
 
 import com.bluelinelabs.logansquare.LoganSquare;
-import com.nextcloud.talk.BuildConfig;
 import com.nextcloud.talk.R;
 import com.nextcloud.talk.adapters.ParticipantDisplayItem;
 import com.nextcloud.talk.adapters.ParticipantsAdapter;
@@ -163,7 +155,7 @@ import okhttp3.Cache;
 import pub.devrel.easypermissions.AfterPermissionGranted;
 
 @AutoInjector(NextcloudTalkApplication.class)
-public class CallActivity extends BaseActivity {
+public class CallActivity extends CallActivityBase {
 
     @Inject
     NcApi ncApi;
@@ -195,7 +187,7 @@ public class CallActivity extends BaseActivity {
     private static final String MICROPHONE_PIP_INTENT_EXTRA_ACTION = "microphone_pip_action";
     private static final int MICROPHONE_PIP_REQUEST_MUTE = 1;
     private static final int MICROPHONE_PIP_REQUEST_UNMUTE = 2;
-    private PictureInPictureParams.Builder mPictureInPictureParamsBuilder;
+
     private BroadcastReceiver mReceiver;
 
     private PeerConnectionFactory peerConnectionFactory;
@@ -258,8 +250,6 @@ public class CallActivity extends BaseActivity {
     private Map<String, ParticipantDisplayItem> participantDisplayItems;
     private ParticipantsAdapter participantsAdapter;
 
-    public Boolean isInPipMode = false;
-
     private CallActivityBinding binding;
 
     @Parcel
@@ -270,28 +260,15 @@ public class CallActivity extends BaseActivity {
     @SuppressLint("ClickableViewAccessibility")
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
         Log.d(TAG, "onCreate");
+        super.onCreate(savedInstanceState);
 
         NextcloudTalkApplication.Companion.getSharedApplication().getComponentApplication().inject(this);
 
-        setTheme(R.style.CallTheme);
-
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dismissKeyguard();
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-
         binding = CallActivityBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
-        if (!isPipModePossible()){
-            getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE |
-                                                                 View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
-                                                                 View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
-                                                                 View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
-            binding.controllerCallLayout.setFitsSystemWindows(false);
-        }
+        hideNavigationIfNoPipAvailable();
 
         Bundle extras = getIntent().getExtras();
         roomId = extras.getString(BundleKeys.INSTANCE.getKEY_ROOM_ID(), "");
@@ -320,10 +297,6 @@ public class CallActivity extends BaseActivity {
             setCallState(CallStatus.CONNECTING);
         }
 
-        if (isGreaterEqualOreo() && isPipModePossible()) {
-            mPictureInPictureParamsBuilder = new PictureInPictureParams.Builder();
-        }
-
         initClickListeners();
         binding.microphoneButton.setOnTouchListener(new MicrophoneButtonTouchListener());
 
@@ -352,14 +325,6 @@ public class CallActivity extends BaseActivity {
         }
     }
 
-    @Override
-    public void onStop() {
-        super.onStop();
-        if (isInPipMode) {
-            finish();
-        }
-    }
-
     private void initClickListeners() {
         binding.pictureInPictureButton.setOnClickListener(l -> enterPipMode());
 
@@ -2461,47 +2426,6 @@ public class CallActivity extends BaseActivity {
         }
     }
 
-    @Override
-    public void onBackPressed() {
-        if (isPipModePossible()) {
-            enterPipMode();
-        }
-    }
-
-    @Override
-    public void onUserLeaveHint() {
-        enterPipMode();
-    }
-
-    void enterPipMode() {
-        enableKeyguard();
-        if (isGreaterEqualOreo() && isPipModePossible()) {
-            Rational pipRatio = new Rational(300, 500);
-            mPictureInPictureParamsBuilder.setAspectRatio(pipRatio);
-            enterPictureInPictureMode(mPictureInPictureParamsBuilder.build());
-        } else {
-            finish();
-        }
-    }
-
-    private boolean isPipModePossible() {
-        if (isGreaterEqualOreo()) {
-            boolean deviceHasPipFeature = getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE);
-
-            AppOpsManager appOpsManager = (AppOpsManager) getSystemService(Context.APP_OPS_SERVICE);
-            boolean isPipFeatureGranted = appOpsManager.checkOpNoThrow(
-                AppOpsManager.OPSTR_PICTURE_IN_PICTURE,
-                android.os.Process.myUid(),
-                BuildConfig.APPLICATION_ID) == AppOpsManager.MODE_ALLOWED;
-            return deviceHasPipFeature && isPipFeatureGranted;
-        }
-        return false;
-    }
-
-    private boolean isGreaterEqualOreo(){
-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
-    }
-
     @RequiresApi(api = Build.VERSION_CODES.O)
     @Override
     public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode, Configuration newConfig) {
@@ -2599,34 +2523,16 @@ public class CallActivity extends BaseActivity {
         binding.pipGroupCallOverlay.setVisibility(View.INVISIBLE);
     }
 
+    @Override
+    void suppressFitsSystemWindows() {
+        binding.controllerCallLayout.setFitsSystemWindows(false);
+    }
+
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
         eventBus.post(new ConfigurationChangeEvent());
     }
 
-    private void dismissKeyguard() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-            setShowWhenLocked(true);
-            setTurnScreenOn(true);
-            KeyguardManager keyguardManager = (KeyguardManager) getSystemService(KEYGUARD_SERVICE);
-            keyguardManager.requestDismissKeyguard(this, null);
-        } else {
-            getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
-            getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
-            getWindow().addFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
-        }
-    }
-
-    private void enableKeyguard() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-            setShowWhenLocked(false);
-        } else {
-            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
-            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
-            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
-        }
-    }
-
     private class SelfVideoTouchListener implements View.OnTouchListener {
 
         @SuppressLint("ClickableViewAccessibility")
diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivityBase.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivityBase.java
new file mode 100644
index 000000000..62074b92f
--- /dev/null
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivityBase.java
@@ -0,0 +1,131 @@
+package com.nextcloud.talk.activities;
+
+import android.annotation.SuppressLint;
+import android.app.AppOpsManager;
+import android.app.KeyguardManager;
+import android.app.PictureInPictureParams;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.Log;
+import android.util.Rational;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+
+import com.nextcloud.talk.BuildConfig;
+
+public abstract class CallActivityBase extends BaseActivity {
+
+    public static final String TAG = "CallActivityBase";
+
+    public PictureInPictureParams.Builder mPictureInPictureParamsBuilder;
+    public Boolean isInPipMode = false;
+
+    @SuppressLint("ClickableViewAccessibility")
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dismissKeyguard();
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+
+        if (isGreaterEqualOreo() && isPipModePossible()) {
+            mPictureInPictureParamsBuilder = new PictureInPictureParams.Builder();
+        }
+    }
+
+    void hideNavigationIfNoPipAvailable(){
+        if (!isPipModePossible()) {
+            getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE |
+                                                                 View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+                                                                 View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
+                                                                 View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
+            suppressFitsSystemWindows();
+        }
+    }
+
+    void dismissKeyguard() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+            setShowWhenLocked(true);
+            setTurnScreenOn(true);
+            KeyguardManager keyguardManager = (KeyguardManager) getSystemService(KEYGUARD_SERVICE);
+            keyguardManager.requestDismissKeyguard(this, null);
+        } else {
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
+        }
+    }
+
+    void enableKeyguard() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+            setShowWhenLocked(false);
+        } else {
+            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
+            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
+        }
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        if (isInPipMode) {
+            finish();
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (isPipModePossible()) {
+            enterPipMode();
+        }
+    }
+
+    @Override
+    protected void onUserLeaveHint() {
+        enterPipMode();
+    }
+
+    void enterPipMode() {
+        enableKeyguard();
+        if (isGreaterEqualOreo() && isPipModePossible()) {
+            Rational pipRatio = new Rational(300, 500);
+            mPictureInPictureParamsBuilder.setAspectRatio(pipRatio);
+            enterPictureInPictureMode(mPictureInPictureParamsBuilder.build());
+        } else {
+            // we don't support other solutions than PIP to have a call in the background.
+            // If PIP is not available the call is ended when user presses the home button.
+            Log.d(TAG, "Activity was finished because PIP is not available.");
+            finish();
+        }
+    }
+
+    boolean isPipModePossible() {
+        if (isGreaterEqualOreo()) {
+            boolean deviceHasPipFeature = getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE);
+
+            AppOpsManager appOpsManager = (AppOpsManager) getSystemService(Context.APP_OPS_SERVICE);
+            boolean isPipFeatureGranted = appOpsManager.checkOpNoThrow(
+                AppOpsManager.OPSTR_PICTURE_IN_PICTURE,
+                android.os.Process.myUid(),
+                BuildConfig.APPLICATION_ID) == AppOpsManager.MODE_ALLOWED;
+            return deviceHasPipFeature && isPipFeatureGranted;
+        }
+        return false;
+    }
+
+    boolean isGreaterEqualOreo(){
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
+    }
+
+    abstract void updateUiForPipMode();
+
+    abstract void updateUiForNormalMode();
+
+    abstract void suppressFitsSystemWindows();
+}
diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
index 150a054ae..70ccb7814 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
@@ -21,8 +21,6 @@
 package com.nextcloud.talk.activities;
 
 import android.annotation.SuppressLint;
-import android.app.KeyguardManager;
-import android.app.PictureInPictureParams;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
@@ -38,9 +36,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.text.TextUtils;
 import android.util.Log;
-import android.util.Rational;
 import android.view.View;
-import android.view.WindowManager;
 
 import com.bluelinelabs.logansquare.LoganSquare;
 import com.facebook.common.executors.UiThreadImmediateExecutorService;
@@ -96,9 +92,9 @@ import io.reactivex.schedulers.Schedulers;
 import okhttp3.Cache;
 
 @AutoInjector(NextcloudTalkApplication.class)
-public class CallNotificationActivity extends BaseActivity {
+public class CallNotificationActivity extends CallActivityBase {
 
-    public static final String TAG = "CallNotificationActivity";
+    public static final String TAG = "CallNotificationA";
 
     @Inject
     NcApi ncApi;
@@ -125,22 +121,21 @@ public class CallNotificationActivity extends BaseActivity {
     private boolean leavingScreen = false;
     private Handler handler;
     private CallNotificationActivityBinding binding;
-    private Boolean isInPipMode = false;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
+        Log.d(TAG, "onCreate");
         super.onCreate(savedInstanceState);
+
         NextcloudTalkApplication.Companion.getSharedApplication().getComponentApplication().inject(this);
 
-        dismissKeyguard();
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-
-        eventBus.post(new CallNotificationClick());
-
         binding = CallNotificationActivityBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
+        hideNavigationIfNoPipAvailable();
+
+        eventBus.post(new CallNotificationClick());
+
         Bundle extras = getIntent().getExtras();
         this.roomId = extras.getString(BundleKeys.INSTANCE.getKEY_ROOM_ID(), "");
         this.currentConversation = Parcels.unwrap(extras.getParcelable(BundleKeys.INSTANCE.getKEY_ROOM()));
@@ -331,7 +326,7 @@ public class CallNotificationActivity extends BaseActivity {
     private void setUpAfterConversationIsKnown() {
         binding.conversationNameTextView.setText(currentConversation.getDisplayName());
 
-        loadAvatar();
+//        loadAvatar(); // TODO: loadAvatar always makes problems! also now for PIP mode! needs to be rewritten!
         checkIfAnyParticipantsRemainInRoom();
         showAnswerControls();
     }
@@ -346,7 +341,6 @@ public class CallNotificationActivity extends BaseActivity {
         binding.avatarImageView.setLayoutParams(layoutParams);
     }
 
-
     private void loadAvatar() {
         switch (currentConversation.getType()) {
             case ROOM_TYPE_ONE_TO_ONE_CALL:
@@ -485,30 +479,6 @@ public class CallNotificationActivity extends BaseActivity {
         }
     }
 
-    public void onBackPressed() {
-        enterPipMode();
-    }
-
-    public void onUserLeaveHint() {
-        enterPipMode();
-    }
-
-    void enterPipMode() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            enterPictureInPictureMode(getPipParams());
-        } else {
-            finish();
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    public PictureInPictureParams getPipParams() {
-        Rational pipRatio = new Rational(300, 500);
-        return new PictureInPictureParams.Builder()
-            .setAspectRatio(pipRatio)
-            .build();
-    }
-
     @RequiresApi(api = Build.VERSION_CODES.O)
     @Override
     public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode, Configuration newConfig) {
@@ -531,18 +501,8 @@ public class CallNotificationActivity extends BaseActivity {
         binding.incomingCallRelativeLayout.setVisibility(View.VISIBLE);
     }
 
-    // TODO: dismiss keyguard works, but whenever accepting the call and switch to CallActivity by intent, the
-    //  lockscreen is shown (although CallActivity also dismisses the keyguard in the same way.)
-    private void dismissKeyguard() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-            setShowWhenLocked(true);
-            setTurnScreenOn(true);
-            KeyguardManager keyguardManager = (KeyguardManager) getSystemService(KEYGUARD_SERVICE);
-            keyguardManager.requestDismissKeyguard(this, null);
-        } else {
-            getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
-            getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
-            getWindow().addFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
-        }
+    @Override
+    void suppressFitsSystemWindows() {
+        binding.controllerCallNotificationLayout.setFitsSystemWindows(false);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/call_notification_activity.xml b/app/src/main/res/layout/call_notification_activity.xml
index e015f3acc..8d08a6841 100644
--- a/app/src/main/res/layout/call_notification_activity.xml
+++ b/app/src/main/res/layout/call_notification_activity.xml
@@ -22,6 +22,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/controllerCallNotificationLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a0ec7740c..ebd6e739b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -51,10 +51,6 @@
         <item name="iconTint">@color/fontAppbar</item>
     </style>
 
-    <style name="CallTheme" parent="AppTheme">
-        <item name="android:navigationBarColor">@color/grey950</item>
-    </style>
-
     <style name="BottomNavigationView" parent="@style/Widget.MaterialComponents.BottomNavigationView">
         <item name="elevation">1dp</item>
     </style>
@@ -189,9 +185,9 @@
 
     <!-- Call Launch screen -->
     <style name="AppTheme.CallLauncher">
-        <item name="android:windowBackground">@color/black</item>
-        <item name="android:statusBarColor">@color/black</item>
-        <item name="android:navigationBarColor">@color/black</item>
+        <item name="android:windowBackground">@color/grey950</item>
+        <item name="android:statusBarColor">@color/grey950</item>
+        <item name="android:navigationBarColor">@color/grey950</item>
     </style>
 
     <style name="Nextcloud.Material.TextButton" parent="Widget.MaterialComponents.Button.TextButton.Icon">

From bb0cf964d2c6541f15b2fd4257e90dc9e0cd62a0 Mon Sep 17 00:00:00 2001
From: drone <drone@nextcloud.com>
Date: Tue, 9 Nov 2021 18:40:16 +0000
Subject: [PATCH 46/50] Drone: update Lint results to reflect reduced
 error/warning count [skip ci]

Signed-off-by: drone <drone@nextcloud.com>
---
 scripts/analysis/lint-results.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt
index 920b4bab3..fea07b14a 100644
--- a/scripts/analysis/lint-results.txt
+++ b/scripts/analysis/lint-results.txt
@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 1 error and 239 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 1 error and 238 warnings</span>

From 36c5f0814b3aef7743505fd72bebcaa112a2c7f7 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Wed, 10 Nov 2021 14:24:30 +0100
Subject: [PATCH 47/50] remove avatar blurring for background (=fix blocking of
 call controls)

no blurring or other background color calculation is done any more. BlurPostProcessor took too long for the used image size. If this is a requirement in the future, use ScalingBlurPostprocessor instead of  BlurPostprocessor (so fresco lib fork from nextcloud has to be updated!), see https://frescolib.org/docs/modifying-image.html

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../activities/CallNotificationActivity.java  | 112 +++++-------------
 .../talk/dagger/modules/RestModule.java       |   5 -
 .../res/layout/call_notification_activity.xml |  19 +--
 app/src/main/res/values-land/dimens.xml       |   2 -
 app/src/main/res/values/dimens.xml            |   2 -
 5 files changed, 36 insertions(+), 104 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
index 70ccb7814..2799361af 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
@@ -25,9 +25,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
-import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.ColorDrawable;
 import android.media.AudioAttributes;
 import android.media.MediaPlayer;
 import android.net.Uri;
@@ -46,14 +44,12 @@ import com.facebook.drawee.backends.pipeline.Fresco;
 import com.facebook.imagepipeline.core.ImagePipeline;
 import com.facebook.imagepipeline.datasource.BaseBitmapDataSubscriber;
 import com.facebook.imagepipeline.image.CloseableImage;
-import com.facebook.imagepipeline.postprocessors.BlurPostProcessor;
 import com.facebook.imagepipeline.request.ImageRequest;
 import com.nextcloud.talk.R;
 import com.nextcloud.talk.api.NcApi;
 import com.nextcloud.talk.application.NextcloudTalkApplication;
 import com.nextcloud.talk.databinding.CallNotificationActivityBinding;
 import com.nextcloud.talk.events.CallNotificationClick;
-import com.nextcloud.talk.events.ConfigurationChangeEvent;
 import com.nextcloud.talk.models.RingtoneSettings;
 import com.nextcloud.talk.models.database.CapabilitiesUtil;
 import com.nextcloud.talk.models.database.UserEntity;
@@ -66,12 +62,8 @@ import com.nextcloud.talk.utils.DisplayUtils;
 import com.nextcloud.talk.utils.DoNotDisturbUtils;
 import com.nextcloud.talk.utils.bundle.BundleKeys;
 import com.nextcloud.talk.utils.preferences.AppPreferences;
-import com.nextcloud.talk.utils.singletons.AvatarStatusCodeHolder;
 
 import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-import org.michaelevans.colorart.library.ColorArt;
 import org.parceler.Parcels;
 
 import java.io.IOException;
@@ -82,7 +74,6 @@ import javax.inject.Inject;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
-import androidx.constraintlayout.widget.ConstraintLayout;
 import autodagger.AutoInjector;
 import butterknife.OnClick;
 import io.reactivex.Observer;
@@ -91,10 +82,11 @@ import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 import okhttp3.Cache;
 
+@SuppressLint("LongLogTag")
 @AutoInjector(NextcloudTalkApplication.class)
 public class CallNotificationActivity extends CallActivityBase {
 
-    public static final String TAG = "CallNotificationA";
+    public static final String TAG = "CallNotificationActivity";
 
     @Inject
     NcApi ncApi;
@@ -159,7 +151,6 @@ public class CallNotificationActivity extends CallActivityBase {
         initClickListeners();
     }
 
-    @SuppressLint({"LongLogTag"})
     @Override
     public void onStart() {
         super.onStart();
@@ -177,11 +168,13 @@ public class CallNotificationActivity extends CallActivityBase {
 
     private void initClickListeners() {
         binding.callAnswerVoiceOnlyView.setOnClickListener(l -> {
+            Log.d(TAG, "accept call (voice only)");
             originalBundle.putBoolean(BundleKeys.INSTANCE.getKEY_CALL_VOICE_ONLY(), true);
             proceedToCall();
         });
 
         binding.callAnswerCameraView.setOnClickListener(l -> {
+            Log.d(TAG, "accept call (with video)");
             originalBundle.putBoolean(BundleKeys.INSTANCE.getKEY_CALL_VOICE_ONLY(), false);
             proceedToCall();
         });
@@ -305,7 +298,6 @@ public class CallNotificationActivity extends CallActivityBase {
                     }
                 }
 
-                @SuppressLint("LongLogTag")
                 @Override
                 public void onError(@io.reactivex.annotations.NonNull Throwable e) {
                     Log.e(TAG, e.getMessage(), e);
@@ -326,80 +318,40 @@ public class CallNotificationActivity extends CallActivityBase {
     private void setUpAfterConversationIsKnown() {
         binding.conversationNameTextView.setText(currentConversation.getDisplayName());
 
-//        loadAvatar(); // TODO: loadAvatar always makes problems! also now for PIP mode! needs to be rewritten!
+        if(currentConversation.getType() == Conversation.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL){
+            setAvatarForOneToOneCall();
+        } else {
+            binding.avatarImageView.setImageResource(R.drawable.ic_circular_group);
+        }
+
         checkIfAnyParticipantsRemainInRoom();
         showAnswerControls();
     }
 
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onMessageEvent(ConfigurationChangeEvent configurationChangeEvent) {
-        ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams) binding.avatarImageView.getLayoutParams();
-        int dimen = (int) getResources().getDimension(R.dimen.avatar_size_very_big);
+    private void setAvatarForOneToOneCall() {
+        ImageRequest imageRequest =
+            DisplayUtils.getImageRequestForUrl(
+                ApiUtils.getUrlForAvatarWithName(userBeingCalled.getBaseUrl(),
+                                                 currentConversation.getName(),
+                                                 R.dimen.avatar_size_big), null);
 
-        layoutParams.width = dimen;
-        layoutParams.height = dimen;
-        binding.avatarImageView.setLayoutParams(layoutParams);
-    }
+        ImagePipeline imagePipeline = Fresco.getImagePipeline();
+        DataSource<CloseableReference<CloseableImage>> dataSource = imagePipeline.fetchDecodedImage(imageRequest, null);
 
-    private void loadAvatar() {
-        switch (currentConversation.getType()) {
-            case ROOM_TYPE_ONE_TO_ONE_CALL:
-                binding.avatarImageView.setVisibility(View.VISIBLE);
+        dataSource.subscribe(new BaseBitmapDataSubscriber() {
+            @Override
+            protected void onNewResultImpl(@Nullable Bitmap bitmap) {
+                binding.avatarImageView.getHierarchy().setImage(
+                    new BitmapDrawable(getResources(), bitmap),
+                    100,
+                    true);
+            }
 
-                ImageRequest imageRequest =
-                    DisplayUtils.getImageRequestForUrl(
-                        ApiUtils.getUrlForAvatarWithName(userBeingCalled.getBaseUrl(),
-                                                         currentConversation.getName(),
-                                                         R.dimen.avatar_size_very_big),
-                        null);
-
-                ImagePipeline imagePipeline = Fresco.getImagePipeline();
-                DataSource<CloseableReference<CloseableImage>> dataSource = imagePipeline.fetchDecodedImage(imageRequest, null);
-
-                dataSource.subscribe(new BaseBitmapDataSubscriber() {
-                    @Override
-                    protected void onNewResultImpl(@Nullable Bitmap bitmap) {
-                        binding.avatarImageView.getHierarchy().setImage(new BitmapDrawable(bitmap), 100,
-                                                                        true);
-                        if (getResources() != null) {
-                            binding.incomingCallRelativeLayout.setBackground(
-                                getResources().getDrawable(R.drawable.incoming_gradient));
-                        }
-
-                        if (AvatarStatusCodeHolder.getInstance().getStatusCode() == 200 ||
-                            AvatarStatusCodeHolder.getInstance().getStatusCode() == 0) {
-
-                            Bitmap backgroundBitmap = bitmap.copy(bitmap.getConfig(), true);
-                            new BlurPostProcessor(5, context).process(backgroundBitmap);
-                            binding.backgroundImageView.setImageDrawable(new BitmapDrawable(backgroundBitmap));
-
-                        } else if (AvatarStatusCodeHolder.getInstance().getStatusCode() == 201) {
-                            ColorArt colorArt = new ColorArt(bitmap);
-                            int color = colorArt.getBackgroundColor();
-
-                            float[] hsv = new float[3];
-                            Color.colorToHSV(color, hsv);
-                            hsv[2] *= 0.75f;
-                            color = Color.HSVToColor(hsv);
-
-                            binding.backgroundImageView.setImageDrawable(new ColorDrawable(color));
-                        }
-                    }
-
-                    @Override
-                    protected void onFailureImpl(DataSource<CloseableReference<CloseableImage>> dataSource) {
-                        // unused atm
-                    }
-                }, UiThreadImmediateExecutorService.getInstance());
-
-                break;
-            case ROOM_GROUP_CALL:
-                binding.avatarImageView.setImageResource(R.drawable.ic_circular_group);
-            case ROOM_PUBLIC_CALL:
-                binding.avatarImageView.setImageResource(R.drawable.ic_circular_group);
-                break;
-            default:
-        }
+            @Override
+            protected void onFailureImpl(DataSource<CloseableReference<CloseableImage>> dataSource) {
+                Log.e(TAG, "failed to load avatar");
+            }
+        }, UiThreadImmediateExecutorService.getInstance());
     }
 
     private void endMediaNotifications() {
@@ -415,7 +367,6 @@ public class CallNotificationActivity extends CallActivityBase {
 
     @Override
     public void onDestroy() {
-        AvatarStatusCodeHolder.getInstance().setStatusCode(0);
         leavingScreen = true;
         if (handler != null) {
             handler.removeCallbacksAndMessages(null);
@@ -436,7 +387,6 @@ public class CallNotificationActivity extends CallActivityBase {
         }
     }
 
-    @SuppressLint("LongLogTag")
     private void playRingtoneSound() {
         String callRingtonePreferenceString = appPreferences.getCallRingtoneUri();
         Uri ringtoneUri;
diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java b/app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java
index 49dc31ec9..467ff1876 100644
--- a/app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java
+++ b/app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java
@@ -33,7 +33,6 @@ import com.nextcloud.talk.utils.ApiUtils;
 import com.nextcloud.talk.utils.LoggingUtils;
 import com.nextcloud.talk.utils.database.user.UserUtils;
 import com.nextcloud.talk.utils.preferences.AppPreferences;
-import com.nextcloud.talk.utils.singletons.AvatarStatusCodeHolder;
 import com.nextcloud.talk.utils.ssl.MagicKeyManager;
 import com.nextcloud.talk.utils.ssl.MagicTrustManager;
 import com.nextcloud.talk.utils.ssl.SSLSocketFactoryCompat;
@@ -253,10 +252,6 @@ public class RestModule {
 
             Response response = chain.proceed(request);
 
-            if (request.url().encodedPath().contains("/avatar/")) {
-                AvatarStatusCodeHolder.getInstance().setStatusCode(response.code());
-            }
-
             return response;
         }
     }
diff --git a/app/src/main/res/layout/call_notification_activity.xml b/app/src/main/res/layout/call_notification_activity.xml
index 8d08a6841..76c3f710c 100644
--- a/app/src/main/res/layout/call_notification_activity.xml
+++ b/app/src/main/res/layout/call_notification_activity.xml
@@ -24,16 +24,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/controllerCallNotificationLayout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ImageView
-        android:id="@+id/backgroundImageView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:contentDescription="@null"
-        android:scaleType="centerCrop"
-        android:src="@color/grey950"
-        tools:srcCompat="@tools:sample/backgrounds/scenic" />
+    android:layout_height="match_parent"
+    android:background="@color/grey950">
 
     <LinearLayout
         android:id="@+id/callAnswerButtons"
@@ -121,10 +113,9 @@
 
     <com.facebook.drawee.view.SimpleDraweeView
         android:id="@+id/avatarImageView"
-        android:layout_width="@dimen/avatar_size_very_big"
-        android:layout_height="@dimen/avatar_size_very_big"
+        android:layout_width="@dimen/avatar_size_big"
+        android:layout_height="@dimen/avatar_size_big"
         android:layout_centerInParent="true"
-        app:roundAsCircle="true"
-        tools:srcCompat="@tools:sample/avatars[0]" />
+        app:roundAsCircle="true" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
index 6c0f8d926..374fcf2b7 100644
--- a/app/src/main/res/values-land/dimens.xml
+++ b/app/src/main/res/values-land/dimens.xml
@@ -21,6 +21,4 @@
 <resources>
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">24dp</dimen>
-
-    <dimen name="avatar_size_very_big">120dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 61a76806e..e52c554ed 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -33,8 +33,6 @@
     <dimen name="avatar_size">40dp</dimen>
     <dimen name="avatar_size_app_bar">30dp</dimen>
     <dimen name="avatar_size_big">96dp</dimen>
-    <dimen name="avatar_size_very_big">@dimen/avatar_fetching_size_very_big</dimen>
-    <dimen name="avatar_fetching_size_very_big">180dp</dimen>
 
     <dimen name="chat_text_size">14sp</dimen>
     <dimen name="message_bubble_corners_radius">6dp</dimen>

From 5e4219c58672616d233f32b3bd92c2d1fd2152e2 Mon Sep 17 00:00:00 2001
From: drone <drone@nextcloud.com>
Date: Wed, 10 Nov 2021 21:47:36 +0000
Subject: [PATCH 48/50] Drone: update FindBugs results to reflect reduced
 error/warning count [skip ci]

Signed-off-by: drone <drone@nextcloud.com>
---
 scripts/analysis/findbugs-results.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/analysis/findbugs-results.txt b/scripts/analysis/findbugs-results.txt
index bc6a950bf..b094da400 100644
--- a/scripts/analysis/findbugs-results.txt
+++ b/scripts/analysis/findbugs-results.txt
@@ -1 +1 @@
-569
\ No newline at end of file
+568
\ No newline at end of file

From bc12ee35b4a1425fa5519e3072da43a79c2c9f2f Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Thu, 11 Nov 2021 13:09:28 +0100
Subject: [PATCH 49/50] modify strings

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 app/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c9f38ab88..ff1ce3b6b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -222,8 +222,8 @@
     <string name="nc_call_state_with_video">%1$s with video</string>
 
     <!-- Picture in Picture -->
-    <string name="nc_pip_microphone_mute">mute microphone</string>
-    <string name="nc_pip_microphone_unmute">enable microphone</string>
+    <string name="nc_pip_microphone_mute">Mute microphone</string>
+    <string name="nc_pip_microphone_unmute">Enable microphone</string>
 
     <!-- Notification channels -->
     <string name="nc_notification_channel">%1$s on %2$s notification channel</string>

From 14abe52b6aa3b6693f2bba0b84ef6452f02e96bc Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Thu, 11 Nov 2021 13:22:13 +0100
Subject: [PATCH 50/50] rename CallActivityBase to CallBaseActivity

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../main/java/com/nextcloud/talk/activities/CallActivity.java | 2 +-
 .../{CallActivityBase.java => CallBaseActivity.java}          | 4 ++--
 .../nextcloud/talk/activities/CallNotificationActivity.java   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename app/src/main/java/com/nextcloud/talk/activities/{CallActivityBase.java => CallBaseActivity.java} (97%)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
index b16cb920c..5c1a1259e 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -155,7 +155,7 @@ import okhttp3.Cache;
 import pub.devrel.easypermissions.AfterPermissionGranted;
 
 @AutoInjector(NextcloudTalkApplication.class)
-public class CallActivity extends CallActivityBase {
+public class CallActivity extends CallBaseActivity {
 
     @Inject
     NcApi ncApi;
diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivityBase.java b/app/src/main/java/com/nextcloud/talk/activities/CallBaseActivity.java
similarity index 97%
rename from app/src/main/java/com/nextcloud/talk/activities/CallActivityBase.java
rename to app/src/main/java/com/nextcloud/talk/activities/CallBaseActivity.java
index 62074b92f..66da91360 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivityBase.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallBaseActivity.java
@@ -16,9 +16,9 @@ import android.view.WindowManager;
 
 import com.nextcloud.talk.BuildConfig;
 
-public abstract class CallActivityBase extends BaseActivity {
+public abstract class CallBaseActivity extends BaseActivity {
 
-    public static final String TAG = "CallActivityBase";
+    public static final String TAG = "CallBaseActivity";
 
     public PictureInPictureParams.Builder mPictureInPictureParamsBuilder;
     public Boolean isInPipMode = false;
diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
index 2799361af..7c126e4d6 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
@@ -84,7 +84,7 @@ import okhttp3.Cache;
 
 @SuppressLint("LongLogTag")
 @AutoInjector(NextcloudTalkApplication.class)
-public class CallNotificationActivity extends CallActivityBase {
+public class CallNotificationActivity extends CallBaseActivity {
 
     public static final String TAG = "CallNotificationActivity";