Merge branch 'develop' into modal-container-style

Author: Rohit3523

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);
             }
         }
     }

app/i18n/locales/ar.json

@@ -586,6 +586,7 @@
   "topic": "عنوان",
   "Translate": "ترجمة",
   "Travel_and_places": "السفر والأماكن",
+  "Troubleshooting": "استكشاف الأخطاء وإصلاحها",
   "Try_again": "حاول مجدداً",
   "Turn_camera_off": "إيقاف تشغيل الكاميرا",
   "Turn_camera_on": "تشغيل الكاميرا",

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": "ক্যামেরা চালু করুন",

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}}",

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",

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}}",

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",

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",

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",

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": "कैमरा चालू करें",