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

Display snack bar message when logs are reset or in case of upload failure

Browse source
This commit is contained in:
Sylvain Berfini 2021-05-06 15:01:13 +02:00
parent 20afd5bdeb
commit 350493c6ea
8 changed files with 30 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/org/linphone/activities/main/settings/fragments/AdvancedSettingsFragment.kt
View file

@ -68,6 +68,20 @@ class AdvancedSettingsFragment : GenericFragment<SettingsAdvancedFragmentBinding
}
})
viewModel.uploadErrorEvent.observe(viewLifecycleOwner, {
it.consume {
val activity = requireActivity() as MainActivity
activity.showSnackBar(R.string.logs_upload_failure)
}
})
viewModel.resetCompleteEvent.observe(viewLifecycleOwner, {
it.consume {
val activity = requireActivity() as MainActivity
activity.showSnackBar(R.string.logs_reset_complete)
}
})
viewModel.setNightModeEvent.observe(viewLifecycleOwner, {
it.consume { value ->
AppCompatDelegate.setDefaultNightMode(

10
app/src/main/java/org/linphone/activities/main/viewmodels/LogsUploadViewModel.kt
View file

@ -30,10 +30,18 @@ import org.linphone.utils.Event
open class LogsUploadViewModel : ViewModel() {
val uploadInProgress = MutableLiveData<Boolean>()
val resetCompleteEvent: MutableLiveData<Event<Boolean>> by lazy {
MutableLiveData<Event<Boolean>>()
}
val uploadFinishedEvent: MutableLiveData<Event<String>> by lazy {
MutableLiveData<Event<String>>()
}
val uploadErrorEvent: MutableLiveData<Event<Boolean>> by lazy {
MutableLiveData<Event<Boolean>>()
}
private val listener = object : CoreListenerStub() {
override fun onLogCollectionUploadStateChanged(
core: Core,
@ -45,6 +53,7 @@ open class LogsUploadViewModel : ViewModel() {
uploadFinishedEvent.value = Event(info)
} else if (state == Core.LogCollectionUploadState.NotDelivered) {
uploadInProgress.value = false
uploadErrorEvent.value = Event(true)
}
}
}
@ -67,5 +76,6 @@ open class LogsUploadViewModel : ViewModel() {
fun resetLogs() {
coreContext.core.resetLogCollection()
resetCompleteEvent.value = Event(true)
}
}

2
app/src/main/res/values-es/strings.xml
View file

@ -9,8 +9,6 @@
<string name="service_description">Esto es necesario para recibir llamadas en segundo plano</string>
<string name="sync_account_name">&appName; contactos</string>
<string name="about_privacy_policy">Visite nuestra política de privacidad</string>
<string name="about_send_log">Enviar registros</string>
<string name="about_reset_log">Restablecer registros</string>
<string name="error">Error</string>
<string name="phone_number">Número de teléfono</string>
<string name="phone_numbers">Números de teléfonos</string>

4
app/src/main/res/values-fr/strings.xml
View file

@ -42,8 +42,6 @@
<string name="service_auto_start_description">&appName; a démarré automatiquement</string>
<string name="sync_account_name">Contacts &appName;</string>
<string name="about_privacy_policy">Consultez notre politique de confidentialité</string>
<string name="about_send_log">Envoyer les traces</string>
<string name="about_reset_log">Vider les traces</string>
<string name="logs_url_copied_to_clipboard">Url des traces copiée dans le presse-papier</string>
<string name="error">Erreur</string>
<string name="phone_number">Numéro de téléphone</string>
@ -597,4 +595,6 @@
<string name="settings_primary_account_display_name_summary"></string>
<string name="settings_primary_account_username_title">Nom d\'utilisateur</string>
<string name="settings_primary_account_username_summary"></string>
<string name="logs_upload_failure">Erreur pendant l\'envoi des journaux !</string>
<string name="logs_reset_complete">Les journaux ont été néttoyés</string>
</resources>

2
app/src/main/res/values-nl/strings.xml
View file

@ -18,8 +18,6 @@
<string name="about_liblinphone_sdk_version"></string>
<string name="about_privacy_policy">Bekijk onze privacyverklaring</string>
<string name="about_text"></string>
<string name="about_send_log">Verstuur logs</string>
<string name="about_reset_log">Logs wissen</string>
<string name="logs_url_copied_to_clipboard">Logs url gekopieerd naar klembord</string>
<string name="about_bugreport_email"></string>
<string name="error">Fout</string>

2
app/src/main/res/values-zh-rCN/strings.xml
View file

@ -336,8 +336,6 @@
<string name="service_description">若要在后台可接听电话这是必要的</string>
<string name="sync_account_name">&appName; 联系人</string>
<string name="about_privacy_policy">查看我们的隐私策略</string>
<string name="about_send_log">发送日志</string>
<string name="about_reset_log">重启日志</string>
<string name="logs_url_copied_to_clipboard">日志链接已复制到剪贴板</string>
<string name="error">出错</string>
<string name="phone_number">电话号码</string>

2
app/src/main/res/values-zh-rTW/strings.xml
View file

@ -7,8 +7,6 @@
<string name="service_description">若要在後台可接聽電話，這是必選項</string>
<string name="sync_account_name">&appName;聯絡人</string>
<string name="about_privacy_policy">訪問我們的隱私政策</string>
<string name="about_send_log">發送日誌</string>
<string name="about_reset_log">重啓日誌</string>
<string name="logs_url_copied_to_clipboard">日誌網址複製到剪貼板</string>
<string name="error">錯誤</string>
<string name="phone_number">電話號碼</string>

6
app/src/main/res/values/strings.xml
View file

@ -20,8 +20,10 @@
<string name="about_liblinphone_sdk_version" translatable="false">&appName; SDK %s</string>
<string name="about_privacy_policy">Visit our privacy policy</string>
<string name="about_text" translatable="false">GNU General Public License V3\n © 2010–2020 Belledonne Communications</string>
<string name="about_send_log">Send logs</string>
<string name="about_reset_log">Reset logs</string>
<!-- Logs -->
<string name="logs_upload_failure">Failed to upload logs!</string>
<string name="logs_reset_complete">Logs have been cleared</string>
<string name="logs_url_copied_to_clipboard">Logs url copied into clipboard</string>
<string name="about_bugreport_email" translatable="false">linphone-android@belledonne-communications.com</string>