diff --git a/app/src/main/java/org/linphone/activities/main/settings/fragments/AdvancedSettingsFragment.kt b/app/src/main/java/org/linphone/activities/main/settings/fragments/AdvancedSettingsFragment.kt index 9723b1652..9f2d79965 100644 --- a/app/src/main/java/org/linphone/activities/main/settings/fragments/AdvancedSettingsFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/settings/fragments/AdvancedSettingsFragment.kt @@ -68,6 +68,20 @@ class AdvancedSettingsFragment : GenericFragment AppCompatDelegate.setDefaultNightMode( diff --git a/app/src/main/java/org/linphone/activities/main/viewmodels/LogsUploadViewModel.kt b/app/src/main/java/org/linphone/activities/main/viewmodels/LogsUploadViewModel.kt index 9216d923b..337938289 100644 --- a/app/src/main/java/org/linphone/activities/main/viewmodels/LogsUploadViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/viewmodels/LogsUploadViewModel.kt @@ -30,10 +30,18 @@ import org.linphone.utils.Event open class LogsUploadViewModel : ViewModel() { val uploadInProgress = MutableLiveData() + val resetCompleteEvent: MutableLiveData> by lazy { + MutableLiveData>() + } + val uploadFinishedEvent: MutableLiveData> by lazy { MutableLiveData>() } + val uploadErrorEvent: MutableLiveData> by lazy { + MutableLiveData>() + } + 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) } } diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 354afff41..d7f530b0f 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -9,8 +9,6 @@ Esto es necesario para recibir llamadas en segundo plano &appName; contactos Visite nuestra política de privacidad - Enviar registros - Restablecer registros Error Número de teléfono Números de teléfonos diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index b150be965..3fb076987 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -42,8 +42,6 @@ &appName; a démarré automatiquement Contacts &appName; Consultez notre politique de confidentialité - Envoyer les traces - Vider les traces Url des traces copiée dans le presse-papier Erreur Numéro de téléphone @@ -597,4 +595,6 @@ Nom d\'utilisateur + Erreur pendant l\'envoi des journaux ! + Les journaux ont été néttoyés \ No newline at end of file diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 96f6d7720..c650fc226 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -18,8 +18,6 @@ Bekijk onze privacyverklaring - Verstuur logs - Logs wissen Logs url gekopieerd naar klembord Fout diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 519108611..ae1783f08 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -336,8 +336,6 @@ 若要在后台可接听电话这是必要的 &appName; 联系人 查看我们的隐私策略 - 发送日志 - 重启日志 日志链接已复制到剪贴板 出错 电话号码 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 33a934fd6..c87b0a64b 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -7,8 +7,6 @@ 若要在後台可接聽電話,這是必選項 &appName;聯絡人 訪問我們的隱私政策 - 發送日誌 - 重啓日誌 日誌網址複製到剪貼板 錯誤 電話號碼 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bf543a895..dcc7a3ab4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -20,8 +20,10 @@ &appName; SDK %s Visit our privacy policy GNU General Public License V3\n © 2010–2020 Belledonne Communications - Send logs - Reset logs + + + Failed to upload logs! + Logs have been cleared Logs url copied into clipboard linphone-android@belledonne-communications.com