From e661d5b7ada261102bea7cbf5950a7d40f64c514 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 20 Apr 2020 12:19:34 +0200
Subject: [PATCH] provide deep link from settings into call notification
 settings

---
 .../services/NotificationService.java           |  2 --
 .../conversations/utils/Compatibility.java      |  7 +++++--
 src/main/res/values-ar/strings.xml              |  2 +-
 src/main/res/values-bg/strings.xml              |  2 +-
 src/main/res/values-de/strings.xml              |  2 +-
 src/main/res/values-el/strings.xml              |  2 +-
 src/main/res/values-es/strings.xml              |  2 +-
 src/main/res/values-eu/strings.xml              |  2 +-
 src/main/res/values-fr/strings.xml              |  2 +-
 src/main/res/values-gl/strings.xml              |  2 +-
 src/main/res/values-hu/strings.xml              |  2 +-
 src/main/res/values-it/strings.xml              |  2 +-
 src/main/res/values-nl/strings.xml              |  2 +-
 src/main/res/values-pl/strings.xml              |  2 +-
 src/main/res/values-pt-rBR/strings.xml          |  2 +-
 src/main/res/values-ro-rRO/strings.xml          |  2 +-
 src/main/res/values-ru/strings.xml              |  2 +-
 src/main/res/values-sr/strings.xml              |  2 +-
 src/main/res/values-uk/strings.xml              |  2 +-
 src/main/res/values-zh-rCN/strings.xml          |  2 +-
 src/main/res/values/strings.xml                 |  5 +++--
 src/main/res/xml/preferences.xml                | 17 +++++++++++++++--
 22 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java
index ee35e00a8..c4a0fe2e4 100644
--- a/src/main/java/eu/siacs/conversations/services/NotificationService.java
+++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java
@@ -404,8 +404,6 @@ public class NotificationService {
         fullScreenIntent.putExtra(RtpSessionActivity.EXTRA_ACCOUNT, id.account.getJid().asBareJid().toEscapedString());
         fullScreenIntent.putExtra(RtpSessionActivity.EXTRA_WITH, id.with.toEscapedString());
         fullScreenIntent.putExtra(RtpSessionActivity.EXTRA_SESSION_ID, id.sessionId);
-        //fullScreenIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        //fullScreenIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         return PendingIntent.getActivity(mXmppConnectionService, requestCode, fullScreenIntent, PendingIntent.FLAG_UPDATE_CURRENT);
     }
 
diff --git a/src/main/java/eu/siacs/conversations/utils/Compatibility.java b/src/main/java/eu/siacs/conversations/utils/Compatibility.java
index 3389d7519..13e38e487 100644
--- a/src/main/java/eu/siacs/conversations/utils/Compatibility.java
+++ b/src/main/java/eu/siacs/conversations/utils/Compatibility.java
@@ -33,7 +33,10 @@ public class Compatibility {
             "vibrate_on_notification",
             "call_ringtone"
     );
-    private static final List<String> UNUESD_SETTINGS_PRE_TWENTYSIX = Collections.singletonList("more_notification_settings");
+    private static final List<String> UNUESD_SETTINGS_PRE_TWENTYSIX = Arrays.asList(
+            "message_notification_settings",
+            "call_notification_settings"
+    );
 
 
     public static boolean hasStoragePermission(Context context) {
@@ -133,7 +136,7 @@ public class Compatibility {
                 context.startService(intent);
             }
         } catch (RuntimeException e) {
-            Log.d(Config.LOGTAG, context.getClass().getSimpleName()+" was unable to start service");
+            Log.d(Config.LOGTAG, context.getClass().getSimpleName() + " was unable to start service");
         }
     }
 }
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 5673a3a17..2f8560ad1 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -652,7 +652,7 @@
   <string name="error_channel_name">مشاكل إتّصال</string>
   <string name="notification_group_messages">رسائل</string>
   <string name="messages_channel_name">رسائل</string>
-  <string name="pref_more_notification_settings">إعدادات الإشعار</string>
+  <string name="pref_message_notification_settings">إعدادات الإشعار</string>
   <string name="pref_more_notification_settings_summary">الأهمية ، الصوت ، الإهتزاز</string>
   <string name="video_compression_channel_name">ضغط الفيديو</string>
   <string name="view_media">اعرض الوسائط</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index da9c5917d..7990bc0a2 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -700,7 +700,7 @@
   <string name="messages_channel_name">Съобщения</string>
   <string name="silent_messages_channel_name">Тихи съобщения</string>
   <string name="silent_messages_channel_description">Тази категория известия се използва за показване на известия, които не бива да изпълняват звук. Това може да се използва, например, докато използвате друго устройство (по време на Период на пренебрегване).</string>
-  <string name="pref_more_notification_settings">Настройки за известията</string>
+  <string name="pref_message_notification_settings">Настройки за известията</string>
   <string name="pref_more_notification_settings_summary">Важност, звук, вибрация</string>
   <string name="video_compression_channel_name">Компресия на видеото</string>
   <string name="view_media">Преглед на медийното съдържание</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 89bd2c179..66001a36e 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -749,7 +749,7 @@
   <string name="messages_channel_name">Nachrichten</string>
   <string name="silent_messages_channel_name">Lautlose Nachrichten</string>
   <string name="silent_messages_channel_description">Diese Benachrichtigungsart wird verwendet, um Benachrichtigungen anzuzeigen, die keinen Ton auslösen sollen. Zum Beispiel, wenn du auf einem anderen Gerät aktiv bist (Schonfrist).</string>
-  <string name="pref_more_notification_settings">Benachrichtigungseinstellungen</string>
+  <string name="pref_message_notification_settings">Benachrichtigungseinstellungen</string>
   <string name="pref_more_notification_settings_summary">Wichtigkeit, Klang, Vibrationen</string>
   <string name="video_compression_channel_name">Video komprimieren</string>
   <string name="view_media">Medien anzeigen</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index d41cf52e2..419912371 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -748,7 +748,7 @@
   <string name="messages_channel_name">Μηνύματα</string>
   <string name="silent_messages_channel_name">Σιωπηρά μηνύματα</string>
   <string name="silent_messages_channel_description">Αυτή η κατηγορία ειδοποιήσεων χρησιμοποιείται για να εμφανίσει ειδοποιήσεις που δεν θα έπρεπε να παράγουν ήχο. Για παράδειγμα όταν κάποιος είναι ενεργός σε άλλη συσκευή (περίοδος χάριτος).</string>
-  <string name="pref_more_notification_settings">Ρυθμίσεις ειδοποίησης</string>
+  <string name="pref_message_notification_settings">Ρυθμίσεις ειδοποίησης</string>
   <string name="pref_more_notification_settings_summary">Σημασία, Ήχος, Δόνηση</string>
   <string name="video_compression_channel_name">Συμπίεση βίντεο</string>
   <string name="view_media">Εμφάνιση μέσου</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index d62c8f2a4..c791be90f 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -749,7 +749,7 @@
   <string name="messages_channel_name">Mensajes</string>
   <string name="silent_messages_channel_name">Mensajes sin sonido</string>
   <string name="silent_messages_channel_description">Este grupo de notificaciones se usa para mostrar notificaciones que no deberían emitir ningún sonido. Por ejemplo, cuando estás activo en otro dispositivo (periodo de gracia).</string>
-  <string name="pref_more_notification_settings">Ajustes de Notificación</string>
+  <string name="pref_message_notification_settings">Ajustes de Notificación</string>
   <string name="pref_more_notification_settings_summary">Importancia, Sonido, Vibración</string>
   <string name="video_compression_channel_name">Compresión de video</string>
   <string name="view_media">Ver galería</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 2e841f7f3..823d559b3 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -741,7 +741,7 @@
   <string name="messages_channel_name">Mezuak</string>
   <string name="silent_messages_channel_name">Mezu isilak</string>
   <string name="silent_messages_channel_description">Jakinarazpen talde hau inolako soinurik egin beharko ez luketen jakinarazpenak erakusteko erabiltze da. Adibidez beste gailu batean aktibo zaudenean (grazia epea).</string>
-  <string name="pref_more_notification_settings">Jakinarazpenen ezarpenak</string>
+  <string name="pref_message_notification_settings">Jakinarazpenen ezarpenak</string>
   <string name="pref_more_notification_settings_summary">Garrantzia, soinua, dardara</string>
   <string name="video_compression_channel_name">Bideoen konprimatzea</string>
   <string name="view_media">Ikusi multimedia</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 37978425b..71abbac9c 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -749,7 +749,7 @@
   <string name="messages_channel_name">Messages</string>
   <string name="silent_messages_channel_name">Messages silencieux</string>
   <string name="silent_messages_channel_description">Ce groupe de notifications est utilisé pour afficher les notifications qui ne doivent pas émettre de son. Par exemple, lorsque le son est activé sur un autre appareil (délai de grâce).</string>
-  <string name="pref_more_notification_settings">Options de notification</string>
+  <string name="pref_message_notification_settings">Options de notification</string>
   <string name="pref_more_notification_settings_summary">Importance, son, vibration</string>
   <string name="video_compression_channel_name">Compression vidéo</string>
   <string name="view_media">Voir les média</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 29250175b..34dc2cfdd 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -749,7 +749,7 @@
   <string name="messages_channel_name">Mensaxes</string>
   <string name="silent_messages_channel_name">Mensaxes acalados</string>
   <string name="silent_messages_channel_description">Este grupo de notificacións é utilizado para mostrar notificacións que non debería activar ningún son. Por exemplo, cando está activo en outro dispositivo (Período de Graza).</string>
-  <string name="pref_more_notification_settings">Axustes das notificacións</string>
+  <string name="pref_message_notification_settings">Axustes das notificacións</string>
   <string name="pref_more_notification_settings_summary">Importancia, Son, Vibrar</string>
   <string name="video_compression_channel_name">Compresión de vídeo</string>
   <string name="view_media">Ver medios</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index d22157e4f..9c9018e39 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -749,7 +749,7 @@
   <string name="messages_channel_name">Üzenetek</string>
   <string name="silent_messages_channel_name">Csendes üzenetek</string>
   <string name="silent_messages_channel_description">Ezt az értesítési csoportot olyan értesítések megjelenítéséhez használják, amelyek nem aktiválhatnak hangot. Például ha aktívvá válik egy másik eszközön (türelmi idő).</string>
-  <string name="pref_more_notification_settings">Értesítési beállítások</string>
+  <string name="pref_message_notification_settings">Értesítési beállítások</string>
   <string name="pref_more_notification_settings_summary">Fontosság, hang, rezgés</string>
   <string name="video_compression_channel_name">Videó tömörítése</string>
   <string name="view_media">Média megtekintése</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 115a22285..13734de4c 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -749,7 +749,7 @@
   <string name="messages_channel_name">Messaggi</string>
   <string name="silent_messages_channel_name">Messaggi silenziosi</string>
   <string name="silent_messages_channel_description">Questo gruppo di notifiche è usato per mostrare notifiche che non devono riprodurre alcun suono. Ad esempio mentre si è attivi su un altro dispositivo (Periodo di grazia).</string>
-  <string name="pref_more_notification_settings">Impostazioni di notifica</string>
+  <string name="pref_message_notification_settings">Impostazioni di notifica</string>
   <string name="pref_more_notification_settings_summary">Importanza, suono, vibrazione</string>
   <string name="video_compression_channel_name">Compressione video</string>
   <string name="view_media">Vedi i media</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 901135d04..97a0920f4 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -745,7 +745,7 @@
   <string name="messages_channel_name">Berichten</string>
   <string name="silent_messages_channel_name">Stille berichten</string>
   <string name="silent_messages_channel_description">Deze meldingscategorie wordt gebruikt om meldingen weer te geven die geen geluid mogen maken. Bijvoorbeeld, indien actief op een ander apparaat (uitstelperiode).</string>
-  <string name="pref_more_notification_settings">Meldingsinstellingen</string>
+  <string name="pref_message_notification_settings">Meldingsinstellingen</string>
   <string name="pref_more_notification_settings_summary">Belang, geluid, trillen</string>
   <string name="video_compression_channel_name">Videocompressie</string>
   <string name="view_media">Media bekijken</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index c20fff766..52ef9bdbf 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -767,7 +767,7 @@ Administrator twojego serwera będzie mógł czytać twoje wiadomości, ale moż
   <string name="messages_channel_name">Wiadomości</string>
   <string name="silent_messages_channel_name">Ciche wiadomości</string>
   <string name="silent_messages_channel_description">Ta kategoria powiadomień jest używana aby wyświetlać powiadomienia które nie powodują żadnych dźwięków. Na przykład w ciągu aktywności na innym urządzeniu (okres karencji).</string>
-  <string name="pref_more_notification_settings">Ustawienia powiadomień</string>
+  <string name="pref_message_notification_settings">Ustawienia powiadomień</string>
   <string name="pref_more_notification_settings_summary">Ważność, Dźwięk, Wibracja</string>
   <string name="video_compression_channel_name">Kompresja wideo</string>
   <string name="view_media">Pokaż media</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 4d29df038..b01d1c3e5 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -749,7 +749,7 @@
   <string name="messages_channel_name">Mensagens</string>
   <string name="silent_messages_channel_name">Silenciar mensagens</string>
   <string name="silent_messages_channel_description">Essa categoria de notificação é utilizada para exibir notificações que não deveriam gerar nenhum som. Por exemplo, quando estiver ativo em outro dispositivo (Período de Espera).</string>
-  <string name="pref_more_notification_settings">Configurações de notificações</string>
+  <string name="pref_message_notification_settings">Configurações de notificações</string>
   <string name="pref_more_notification_settings_summary">Importância, som, vibração.</string>
   <string name="video_compression_channel_name">Compressão de vídeo</string>
   <string name="view_media">Ver mídia</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index df5547c25..dd33608b9 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -759,7 +759,7 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
   <string name="messages_channel_name">Mesaje</string>
   <string name="silent_messages_channel_name">Mesaje silențioase</string>
   <string name="silent_messages_channel_description">Acest grup de notificări este folosit pentru a arăta notificări care nu emit sunete. De exemplu atunci când sunteți activi pe un alt dispozitiv (Perioada de grație).</string>
-  <string name="pref_more_notification_settings">Setări notificări</string>
+  <string name="pref_message_notification_settings">Setări notificări</string>
   <string name="pref_more_notification_settings_summary">Importanță, sunete, vibrații</string>
   <string name="video_compression_channel_name">Compresie video</string>
   <string name="view_media">Vizualizare fișiere media</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 24598898e..e4319355a 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -702,7 +702,7 @@
   <string name="create_dialog_group_chat_name">Название конференции</string>
   <string name="conference_destroyed">Эта конференция была уничтожена</string>
   <string name="error_channel_name">Проблемы с подключением</string>
-  <string name="pref_more_notification_settings">Настройки уведомлений</string>
+  <string name="pref_message_notification_settings">Настройки уведомлений</string>
   <string name="video_compression_channel_name">Сжатие видео</string>
   <string name="view_media">Просмотр медиа</string>
   <string name="group_chat_members">Участники</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index aeabe6c0f..9ca1efb64 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -620,6 +620,6 @@
   <string name="notification_group_messages">Поруке</string>
   <string name="messages_channel_name">Поруке</string>
   <string name="silent_messages_channel_name">Тихе поруке</string>
-  <string name="pref_more_notification_settings">Поставке обавештавања</string>
+  <string name="pref_message_notification_settings">Поставке обавештавања</string>
   <string name="video_compression_channel_name">Видео компресија</string>
 </resources>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 41ed517d1..2fc9fae7b 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -756,7 +756,7 @@
   <string name="messages_channel_name">Повідомлення</string>
   <string name="silent_messages_channel_name">Тихі повідомлення</string>
   <string name="silent_messages_channel_description">Ця група сповіщень показує сповіщення, які не повинні супроводжуватися звуком. Наприклад, у разі активності на іншому пристрої (період очікування).</string>
-  <string name="pref_more_notification_settings">Налаштування сповіщень</string>
+  <string name="pref_message_notification_settings">Налаштування сповіщень</string>
   <string name="pref_more_notification_settings_summary">Важливість, звук, вібрація</string>
   <string name="video_compression_channel_name">Стиснення відео</string>
   <string name="view_media">Перегляд медіа</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 40013308e..a9ca38fbb 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -742,7 +742,7 @@
   <string name="messages_channel_name">消息</string>
   <string name="silent_messages_channel_name">无声消息</string>
   <string name="silent_messages_channel_description">此通知组用于显示不应触发任何声音的通知。 例如，当在另一个设备上激活时（宽限期）。</string>
-  <string name="pref_more_notification_settings">通知设置</string>
+  <string name="pref_message_notification_settings">通知设置</string>
   <string name="pref_more_notification_settings_summary">重要性，声音，振动</string>
   <string name="video_compression_channel_name">视频压缩</string>
   <string name="view_media">查看媒体文件</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 358d768dd..6f7b4a551 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -651,7 +651,7 @@
     <string name="corresponding_conversations_closed">Corresponding conversations closed.</string>
     <string name="contact_blocked_past_tense">Contact blocked.</string>
     <string name="pref_notifications_from_strangers">Notifications from strangers</string>
-    <string name="pref_notifications_from_strangers_summary">Notify for messages received from strangers.</string>
+    <string name="pref_notifications_from_strangers_summary">Notify for messages and calls received from strangers.</string>
     <string name="received_message_from_stranger">Received message from stranger</string>
     <string name="block_stranger">Block stranger</string>
     <string name="block_entire_domain">Block entire domain</string>
@@ -756,7 +756,8 @@
     <string name="ongoing_calls_channel_name">Ongoing calls</string>
     <string name="silent_messages_channel_name">Silent messages</string>
     <string name="silent_messages_channel_description">This notification group is used to display notifications that should not trigger any sound. For example when being active on another device (Grace Period).</string>
-    <string name="pref_more_notification_settings">Notification Settings</string>
+    <string name="pref_message_notification_settings">Message notification settings</string>
+    <string name="pref_incoming_call_notification_settings">Incoming calls notification settings</string>
     <string name="pref_more_notification_settings_summary">Importance, Sound, Vibrate</string>
     <string name="video_compression_channel_name">Video compression</string>
     <string name="view_media">View media</string>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 3ef7b10b2..f2b2943b1 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -101,9 +101,9 @@
             </intent>
         </PreferenceScreen>
         <PreferenceScreen
-            android:key="more_notification_settings"
+            android:key="message_notification_settings"
             android:summary="@string/pref_more_notification_settings_summary"
-            android:title="@string/pref_more_notification_settings">
+            android:title="@string/pref_message_notification_settings">
             <intent android:action="android.settings.CHANNEL_NOTIFICATION_SETTINGS">
                 <extra
                     android:name="android.provider.extra.APP_PACKAGE"
@@ -113,6 +113,19 @@
                     android:value="messages" />
             </intent>
         </PreferenceScreen>
+        <PreferenceScreen
+            android:key="call_notification_settings"
+            android:summary="@string/pref_more_notification_settings_summary"
+            android:title="@string/pref_incoming_call_notification_settings">
+            <intent android:action="android.settings.CHANNEL_NOTIFICATION_SETTINGS">
+                <extra
+                    android:name="android.provider.extra.APP_PACKAGE"
+                    android:value="@string/applicationId" />
+                <extra
+                    android:name="android.provider.extra.CHANNEL_ID"
+                    android:value="incoming_calls" />
+            </intent>
+        </PreferenceScreen>
         <RingtonePreference
             android:defaultValue="@string/notification_ringtone"
             android:key="notification_ringtone"