Merge branch 'develop' into feature/aris/threads

changelog.d/2467.bugfix

@@ -0,0 +1 @@
+Fixing proximity sensor still being active after a call

changelog.d/4710.bugfix

@@ -0,0 +1 @@
+Call banner: center text vertically

changelog.d/4713.misc

@@ -0,0 +1 @@
+Avoids leaking the activity windows when loading dialogs are displaying

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=b75392c5625a88bccd58a574552a5a323edca82dab5942d2d41097f809c6bcce
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-all.zip
+distributionSha256Sum=dd54e87b4d7aa8ff3c6afb0f7805aa121d4b70bca55b8c9b1b896eb103184582
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt

@@ -151,6 +151,7 @@ abstract class VectorBaseFragment<VB : ViewBinding> : Fragment(), MavericksView
     override fun onDestroyView() {
         Timber.i("onDestroyView Fragment ${javaClass.simpleName}")
         _binding = null
+        dismissLoadingDialog()
         super.onDestroyView()
     }
 

vector/src/main/java/im/vector/app/features/call/CallProximityManager.kt

@@ -93,7 +93,9 @@ class CallProximityManager @Inject constructor(
         if (wakeLock == null) {
             wakeLock = powerManager.newWakeLock(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK, generateWakeLockTag())
         }
-        wakeLock?.acquire(WAKE_LOCK_TIMEOUT_MILLIS)
+        wakeLock
+                ?.takeIf { !it.isHeld }
+                ?.acquire(WAKE_LOCK_TIMEOUT_MILLIS)
     }
 
     private fun onProximityFar() {

vector/src/main/res/layout/view_current_calls.xml

@@ -1,25 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge 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:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?colorPrimary"
     android:foreground="?attr/selectableItemBackground"
+    tools:background="?colorPrimary"
     tools:parentTag="android.widget.FrameLayout">
 
     <TextView
         android:id="@+id/currentCallsInfo"
         style="@style/Widget.Vector.TextView.Body"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:drawablePadding="10dp"
+        android:layout_gravity="center"
         android:gravity="center"
         android:paddingStart="16dp"
-        android:paddingTop="12dp"
         android:paddingEnd="16dp"
-        android:paddingBottom="12dp"
-        android:text="@string/call_only_active"
-        android:textColor="?colorOnPrimary" />
+        android:textColor="?colorOnPrimary"
+        tools:text="@string/call_only_active" />
 
 </merge>