From 2e98cabdb71952406d29f533c50786aa891da96b Mon Sep 17 00:00:00 2001 From: Iago Date: Sat, 16 Apr 2022 08:43:02 +0000 Subject: [PATCH 1/4] Translated using Weblate (Spanish) Currently translated at 98.0% (49 of 50 strings) Translation: Simple Mobile Tools/Simple Dialer Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-dialer/es/ --- app/src/main/res/values-es/strings.xml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 414ea005..b00f9121 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1,29 +1,26 @@ + Marcador Simple Marcador Hacer esta app la predeterminada para hacer llamadas en tu dispositivo Please allow displaying over other apps for reliable behaviour - No se pudo acceder a tus contactos - No se han encontrado llamadas previas No se pudo acceder al historial de llamadas Solicitar acceso - ¿Estás seguro que quieres eliminar los elementos seleccionados del historial de llamadas? + ¿Estás seguro que quieres eliminar los elementos seleccionados del historial de llamadas\? ¿Está seguro de que desea eliminar todo del historial de llamadas? Enviar SMS Mostrar llamadas agrupadas Borrar historial de llamadas Show call details - Teclado de marcado Asterisk Hashtag Call number - Marcador Aceptar @@ -47,18 +44,15 @@ Show dialpad Hide dialpad End call - Marcado rápido Administrar marcado rápido Toca un número para asignarle un contacto. Entonces podrás llamarlo rápidamente manteniendo presionado el número asignado en el teclado de marcado. - Agrupar llamadas subsecuentes con el mísmo número en el registro de llamadas Abrir el teclado de marcado de forma predeterminada al abrir la aplicación Deshabilitar el sensor de proximidad durante las llamadas Replace swiping at responding to incoming calls with clicking - Marcador Simple - Administra tus llamadas fácil @@ -88,9 +82,8 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - - + \ No newline at end of file From 162dfd08ee59fdb0956c9529f169fac09e697d1c Mon Sep 17 00:00:00 2001 From: Mysochenko Yuriy Date: Mon, 9 May 2022 18:22:53 +0300 Subject: [PATCH 2/4] properly check outgoing call status --- .../dialer/extensions/Call.kt | 22 +++++++++++++++++++ .../dialer/services/CallService.kt | 3 ++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 app/src/main/kotlin/com/simplemobiletools/dialer/extensions/Call.kt diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/extensions/Call.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/extensions/Call.kt new file mode 100644 index 00000000..ac1b4a49 --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/extensions/Call.kt @@ -0,0 +1,22 @@ +package com.simplemobiletools.dialer.extensions + +import android.os.Build +import android.telecom.Call +import android.telecom.Call.STATE_CONNECTING +import android.telecom.Call.STATE_DIALING +import android.telecom.Call.STATE_SELECT_PHONE_ACCOUNT + +private val OUTGOING_CALL_STATES = arrayOf(STATE_CONNECTING, STATE_DIALING, STATE_SELECT_PHONE_ACCOUNT) + +fun Call.getStateCompat(): Int { + return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + details.state + } else { + @Suppress("DEPRECATION") + state + } +} + +fun Call.isOutgoing(): Boolean { + return OUTGOING_CALL_STATES.contains(getStateCompat()) +} diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/services/CallService.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/services/CallService.kt index 09cb2ae9..67e54194 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/services/CallService.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/services/CallService.kt @@ -3,6 +3,7 @@ package com.simplemobiletools.dialer.services import android.telecom.Call import android.telecom.InCallService import com.simplemobiletools.dialer.activities.CallActivity +import com.simplemobiletools.dialer.extensions.isOutgoing import com.simplemobiletools.dialer.extensions.powerManager import com.simplemobiletools.dialer.helpers.CallManager import com.simplemobiletools.dialer.helpers.CallNotificationManager @@ -21,7 +22,7 @@ class CallService : InCallService() { override fun onCallAdded(call: Call) { super.onCallAdded(call) - if (!powerManager.isInteractive || call.state == Call.STATE_CONNECTING) { + if (!powerManager.isInteractive || call.isOutgoing()) { startActivity(CallActivity.getStartIntent(this)) } CallManager.call = call From 3906af8878e889acd20bf90eedec84f562732c72 Mon Sep 17 00:00:00 2001 From: Mysochenko Yuriy Date: Tue, 10 May 2022 07:40:15 +0300 Subject: [PATCH 3/4] use helper function to check sdk version --- .../kotlin/com/simplemobiletools/dialer/extensions/Call.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/extensions/Call.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/extensions/Call.kt index ac1b4a49..965440fb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/extensions/Call.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/extensions/Call.kt @@ -1,15 +1,15 @@ package com.simplemobiletools.dialer.extensions -import android.os.Build import android.telecom.Call import android.telecom.Call.STATE_CONNECTING import android.telecom.Call.STATE_DIALING import android.telecom.Call.STATE_SELECT_PHONE_ACCOUNT +import com.simplemobiletools.commons.helpers.isSPlus private val OUTGOING_CALL_STATES = arrayOf(STATE_CONNECTING, STATE_DIALING, STATE_SELECT_PHONE_ACCOUNT) fun Call.getStateCompat(): Int { - return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + return if (isSPlus()) { details.state } else { @Suppress("DEPRECATION") From 1ca53b4f59037d8904d3cd124230bbf2255b98e4 Mon Sep 17 00:00:00 2001 From: Mysochenko Yuriy Date: Tue, 10 May 2022 07:41:16 +0300 Subject: [PATCH 4/4] suppress deprecation warning for the whole function --- .../main/kotlin/com/simplemobiletools/dialer/extensions/Call.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/extensions/Call.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/extensions/Call.kt index 965440fb..edca4412 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/extensions/Call.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/extensions/Call.kt @@ -8,11 +8,11 @@ import com.simplemobiletools.commons.helpers.isSPlus private val OUTGOING_CALL_STATES = arrayOf(STATE_CONNECTING, STATE_DIALING, STATE_SELECT_PHONE_ACCOUNT) +@Suppress("DEPRECATION") fun Call.getStateCompat(): Int { return if (isSPlus()) { details.state } else { - @Suppress("DEPRECATION") state } }