From 007cc40ac6135eeae46b7e20c1c44308c5815de2 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Thu, 22 Nov 2018 23:41:30 +0100
Subject: [PATCH] tweak the text on the dialer notification

---
 .../contacts/pro/services/DialerCallService.kt        | 11 +++++++----
 app/src/main/res/values-az/strings.xml                |  3 ++-
 app/src/main/res/values-de/strings.xml                |  3 ++-
 app/src/main/res/values-el/strings.xml                |  3 ++-
 app/src/main/res/values-eu/strings.xml                |  3 ++-
 app/src/main/res/values-fr/strings.xml                |  3 ++-
 app/src/main/res/values-hr/strings.xml                |  3 ++-
 app/src/main/res/values-it/strings.xml                |  3 ++-
 app/src/main/res/values-ja/strings.xml                |  3 ++-
 app/src/main/res/values-ko-rKR/strings.xml            |  3 ++-
 app/src/main/res/values-lt/strings.xml                |  3 ++-
 app/src/main/res/values-pt/strings.xml                |  3 ++-
 app/src/main/res/values-ru/strings.xml                |  3 ++-
 app/src/main/res/values-sk/strings.xml                |  3 ++-
 app/src/main/res/values-sv/strings.xml                |  3 ++-
 app/src/main/res/values-tr/strings.xml                |  3 ++-
 app/src/main/res/values-zh-rTW/strings.xml            |  3 ++-
 app/src/main/res/values/strings.xml                   |  3 ++-
 18 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/services/DialerCallService.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/services/DialerCallService.kt
index c0324594..d7a7db23 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/services/DialerCallService.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/services/DialerCallService.kt
@@ -80,10 +80,13 @@ class DialerCallService : Service() {
     }
 
     private fun getCallStatusString(): String {
-        return when (callStatus) {
-            Call.STATE_NEW -> applicationContext.getString(if (isIncomingCall) R.string.incoming_call else R.string.calling)
-            Call.STATE_ACTIVE -> applicationContext.getString(R.string.ongoing_call)
-            else -> ""
+        val id = when (callStatus) {
+            Call.STATE_DIALING -> R.string.calling
+            Call.STATE_RINGING -> R.string.incoming_call
+            Call.STATE_ACTIVE -> R.string.ongoing_call
+            else -> if (isIncomingCall) R.string.incoming_call else R.string.calling
         }
+
+        return applicationContext.getString(id)
     }
 }
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index 9b1557ed..092598a7 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -112,7 +112,8 @@
     <!-- Dialer -->
     <string name="dialer">Dialer</string>
     <string name="calling">Calling…</string>
-    <string name="incoming_call">Incoming call from…</string>
+    <string name="incoming_call">Incoming call</string>
+    <string name="incoming_call_from">Incoming call from…</string>
     <string name="ongoing_call">Ongoing call</string>
     <string name="disconnected">Disconnected</string>
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index edd90782..609ac314 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -112,7 +112,8 @@
     <!-- Dialer -->
     <string name="dialer">Dialer</string>
     <string name="calling">Calling…</string>
-    <string name="incoming_call">Incoming call from…</string>
+    <string name="incoming_call">Incoming call</string>
+    <string name="incoming_call_from">Incoming call from…</string>
     <string name="ongoing_call">Ongoing call</string>
     <string name="disconnected">Disconnected</string>
 
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 24a7ff7e..0fa31b59 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -112,7 +112,8 @@
     <!-- Dialer -->
     <string name="dialer">Dialer</string>
     <string name="calling">Calling…</string>
-    <string name="incoming_call">Incoming call from…</string>
+    <string name="incoming_call">Incoming call</string>
+    <string name="incoming_call_from">Incoming call from…</string>
     <string name="ongoing_call">Ongoing call</string>
     <string name="disconnected">Disconnected</string>
 
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 37c847db..2d8fe559 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -112,7 +112,8 @@
     <!-- Dialer -->
     <string name="dialer">Dialer</string>
     <string name="calling">Calling…</string>
-    <string name="incoming_call">Incoming call from…</string>
+    <string name="incoming_call">Incoming call</string>
+    <string name="incoming_call_from">Incoming call from…</string>
     <string name="ongoing_call">Ongoing call</string>
     <string name="disconnected">Disconnected</string>
 
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 916bcfd2..e73cf146 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -112,7 +112,8 @@
     <!-- Dialer -->
     <string name="dialer">Dialer</string>
     <string name="calling">Calling…</string>
-    <string name="incoming_call">Incoming call from…</string>
+    <string name="incoming_call">Incoming call</string>
+    <string name="incoming_call_from">Incoming call from…</string>
     <string name="ongoing_call">Ongoing call</string>
     <string name="disconnected">Disconnected</string>
 
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index e3a68ed6..33793d0f 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -112,7 +112,8 @@
     <!-- Dialer -->
     <string name="dialer">Dialer</string>
     <string name="calling">Calling…</string>
-    <string name="incoming_call">Incoming call from…</string>
+    <string name="incoming_call">Incoming call</string>
+    <string name="incoming_call_from">Incoming call from…</string>
     <string name="ongoing_call">Ongoing call</string>
     <string name="disconnected">Disconnected</string>
 
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 9a329387..72fe3b8e 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -112,7 +112,8 @@
     <!-- Dialer -->
     <string name="dialer">Compositore</string>
     <string name="calling">Chiamata in corso…</string>
-    <string name="incoming_call">Chiamata in arrivo da…</string>
+    <string name="incoming_call">Incoming call</string>
+    <string name="incoming_call_from">Chiamata in arrivo da…</string>
     <string name="ongoing_call">Chiamata in corso</string>
     <string name="disconnected">Disconnesso</string>
 
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index fca8d1a0..569feadc 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -112,7 +112,8 @@
     <!-- Dialer -->
     <string name="dialer">電話</string>
     <string name="calling">発信中…</string>
-    <string name="incoming_call">着信中…</string>
+    <string name="incoming_call">Incoming call</string>
+    <string name="incoming_call_from">着信中…</string>
     <string name="ongoing_call">通話中</string>
     <string name="disconnected">切断されました</string>
 
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 4b92dc52..b3358004 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -112,7 +112,8 @@
     <!-- Dialer -->
     <string name="dialer">Dialer</string>
     <string name="calling">Calling…</string>
-    <string name="incoming_call">Incoming call from…</string>
+    <string name="incoming_call">Incoming call</string>
+    <string name="incoming_call_from">Incoming call from…</string>
     <string name="ongoing_call">Ongoing call</string>
     <string name="disconnected">Disconnected</string>
 
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index ffa82445..4e0bf374 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -112,7 +112,8 @@
     <!-- Dialer -->
     <string name="dialer">Dialer</string>
     <string name="calling">Calling…</string>
-    <string name="incoming_call">Incoming call from…</string>
+    <string name="incoming_call">Incoming call</string>
+    <string name="incoming_call_from">Incoming call from…</string>
     <string name="ongoing_call">Ongoing call</string>
     <string name="disconnected">Disconnected</string>
 
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 6955b055..8ab1755d 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -112,7 +112,8 @@
     <!-- Dialer -->
     <string name="dialer">Dialer</string>
     <string name="calling">Calling…</string>
-    <string name="incoming_call">Incoming call from…</string>
+    <string name="incoming_call">Incoming call</string>
+    <string name="incoming_call_from">Incoming call from…</string>
     <string name="ongoing_call">Ongoing call</string>
     <string name="disconnected">Disconnected</string>
 
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 58ed2acb..03858e08 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -112,7 +112,8 @@
     <!-- Dialer -->
     <string name="dialer">Dialer</string>
     <string name="calling">Calling…</string>
-    <string name="incoming_call">Incoming call from…</string>
+    <string name="incoming_call">Incoming call</string>
+    <string name="incoming_call_from">Incoming call from…</string>
     <string name="ongoing_call">Ongoing call</string>
     <string name="disconnected">Disconnected</string>
 
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 3b5d5d52..573b5fce 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -112,7 +112,8 @@
     <!-- Dialer -->
     <string name="dialer">Telefón</string>
     <string name="calling">Vytáča sa…</string>
-    <string name="incoming_call">Prichádzajúci hovor od…</string>
+    <string name="incoming_call">Prichádzajúci hovor</string>
+    <string name="incoming_call_from">Prichádzajúci hovor od…</string>
     <string name="ongoing_call">Prebiehajúci hovor</string>
     <string name="disconnected">Ukončený hovor</string>
 
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 584a565c..c3812c87 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -112,7 +112,8 @@
     <!-- Dialer -->
     <string name="dialer">Dialer</string>
     <string name="calling">Calling…</string>
-    <string name="incoming_call">Incoming call from…</string>
+    <string name="incoming_call">Incoming call</string>
+    <string name="incoming_call_from">Incoming call from…</string>
     <string name="ongoing_call">Ongoing call</string>
     <string name="disconnected">Disconnected</string>
 
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index f592c335..98b4545c 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -112,7 +112,8 @@
     <!-- Dialer -->
     <string name="dialer">Dialer</string>
     <string name="calling">Calling…</string>
-    <string name="incoming_call">Incoming call from…</string>
+    <string name="incoming_call">Incoming call</string>
+    <string name="incoming_call_from">Incoming call from…</string>
     <string name="ongoing_call">Ongoing call</string>
     <string name="disconnected">Disconnected</string>
 
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index aef6a641..b82025d5 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -112,7 +112,8 @@
     <!-- Dialer -->
     <string name="dialer">Dialer</string>
     <string name="calling">Calling…</string>
-    <string name="incoming_call">Incoming call from…</string>
+    <string name="incoming_call">Incoming call</string>
+    <string name="incoming_call_from">Incoming call from…</string>
     <string name="ongoing_call">Ongoing call</string>
     <string name="disconnected">Disconnected</string>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0782d38f..688609fb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -112,7 +112,8 @@
     <!-- Dialer -->
     <string name="dialer">Dialer</string>
     <string name="calling">Calling…</string>
-    <string name="incoming_call">Incoming call from…</string>
+    <string name="incoming_call">Incoming call</string>
+    <string name="incoming_call_from">Incoming call from…</string>
     <string name="ongoing_call">Ongoing call</string>
     <string name="disconnected">Disconnected</string>