refactor(push): Add LeanplumNotificationHelper class.

Author: Enuviel

AndroidSDK/src/com/leanplum/Leanplum.java

@@ -843,28 +843,12 @@ public void onResponse(boolean success) {
                   @Override
                   public void run() {
                     try {
-                      NotificationCompat.Builder builder = null;
-                      // If we are targeting API 26, try to post notification to default channel.
-                      if (LeanplumNotificationChannel.isNotificationChannelSupported(context)) {
-                        try {
-                          String channelId = LeanplumNotificationChannel.getDefaultNotificationChannelId(context);
-                          if (!TextUtils.isEmpty(channelId)) {
-                            builder = new NotificationCompat.Builder(context, channelId);
-                          } else {
-                            Log.w("Failed to post notification, there are no notification channels configured.");
-                            return;
-                          }
-                        } catch (Exception e) {
-                          Log.e("Failed to post notification, there are no notification channels configured.");
-                        }
-                      } else {
-                        builder = new NotificationCompat.Builder(context);
-                      }
-
+                      NotificationCompat.Builder builder =
+                          LeanplumNotificationHelper.getDefaultNotificationBuilder(context,
+                              LeanplumNotificationChannel.isNotificationChannelSupported(context));
                       if (builder == null) {
                         return;
                       }
-
                       builder.setSmallIcon(android.R.drawable.star_on)
                           .setContentTitle("Leanplum")
                           .setContentText("Your device is registered.");

AndroidSDK/src/com/leanplum/LeanplumFcmServiceHelper.java

@@ -30,7 +30,7 @@
  *
  * @author Anna Orlova
  */
-public class LeanplumFcmServiceHelper extends IntentService {
+class LeanplumFcmServiceHelper extends IntentService {
   public LeanplumFcmServiceHelper() {
     super("LeanplumFcmServiceHelper");
   }

AndroidSDK/src/com/leanplum/LeanplumNotificationHelper.java

@@ -0,0 +1,86 @@
+/*
+ * Copyright 2017, Leanplum, Inc. All rights reserved.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.leanplum;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.v4.app.NotificationCompat;
+import android.text.TextUtils;
+
+import com.leanplum.internal.JsonConverter;
+import com.leanplum.internal.Log;
+
+import java.util.Map;
+
+/**
+ * LeanplumNotificationHelper class.
+ *
+ * @author Anna Orlova
+ */
+class LeanplumNotificationHelper {
+
+  // NotificationCompat.Builder(Context context) constructor was deprecated in API level 26.
+  @SuppressWarnings("deprecation")
+  static NotificationCompat.Builder getDefaultNotificationBuilder(Context context,
+      boolean isNotificationChannelSupported) {
+    if (!isNotificationChannelSupported) {
+      return new NotificationCompat.Builder(context);
+    }
+    String channelId = LeanplumNotificationChannel.getDefaultNotificationChannelId(context);
+    if (!TextUtils.isEmpty(channelId)) {
+      return new NotificationCompat.Builder(context, channelId);
+    } else {
+      Log.w("Failed to post notification, there are no notification channels configured.");
+      return null;
+    }
+  }
+
+  // NotificationCompat.Builder(Context context) constructor was deprecated in API level 26.
+  @SuppressWarnings("deprecation")
+  static NotificationCompat.Builder getNotificationBuilder(Context context, Bundle message) {
+    NotificationCompat.Builder builder = null;
+    // If we are targeting API 26, try to find supplied channel to post notification.
+    if (LeanplumNotificationChannel.isNotificationChannelSupported(context)) {
+      try {
+        String channel = message.getString("lp_channel");
+        if (!TextUtils.isEmpty(channel)) {
+          // Create channel if it doesn't exist and post notification to that channel.
+          Map<String, Object> channelDetails = JsonConverter.fromJson(channel);
+          String channelId = LeanplumNotificationChannel.createNotificationChannel(context,
+              channelDetails);
+          if (!TextUtils.isEmpty(channelId)) {
+            builder = new NotificationCompat.Builder(context, channelId);
+          } else {
+            Log.w("Failed to post notification to specified channel.");
+          }
+        } else {
+          // If channel isn't supplied, try to look up for default channel.
+          builder = LeanplumNotificationHelper.getDefaultNotificationBuilder(context, true);
+        }
+      } catch (Exception e) {
+        Log.e("Failed to post notification to specified channel.");
+      }
+    } else {
+      builder = new NotificationCompat.Builder(context);
+    }
+    return builder;
+  }
+}

AndroidSDK/src/com/leanplum/LeanplumPushService.java

@@ -318,33 +318,8 @@ private static void showNotification(Context context, Bundle message) {
     if (message.getString("title") != null) {
       title = message.getString("title");
     }
-    NotificationCompat.Builder builder = null;
-
-    // If we are targeting API 26, try to find supplied channel to post notification.
-    if (LeanplumNotificationChannel.isNotificationChannelSupported(context)) {
-      try {
-        String channel = message.getString("lp_channel");
-        if (!TextUtils.isEmpty(channel)) {
-          // Create channel if it doesn't exist and post notification to that channel.
-          Map<String, Object> channelDetails = JsonConverter.fromJson(channel);
-          String channelId = LeanplumNotificationChannel.createNotificationChannel(context, channelDetails);
-          builder = new NotificationCompat.Builder(context, channelId);
-        } else {
-          // If channel isn't supplied, try to look up for default channel.
-          String channelId = LeanplumNotificationChannel.getDefaultNotificationChannelId(context);
-          if (!TextUtils.isEmpty(channelId)) {
-            builder = new NotificationCompat.Builder(context, channelId);
-          } else {
-            Log.w("Failed to post notification, there are no notification channels configured.");
-            return;
-          }
-        }
-      } catch (Exception e) {
-        Log.e("Failed to post notification to specified channel.");
-      }
-    } else {
-      builder = new NotificationCompat.Builder(context);
-    }
+    NotificationCompat.Builder builder =
+        LeanplumNotificationHelper.getNotificationBuilder(context, message);
 
     if (builder == null) {
       return;