diff --git a/android/app/src/main/java/chat/rocket/reactnative/notification/CustomPushNotification.java b/android/app/src/main/java/chat/rocket/reactnative/notification/CustomPushNotification.java index 622c44415b9..8d0a0855665 100644 --- a/android/app/src/main/java/chat/rocket/reactnative/notification/CustomPushNotification.java +++ b/android/app/src/main/java/chat/rocket/reactnative/notification/CustomPushNotification.java @@ -51,7 +51,9 @@ public class CustomPushNotification { public static final String KEY_REPLY = "KEY_REPLY"; public static final String NOTIFICATION_ID = "NOTIFICATION_ID"; private static final String CHANNEL_ID = "rocketchatrn_channel_01"; - private static final String CHANNEL_NAME = "All"; + private static final String CHANNEL_NAME = "Messages"; + private static final String CALLS_CHANNEL_ID = "rocketchatrn_channel_calls"; + private static final String CALLS_CHANNEL_NAME = "Calls"; // Instance fields private final Context mContext; @@ -299,13 +301,19 @@ private void postNotification(int notificationId) { private void createNotificationChannel() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - NotificationChannel channel = new NotificationChannel( + NotificationChannel messagesChannel = new NotificationChannel( CHANNEL_ID, CHANNEL_NAME, NotificationManager.IMPORTANCE_HIGH ); + NotificationChannel callsChannel = new NotificationChannel( + CALLS_CHANNEL_ID, + CALLS_CHANNEL_NAME, + NotificationManager.IMPORTANCE_HIGH + ); if (notificationManager != null) { - notificationManager.createNotificationChannel(channel); + notificationManager.createNotificationChannel(messagesChannel); + notificationManager.createNotificationChannel(callsChannel); } } } diff --git a/app/i18n/locales/ar.json b/app/i18n/locales/ar.json index 4c7d4e981f5..d3f0f06ead8 100644 --- a/app/i18n/locales/ar.json +++ b/app/i18n/locales/ar.json @@ -586,6 +586,7 @@ "topic": "عنوان", "Translate": "ترجمة", "Travel_and_places": "السفر والأماكن", + "Troubleshooting": "استكشاف الأخطاء وإصلاحها", "Try_again": "حاول مجدداً", "Turn_camera_off": "إيقاف تشغيل الكاميرا", "Turn_camera_on": "تشغيل الكاميرا", diff --git a/app/i18n/locales/bn-IN.json b/app/i18n/locales/bn-IN.json index adbabf44f03..08e8136458c 100644 --- a/app/i18n/locales/bn-IN.json +++ b/app/i18n/locales/bn-IN.json @@ -812,6 +812,7 @@ "totp-invalid": "কোড বা পাসওয়ার্ড অবৈধ", "Translate": "অনুবাদ করুন", "Travel_and_places": "ভ্রমণ এবং স্থানসমূহ", + "Troubleshooting": "সমস্যা সমাধান", "Try_again": "আবার চেষ্টা করুন", "Turn_camera_off": "ক্যামেরা বন্ধ করুন", "Turn_camera_on": "ক্যামেরা চালু করুন", diff --git a/app/i18n/locales/cs.json b/app/i18n/locales/cs.json index c72606b7b7c..02daaec45dc 100644 --- a/app/i18n/locales/cs.json +++ b/app/i18n/locales/cs.json @@ -660,7 +660,6 @@ "Push_gateway_not_connected_description": "Nemůžeme se připojit k bráně push. Pokud problém přetrvává, obraťte se na správce pracovního prostoru.", "Push_Notifications": "Oznámení push", "Push_Notifications_Alert_Info": "Tato oznámení se vám doručují, když aplikace není otevřená", - "Push_Troubleshooting": "Odstraňování problémů push", "Queued_chats": "Chaty ve frontě", "Quote": "Citát", "React_with_emojjname": "Reagujte pomocí {{emojiName}}", diff --git a/app/i18n/locales/de.json b/app/i18n/locales/de.json index e0d6cccb2c7..da3a501e4eb 100644 --- a/app/i18n/locales/de.json +++ b/app/i18n/locales/de.json @@ -805,6 +805,7 @@ "totp-invalid": "Code oder Passwort ist falsch", "Translate": "Übersetzen", "Travel_and_places": "Reisen und Orte", + "Troubleshooting": "Fehlerbehebung", "Try_again": "Versuchen Sie es nochmal", "Turn_camera_off": "Kamera ausschalten", "Turn_camera_on": "Kamera einschalten", diff --git a/app/i18n/locales/en.json b/app/i18n/locales/en.json index 039513dbe47..67b42dd4f35 100644 --- a/app/i18n/locales/en.json +++ b/app/i18n/locales/en.json @@ -683,7 +683,6 @@ "Push_gateway_not_connected_description": "We're not able to connect to the push gateway. If this issue persists please check with your workspace administrator.", "Push_Notifications": "Push notifications", "Push_Notifications_Alert_Info": "These notifications are delivered to you when the app is not open", - "Push_Troubleshooting": "Push Troubleshooting", "Queued_chats": "Queued chats", "Quote": "Quote", "React_with_emojjname": "React with {{emojiName}}", diff --git a/app/i18n/locales/es.json b/app/i18n/locales/es.json index 412ec836ec0..b9f9b115942 100644 --- a/app/i18n/locales/es.json +++ b/app/i18n/locales/es.json @@ -429,6 +429,7 @@ "topic": "asunto", "Translate": "Traducir", "Travel_and_places": "Viajes y lugares", + "Troubleshooting": "Resolución de problemas", "Try_again": "Intentar de nuevo", "Turn_camera_off": "Apagar cámara", "Turn_camera_on": "Activar cámara", diff --git a/app/i18n/locales/fi.json b/app/i18n/locales/fi.json index e9364eea46f..eac021ef811 100644 --- a/app/i18n/locales/fi.json +++ b/app/i18n/locales/fi.json @@ -780,6 +780,7 @@ "totp-invalid": "Koodi tai salasana virheellinen", "Translate": "Käännä", "Travel_and_places": "Matkustaminen ja paikat", + "Troubleshooting": "Vianmääritys", "Try_again": "Yritä uudelleen", "Turn_camera_off": "Sammuta kamera", "Turn_camera_on": "Kytke kamera päälle", diff --git a/app/i18n/locales/fr.json b/app/i18n/locales/fr.json index 7baca0dd463..6c2553a5368 100644 --- a/app/i18n/locales/fr.json +++ b/app/i18n/locales/fr.json @@ -711,6 +711,7 @@ "topic": "sujet", "Translate": "Traduire", "Travel_and_places": "Voyage et lieux", + "Troubleshooting": "Dépannage", "Try_again": "Réessayer", "Turn_camera_off": "Éteindre la caméra", "Turn_camera_on": "Allumer la caméra", diff --git a/app/i18n/locales/hi-IN.json b/app/i18n/locales/hi-IN.json index 4cb02297c70..f195ab6507c 100644 --- a/app/i18n/locales/hi-IN.json +++ b/app/i18n/locales/hi-IN.json @@ -812,6 +812,7 @@ "totp-invalid": "कोड या पासवर्ड अमान्य", "Translate": "अनुवाद करें", "Travel_and_places": "यात्रा और स्थान", + "Troubleshooting": "समस्या निवारण", "Try_again": "फिर कोशिश करें", "Turn_camera_off": "कैमरा बंद करें", "Turn_camera_on": "कैमरा चालू करें", diff --git a/app/i18n/locales/hu.json b/app/i18n/locales/hu.json index 06cca380dbe..e0b47b300b4 100644 --- a/app/i18n/locales/hu.json +++ b/app/i18n/locales/hu.json @@ -814,6 +814,7 @@ "totp-invalid": "A kód vagy a jelszó érvénytelen", "Translate": "Fordítás", "Travel_and_places": "Utazás és helyek", + "Troubleshooting": "Hibaelhárítás", "Try_again": "Próbálja újra", "Turn_camera_off": "Kapcsolja ki a kamerát", "Turn_camera_on": "Kapcsolja be a kamerát", diff --git a/app/i18n/locales/it.json b/app/i18n/locales/it.json index c3d380f8390..ca07485b17f 100644 --- a/app/i18n/locales/it.json +++ b/app/i18n/locales/it.json @@ -623,6 +623,7 @@ "topic": "argomento", "Translate": "Traduci", "Travel_and_places": "Viaggi e luoghi", + "Troubleshooting": "Risoluzione dei problemi", "Try_again": "Riprova", "Turn_camera_off": "Disattiva la fotocamera", "Turn_camera_on": "Accendi la fotocamera", diff --git a/app/i18n/locales/ja.json b/app/i18n/locales/ja.json index c8566ebc041..61615d8ab9d 100644 --- a/app/i18n/locales/ja.json +++ b/app/i18n/locales/ja.json @@ -517,6 +517,7 @@ "topic": "トピック", "Translate": "翻訳", "Travel_and_places": "旅行と場所", + "Troubleshooting": "トラブルシューティング", "Try_again": "再度お試しください。", "Turn_camera_off": "カメラをオフにする", "Turn_camera_on": "カメラをオンにする", diff --git a/app/i18n/locales/nl.json b/app/i18n/locales/nl.json index be0c1769e00..4db1b18ab35 100644 --- a/app/i18n/locales/nl.json +++ b/app/i18n/locales/nl.json @@ -711,6 +711,7 @@ "topic": "onderwerp", "Translate": "Vertalen", "Travel_and_places": "Reizen en plaatsen", + "Troubleshooting": "Probleemoplossing", "Try_again": "Probeer het opnieuw", "Turn_camera_off": "Camera uitzetten", "Turn_camera_on": "Camera inschakelen", diff --git a/app/i18n/locales/no.json b/app/i18n/locales/no.json index abbc7f10c06..26ce330af4f 100644 --- a/app/i18n/locales/no.json +++ b/app/i18n/locales/no.json @@ -648,7 +648,6 @@ "Push_gateway_not_connected_description": "Vi kan ikke koble til push-gatewayen. Hvis dette problemet vedvarer, sjekk med serveradministratoren din.", "Push_Notifications": "Push-varsler", "Push_Notifications_Alert_Info": "Disse varslene leveres til deg når appen ikke er åpen", - "Push_Troubleshooting": "Push feilsøking", "Queued_chats": "Chatter i kø", "Quote": "Sitere", "Reactions_are_disabled": "Reaksjoner er deaktivert", diff --git a/app/i18n/locales/pt-BR.json b/app/i18n/locales/pt-BR.json index 9fa76800393..b496fe3dce9 100644 --- a/app/i18n/locales/pt-BR.json +++ b/app/i18n/locales/pt-BR.json @@ -671,7 +671,6 @@ "Push_gateway_not_connected_description": "Não conseguimos conectar ao gateway de push. Se esse problema persistir, por favor, verifique com o administrador do seu workspace.", "Push_Notifications": "Notificações push", "Push_Notifications_Alert_Info": "Essas notificações são entregues a você quando o aplicativo não está aberto", - "Push_Troubleshooting": "Solucionar Problemas de Push", "Queued_chats": "Bate-papos na fila", "Quote": "Citar", "React_with_emojjname": "Reagir com {{emojiName}}", @@ -887,6 +886,7 @@ "totp-invalid": "Código ou senha inválida", "Translate": "Traduzir", "Travel_and_places": "Viagem e lugares", + "Troubleshooting": "Resolução de Problemas", "Try_again": "Tentar novamente", "Turn_camera_off": "Desligar câmera", "Turn_camera_on": "Ligar câmera", diff --git a/app/i18n/locales/pt-PT.json b/app/i18n/locales/pt-PT.json index 883d679b1b5..2d54ffe2e2a 100644 --- a/app/i18n/locales/pt-PT.json +++ b/app/i18n/locales/pt-PT.json @@ -497,6 +497,7 @@ "Topic": "Tópico", "topic": "tópico", "Travel_and_places": "Viagens e locais", + "Troubleshooting": "Resolução de problemas", "Try_again": "Tente novamente", "Turn_camera_off": "Desligar câmara", "Turn_camera_on": "Ligar câmara", diff --git a/app/i18n/locales/ru.json b/app/i18n/locales/ru.json index 94f904bcd0c..4be49e854cd 100644 --- a/app/i18n/locales/ru.json +++ b/app/i18n/locales/ru.json @@ -757,6 +757,7 @@ "totp-invalid": "Код или пароль не верны", "Translate": "Перевести", "Travel_and_places": "Путешествия и места", + "Troubleshooting": "Траблшутинг", "Try_again": "Попробуйте еще раз", "Turn_camera_off": "Отключить камеру", "Turn_camera_on": "Включить камеру", diff --git a/app/i18n/locales/sl-SI.json b/app/i18n/locales/sl-SI.json index c1cab9db8ac..9a00afbaacc 100644 --- a/app/i18n/locales/sl-SI.json +++ b/app/i18n/locales/sl-SI.json @@ -726,6 +726,7 @@ "totp-invalid": "Koda ali geslo neveljavno", "Translate": "Prevesti", "Travel_and_places": "Potovanja in kraji", + "Troubleshooting": "Odpravljanje težav", "Try_again": "Poskusi ponovno", "Turn_camera_off": "Izklopi kamero", "Turn_camera_on": "Vklopi kamero", diff --git a/app/i18n/locales/sv.json b/app/i18n/locales/sv.json index bc8a1477b60..d7b9eb49621 100644 --- a/app/i18n/locales/sv.json +++ b/app/i18n/locales/sv.json @@ -779,6 +779,7 @@ "totp-invalid": "Koden eller lösenordet är ogiltigt", "Translate": "Översätt", "Travel_and_places": "Resor och platser", + "Troubleshooting": "Felsökning", "Try_again": "Försök igen", "Turn_camera_off": "Stäng av kameran", "Turn_camera_on": "Aktivera kameran", diff --git a/app/i18n/locales/ta-IN.json b/app/i18n/locales/ta-IN.json index 2905ddd5b06..173540f51cc 100644 --- a/app/i18n/locales/ta-IN.json +++ b/app/i18n/locales/ta-IN.json @@ -812,6 +812,7 @@ "totp-invalid": "குறியீடு அல்லது கடவுச்சொல் தவறானது", "Translate": "மொழிபெயர்", "Travel_and_places": "பயணம் மற்றும் இடங்கள்", + "Troubleshooting": "திருத்தல்", "Try_again": "மீண்டும் முயற்சி செய்", "Turn_camera_off": "கேமராவை அணைக்கவும்", "Turn_camera_on": "கேமராவை இயக்கவும்", diff --git a/app/i18n/locales/te-IN.json b/app/i18n/locales/te-IN.json index 1de4179998e..63300c882a6 100644 --- a/app/i18n/locales/te-IN.json +++ b/app/i18n/locales/te-IN.json @@ -811,6 +811,7 @@ "totp-invalid": "కోడ్ లేదా పాస్‌వర్డ్ చెల్లదు", "Translate": "అనువాదం", "Travel_and_places": "ప్రయాణం మరియు స్థలాలు", + "Troubleshooting": "సమస్యా పరిష్కారం", "Try_again": "ప్రయత్నించండి", "Turn_camera_off": "కెమెరాను ఆపివెయ్యి", "Turn_camera_on": "కెమెరాను ఆన్ చేయండి", diff --git a/app/i18n/locales/tr.json b/app/i18n/locales/tr.json index e9bc1da6318..e7fc5eeb4c3 100644 --- a/app/i18n/locales/tr.json +++ b/app/i18n/locales/tr.json @@ -606,6 +606,7 @@ "topic": "konu", "Translate": "Çevir", "Travel_and_places": "Seyahat ve yerler", + "Troubleshooting": "Sorun giderme", "Try_again": "Tekrar deneyin", "Turn_camera_off": "Kamerayı kapat", "Turn_camera_on": "Kamerayı aç", diff --git a/app/i18n/locales/zh-CN.json b/app/i18n/locales/zh-CN.json index 9b12af2c1fd..fc79053e189 100644 --- a/app/i18n/locales/zh-CN.json +++ b/app/i18n/locales/zh-CN.json @@ -578,6 +578,7 @@ "topic": "主题", "Translate": "翻译", "Travel_and_places": "旅行和地点", + "Troubleshooting": "故障排除", "Try_again": "再试一次", "Turn_camera_off": "关闭摄像头", "Turn_camera_on": "打开摄像头", diff --git a/app/i18n/locales/zh-TW.json b/app/i18n/locales/zh-TW.json index 8b19135f6fe..9d8b44f1eec 100644 --- a/app/i18n/locales/zh-TW.json +++ b/app/i18n/locales/zh-TW.json @@ -606,6 +606,7 @@ "topic": "主題", "Translate": "翻譯", "Travel_and_places": "旅遊與地點", + "Troubleshooting": "疑難排解", "Try_again": "再試一次", "Turn_camera_off": "關閉相機", "Turn_camera_on": "開啟攝影機", diff --git a/app/views/PushTroubleshootView/index.tsx b/app/views/PushTroubleshootView/index.tsx index 328de71ecbc..98412977704 100644 --- a/app/views/PushTroubleshootView/index.tsx +++ b/app/views/PushTroubleshootView/index.tsx @@ -28,7 +28,7 @@ const PushTroubleshootView = ({ navigation }: IPushTroubleshootViewProps): JSX.E useEffect(() => { navigation.setOptions({ - title: I18n.t('Push_Troubleshooting') + title: I18n.t('Troubleshooting') }); }, [navigation]);