Added localization support to channel syncing

Author: jkasten2

OneSignalSDK/onesignal/src/main/java/com/onesignal/NotificationChannelManager.java

@@ -89,6 +89,8 @@ static String createNotificationChannel(Context context, JSONObject jsonPayload)
       return DEFAULT_CHANNEL_ID;
    }
 
+   // Creates NotificationChannel and NotificationChannelGroup based on a json payload.
+   // Returns channel id after it is created.
    // Language dependent fields will be passed localized
    @RequiresApi(api = Build.VERSION_CODES.O)
    private static String createChannel(Context context, NotificationManager notificationManager, JSONObject payload) throws JSONException {
@@ -99,14 +101,23 @@ private static String createChannel(Context context, NotificationManager notific
       if (channel_id.equals(NotificationChannel.DEFAULT_CHANNEL_ID))
          channel_id = DEFAULT_CHANNEL_ID;
 
-      String channel_name = channelPayload.optString("nm", "Miscellaneous");
+      JSONObject payloadWithText = channelPayload;
+      if (channelPayload.has("langs")) {
+         JSONObject langList = channelPayload.getJSONObject("langs");
+         String deviceLanguage = OSUtils.getCorrectedLanguage();
+         if (langList.has(deviceLanguage))
+            payloadWithText = langList.optJSONObject(deviceLanguage);
+      }
+      
+      String channel_name = payloadWithText.optString("nm", "Miscellaneous");
 
       int importance = priorityToImportance(payload.optInt("pri", 6));
       NotificationChannel channel = new NotificationChannel(channel_id, channel_name, importance);
+      channel.setDescription(payloadWithText.optString("dscr", null));
 
       if (channelPayload.has("grp_id")) {
          String group_id = channelPayload.optString("grp_id");
-         CharSequence group_name = channelPayload.optString("grp_nm");
+         CharSequence group_name = payloadWithText.optString("grp_nm");
          notificationManager.createNotificationChannelGroup(new NotificationChannelGroup(group_id, group_name));
          channel.setGroup(group_id);
       }
@@ -169,7 +180,7 @@ static void processChannelList(Context context, JSONObject payload) {
 
       NotificationManager notificationManager =
          (NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE);
-
+      
       Set<String> sycnedChannelSet = new HashSet<>();
       JSONArray chnlList = payload.optJSONArray("chnl_lst");
       int jsonArraySize = chnlList.length();

OneSignalSDK/unittest/src/test/java/com/test/onesignal/NotificationChannelManagerRunner.java

@@ -22,6 +22,7 @@
 import org.robolectric.android.controller.ActivityController;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLog;
+import org.robolectric.shadows.ShadowNotificationManager;
 
 import static com.onesignal.OneSignalPackagePrivateHelper.NotificationChannelManager_createNotificationChannel;
 import static com.onesignal.OneSignalPackagePrivateHelper.NotificationChannelManager_processChannelList;
@@ -93,12 +94,13 @@ public void createNotificationChannelCreateBasicChannel() throws Exception {
    }
 
    @Test
-   public void createNotificationChannelWithALlOptionsl() throws Exception {
+   public void createNotificationChannelWithALlOptions() throws Exception {
       JSONObject payload = new JSONObject();
       JSONObject chnl = new JSONObject();
 
       chnl.put("id", "test_id");
       chnl.put("nm", "Test Name");
+      chnl.put("dscr", "Some description");
       chnl.put("grp_id", "grp_id");
       chnl.put("grp_nm", "Group Name");
 
@@ -120,6 +122,7 @@ public void createNotificationChannelWithALlOptionsl() throws Exception {
       assertEquals("test_id", ret);
       assertEquals("test_id", ShadowRoboNotificationManager.lastChannel.getId());
       assertEquals("Test Name", channel.getName());
+      assertEquals("Some description", channel.getDescription());
       assertEquals("grp_id", channel.getGroup());
       NotificationChannelGroup group = ShadowRoboNotificationManager.lastChannelGroup;
       assertEquals("grp_id", group.getId());
@@ -194,6 +197,35 @@ public void processPayloadDeletingOldChannel() throws Exception {
       assertChannelsForBasicChannelList();
    }
 
+   // Test that specific "en" defined keys name and descriptions are used when
+   //    the device language is English.
+   // Top level keys under no language key are considered the default language.
+   @Test
+   public void processChannelListWithMultiLanguage() throws Exception {
+      JSONObject payload = createBasicChannelListPayload();
+   
+      JSONObject channelItem = (JSONObject)payload.optJSONArray("chnl_lst").get(0);
+      JSONObject channelProperties = channelItem.optJSONObject("chnl");
+      
+      // Add "langs" key with a "en" sub key.
+      JSONObject langs = new JSONObject();
+      JSONObject en = new JSONObject();
+      en.put("nm", "en_nm");
+      en.put("dscr", "en_dscr");
+      en.put("grp_nm", "en_grp_nm");
+      langs.put("en", en);
+      channelProperties.put("langs", langs);
+      
+      channelProperties.put("grp_id", "grp_id1");
+   
+      NotificationChannelManager_processChannelList(blankActivity, payload);
+      
+      NotificationChannel channel = getChannel("OS_id1");
+      assertEquals("en_nm", channel.getName());
+      assertEquals("en_dscr", channel.getDescription());
+      assertEquals("en_grp_nm", ShadowRoboNotificationManager.lastChannelGroup.getName());
+   }
+   
    JSONObject createBasicChannelListPayload() throws JSONException {
       createChannel("local_existing_id");
       createChannel("OS_existing_id");