From 8b96d8cd8dfcc8c1ba1a8fc1a0977c31abe05301 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Wed, 15 Dec 2021 17:32:39 +0000 Subject: [PATCH 1/6] only acquire a wake lock if a lock is not already held --- .../java/im/vector/app/features/call/CallProximityManager.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vector/src/main/java/im/vector/app/features/call/CallProximityManager.kt b/vector/src/main/java/im/vector/app/features/call/CallProximityManager.kt index 74e6c40783..3aeeac15af 100644 --- a/vector/src/main/java/im/vector/app/features/call/CallProximityManager.kt +++ b/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() { From 8c913d29cb94eb5f12cb0ff564a4d7e55e131773 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Wed, 15 Dec 2021 17:35:27 +0000 Subject: [PATCH 2/6] adding changelog entry --- changelog.d/2467.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/2467.bugfix diff --git a/changelog.d/2467.bugfix b/changelog.d/2467.bugfix new file mode 100644 index 0000000000..e707199e8a --- /dev/null +++ b/changelog.d/2467.bugfix @@ -0,0 +1 @@ +Fixing proximity sensor still being active after a call \ No newline at end of file From 4c238e81cf6cf08bdf99c98ffabe7f26ffab1472 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Wed, 15 Dec 2021 18:16:10 +0000 Subject: [PATCH 3/6] dismisses any potential loading dialogs when the linked fragment is destroyed - fixes leaking the activity window when the fragment is destroyed --- .../main/java/im/vector/app/core/platform/VectorBaseFragment.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt index eab1101064..64443139f1 100644 --- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt +++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt @@ -151,6 +151,7 @@ abstract class VectorBaseFragment : Fragment(), MavericksView override fun onDestroyView() { Timber.i("onDestroyView Fragment ${javaClass.simpleName}") _binding = null + dismissLoadingDialog() super.onDestroyView() } From eb9c46b9a265370102e636b204be9eff3115871e Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Wed, 15 Dec 2021 18:17:04 +0000 Subject: [PATCH 4/6] adding changelog entry --- changelog.d/4713.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/4713.misc diff --git a/changelog.d/4713.misc b/changelog.d/4713.misc new file mode 100644 index 0000000000..5207c03871 --- /dev/null +++ b/changelog.d/4713.misc @@ -0,0 +1 @@ +Avoids leaking the activity windows when loading dialogs are displaying \ No newline at end of file From 818a8898b34186f5423dbde502e4c056f7d6dc90 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 15 Dec 2021 22:19:23 +0100 Subject: [PATCH 5/6] Call banner: center text vertically --- changelog.d/4710.bugfix | 1 + vector/src/main/res/layout/view_current_calls.xml | 15 +++++---------- 2 files changed, 6 insertions(+), 10 deletions(-) create mode 100644 changelog.d/4710.bugfix diff --git a/changelog.d/4710.bugfix b/changelog.d/4710.bugfix new file mode 100644 index 0000000000..4abfaa91bd --- /dev/null +++ b/changelog.d/4710.bugfix @@ -0,0 +1 @@ +Call banner: center text vertically \ No newline at end of file diff --git a/vector/src/main/res/layout/view_current_calls.xml b/vector/src/main/res/layout/view_current_calls.xml index 892f097e01..ab4ed8a3b8 100644 --- a/vector/src/main/res/layout/view_current_calls.xml +++ b/vector/src/main/res/layout/view_current_calls.xml @@ -1,25 +1,20 @@ + android:textColor="?colorOnPrimary" + tools:text="@string/call_only_active" /> From db1e0af4e557087802d3f48b99b6af9199ce7e52 Mon Sep 17 00:00:00 2001 From: gradle-update-robot Date: Thu, 16 Dec 2021 00:13:21 +0000 Subject: [PATCH 6/6] Update Gradle Wrapper from 7.3.1 to 7.3.2. Signed-off-by: gradle-update-robot --- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cf2b23094e..fa58fc5aae 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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