From a96e5c3b64f258cb7539e201f6402c2e77f1f1e8 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 28 May 2020 12:05:58 +0200 Subject: [PATCH] Don't process 3 times magic search results in chat room creation --- .../main/java/org/linphone/activities/call/CallActivity.kt | 2 -- .../org/linphone/activities/call/IncomingCallActivity.kt | 4 +--- .../main/chat/viewmodels/ChatRoomCreationViewModel.kt | 6 +++--- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/linphone/activities/call/CallActivity.kt b/app/src/main/java/org/linphone/activities/call/CallActivity.kt index fb90bc76e..a8fd5e6f0 100644 --- a/app/src/main/java/org/linphone/activities/call/CallActivity.kt +++ b/app/src/main/java/org/linphone/activities/call/CallActivity.kt @@ -23,7 +23,6 @@ import android.content.res.Configuration import android.os.Bundle import android.view.Gravity import android.view.MotionEvent -import android.view.WindowManager import androidx.databinding.DataBindingUtil import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProvider @@ -47,7 +46,6 @@ class CallActivity : ProximitySensorActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) Compatibility.setShowWhenLocked(this, true) Compatibility.setTurnScreenOn(this, true) diff --git a/app/src/main/java/org/linphone/activities/call/IncomingCallActivity.kt b/app/src/main/java/org/linphone/activities/call/IncomingCallActivity.kt index ff3a060d3..175d48918 100644 --- a/app/src/main/java/org/linphone/activities/call/IncomingCallActivity.kt +++ b/app/src/main/java/org/linphone/activities/call/IncomingCallActivity.kt @@ -23,7 +23,6 @@ import android.annotation.TargetApi import android.app.KeyguardManager import android.content.Context import android.os.Bundle -import android.view.WindowManager import androidx.databinding.DataBindingUtil import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProvider @@ -46,9 +45,8 @@ class IncomingCallActivity : GenericActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) - Compatibility.setTurnScreenOn(this, true) Compatibility.setShowWhenLocked(this, true) + Compatibility.setTurnScreenOn(this, true) Compatibility.requestDismissKeyguard(this) binding = DataBindingUtil.setContentView(this, R.layout.call_incoming_activity) diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomCreationViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomCreationViewModel.kt index b33353049..44c2d3afa 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomCreationViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomCreationViewModel.kt @@ -48,7 +48,7 @@ class ChatRoomCreationViewModel : ErrorReportingViewModel() { val selectedAddresses = MutableLiveData>() val filter = MutableLiveData() - var previousFilter = "" + private var previousFilter = "" val limeAvailable: Boolean = LinphoneUtils.isLimeAvailable() @@ -80,8 +80,6 @@ class ChatRoomCreationViewModel : ErrorReportingViewModel() { selectedAddresses.value = arrayListOf() - updateContactsList() - coreContext.contactsManager.addListener(contactsUpdatedListener) waitForChatRoomCreation.value = false } @@ -98,6 +96,8 @@ class ChatRoomCreationViewModel : ErrorReportingViewModel() { fun applyFilter() { val filterValue = filter.value.orEmpty() + if (previousFilter == filterValue) return + if (previousFilter.isNotEmpty() && previousFilter.length > filterValue.length) { coreContext.contactsManager.magicSearch.resetSearchCache() }