Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't process 3 times magic search results in chat room creation

Browse source
This commit is contained in:
Sylvain Berfini 2020-05-28 12:05:58 +02:00
parent c1f0e624ca
commit a96e5c3b64
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/linphone/activities/call/CallActivity.kt
View file

@ -23,7 +23,6 @@ import android.content.res.Configuration
import android.os.Bundle import android.os.Bundle
import android.view.Gravity import android.view.Gravity
import android.view.MotionEvent import android.view.MotionEvent
import android.view.WindowManager
import androidx.databinding.DataBindingUtil import androidx.databinding.DataBindingUtil
import androidx.lifecycle.Observer import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
@ -47,7 +46,6 @@ class CallActivity : ProximitySensorActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
Compatibility.setShowWhenLocked(this, true) Compatibility.setShowWhenLocked(this, true)
Compatibility.setTurnScreenOn(this, true) Compatibility.setTurnScreenOn(this, true)

4
app/src/main/java/org/linphone/activities/call/IncomingCallActivity.kt
View file

@ -23,7 +23,6 @@ import android.annotation.TargetApi
import android.app.KeyguardManager import android.app.KeyguardManager
import android.content.Context import android.content.Context
import android.os.Bundle import android.os.Bundle
import android.view.WindowManager
import androidx.databinding.DataBindingUtil import androidx.databinding.DataBindingUtil
import androidx.lifecycle.Observer import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
@ -46,9 +45,8 @@ class IncomingCallActivity : GenericActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
Compatibility.setTurnScreenOn(this, true)
Compatibility.setShowWhenLocked(this, true) Compatibility.setShowWhenLocked(this, true)
Compatibility.setTurnScreenOn(this, true)
Compatibility.requestDismissKeyguard(this) Compatibility.requestDismissKeyguard(this)
binding = DataBindingUtil.setContentView(this, R.layout.call_incoming_activity) binding = DataBindingUtil.setContentView(this, R.layout.call_incoming_activity)

6
app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomCreationViewModel.kt
View file

@ -48,7 +48,7 @@ class ChatRoomCreationViewModel : ErrorReportingViewModel() {
val selectedAddresses = MutableLiveData<ArrayList<Address>>() val selectedAddresses = MutableLiveData<ArrayList<Address>>()
val filter = MutableLiveData<String>() val filter = MutableLiveData<String>()
var previousFilter = "" private var previousFilter = ""
val limeAvailable: Boolean = LinphoneUtils.isLimeAvailable() val limeAvailable: Boolean = LinphoneUtils.isLimeAvailable()
@ -80,8 +80,6 @@ class ChatRoomCreationViewModel : ErrorReportingViewModel() {
selectedAddresses.value = arrayListOf() selectedAddresses.value = arrayListOf()
updateContactsList()
coreContext.contactsManager.addListener(contactsUpdatedListener) coreContext.contactsManager.addListener(contactsUpdatedListener)
waitForChatRoomCreation.value = false waitForChatRoomCreation.value = false
} }
@ -98,6 +96,8 @@ class ChatRoomCreationViewModel : ErrorReportingViewModel() {
fun applyFilter() { fun applyFilter() {
val filterValue = filter.value.orEmpty() val filterValue = filter.value.orEmpty()
if (previousFilter == filterValue) return
if (previousFilter.isNotEmpty() && previousFilter.length > filterValue.length) { if (previousFilter.isNotEmpty() && previousFilter.length > filterValue.length) {
coreContext.contactsManager.magicSearch.resetSearchCache() coreContext.contactsManager.magicSearch.resetSearchCache()
} }