mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 03:18:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Should fix quit button visibility in drawer menu

Browse source
This commit is contained in:
Sylvain Berfini 2025-03-17 16:09:23 +01:00
parent 9837a834d4
commit b5a1e21f40
5 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/linphone/ui/main/fragment/DrawerMenuFragment.kt
View file

@ -170,6 +170,14 @@ class DrawerMenuFragment : GenericMainFragment() {
}
}
}
sharedViewModel.refreshDrawerMenuQuitButtonEvent.observe(viewLifecycleOwner) {
it.consume {
coreContext.postOnCoreThread {
viewModel.checkIfKeepAliveServiceIsEnabled()
}
}
}
}
private fun showAccountPopupMenu(view: View, account: Account) {

7
app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsAdvancedFragment.kt
View file

@ -32,6 +32,7 @@ import org.linphone.databinding.SettingsAdvancedFragmentBinding
import org.linphone.ui.GenericActivity
import org.linphone.ui.main.fragment.GenericMainFragment
import org.linphone.ui.main.settings.viewmodel.SettingsViewModel
import org.linphone.utils.Event
@UiThread
class SettingsAdvancedFragment : GenericMainFragment() {
@ -105,6 +106,12 @@ class SettingsAdvancedFragment : GenericMainFragment() {
setupOutputAudioDevicePicker()
}
viewModel.keepAliveServiceSettingChangedEvent.observe(viewLifecycleOwner) {
it.consume {
sharedViewModel.refreshDrawerMenuQuitButtonEvent.postValue(Event(true))
}
}
startPostponedEnterTransition()
}

5
app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt
View file

@ -64,6 +64,10 @@ class SettingsViewModel
MutableLiveData<Event<Boolean>>()
}
val keepAliveServiceSettingChangedEvent: MutableLiveData<Event<Boolean>> by lazy {
MutableLiveData<Event<Boolean>>()
}
// Security settings
val isVfsEnabled = MutableLiveData<Boolean>()
@ -689,6 +693,7 @@ class SettingsViewModel
} else {
coreContext.stopKeepAliveService()
}
keepAliveServiceSettingChangedEvent.postValue(Event(true))
}
}

12
app/src/main/java/org/linphone/ui/main/viewmodel/DrawerMenuViewModel.kt
View file

@ -126,7 +126,8 @@ class DrawerMenuViewModel
hideRecordings.postValue(corePreferences.disableCallRecordings)
hideSettings.postValue(corePreferences.hideSettings)
hideQuitButton.postValue(!corePreferences.keepServiceAlive)
checkIfKeepAliveServiceIsEnabled()
computeAccountsList()
computeShortcuts()
@ -169,6 +170,15 @@ class DrawerMenuViewModel
}
}
@WorkerThread
fun checkIfKeepAliveServiceIsEnabled() {
val useKeepAliveService = corePreferences.keepServiceAlive
hideQuitButton.postValue(!useKeepAliveService)
if (useKeepAliveService) {
Log.i("$TAG Keep alive service is enabled, do not hide quit button")
}
}
@WorkerThread
private fun computeAccountsList() {
accounts.value.orEmpty().forEach(AccountModel::destroy)

4
app/src/main/java/org/linphone/ui/main/viewmodel/SharedMainViewModel.kt
View file

@ -74,6 +74,10 @@ class SharedMainViewModel
MutableLiveData<Event<Boolean>>()
}
val refreshDrawerMenuQuitButtonEvent: MutableLiveData<Event<Boolean>> by lazy {
MutableLiveData<Event<Boolean>>()
}
val forceUpdateAvailableNavigationItems: MutableLiveData<Event<Boolean>> by lazy {
MutableLiveData<Event<Boolean>>()
}