Move interruption and priority levels to InterruptionLevel enum

Author: lfkellogg

firebase-appdistribution-api/api.txt

@@ -18,8 +18,8 @@ package com.google.firebase.appdistribution {
     method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.appdistribution.AppDistributionRelease> checkForNewRelease();
     method @NonNull public static com.google.firebase.appdistribution.FirebaseAppDistribution getInstance();
     method public boolean isTesterSignedIn();
-    method public void showFeedbackNotification(int, int);
-    method public void showFeedbackNotification(@NonNull CharSequence, int);
+    method public void showFeedbackNotification(int, com.google.firebase.appdistribution.InterruptionLevel);
+    method public void showFeedbackNotification(@NonNull CharSequence, com.google.firebase.appdistribution.InterruptionLevel);
     method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> signInTester();
     method public void signOutTester();
     method public void startFeedback(int);
@@ -49,6 +49,14 @@ package com.google.firebase.appdistribution {
     enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status UPDATE_NOT_AVAILABLE;
   }
 
+  public enum InterruptionLevel {
+    enum_constant public static final com.google.firebase.appdistribution.InterruptionLevel DEFAULT;
+    enum_constant public static final com.google.firebase.appdistribution.InterruptionLevel HIGH;
+    enum_constant public static final com.google.firebase.appdistribution.InterruptionLevel LOW;
+    enum_constant public static final com.google.firebase.appdistribution.InterruptionLevel MAX;
+    enum_constant public static final com.google.firebase.appdistribution.InterruptionLevel MIN;
+  }
+
   public interface OnProgressListener {
     method public void onProgressUpdate(@NonNull com.google.firebase.appdistribution.UpdateProgress);
   }

firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/InterruptionLevel.java

@@ -26,37 +26,56 @@ public enum InterruptionLevel {
    * <p>Translates to {@link NotificationManager#IMPORTANCE_MIN} on Android O+ and {@link
    * NotificationCompat#PRIORITY_MIN} on older platforms.
    */
-  MIN,
+  MIN(NotificationManager.IMPORTANCE_MIN, NotificationCompat.PRIORITY_MIN),
 
   /**
    * Low interruption level.
    *
    * <p>Translates to {@link NotificationManager#IMPORTANCE_LOW} on Android O+ and {@link
    * NotificationCompat#PRIORITY_LOW} on older platforms.
    */
-  LOW,
+  LOW(NotificationManager.IMPORTANCE_LOW, NotificationCompat.PRIORITY_LOW),
 
   /**
    * Default interruption level.
    *
    * <p>Translates to {@link NotificationManager#IMPORTANCE_DEFAULT} on Android O+ and {@link
    * NotificationCompat#PRIORITY_DEFAULT} on older platforms.
    */
-  DEFAULT,
+  DEFAULT(NotificationManager.IMPORTANCE_DEFAULT, NotificationCompat.PRIORITY_DEFAULT),
 
   /**
    * High interruption level.
    *
    * <p>Translates to {@link NotificationManager#IMPORTANCE_HIGH} on Android O+ and {@link
    * NotificationCompat#PRIORITY_HIGH} on older platforms.
    */
-  HIGH,
+  HIGH(NotificationManager.IMPORTANCE_HIGH, NotificationCompat.PRIORITY_HIGH),
 
   /**
    * Maximum interruption level.
    *
    * <p>Translates to {@link NotificationManager#IMPORTANCE_HIGH} on Android O+ and {@link
    * NotificationCompat#PRIORITY_MAX} on older platforms.
    */
-  MAX
+  MAX(NotificationManager.IMPORTANCE_HIGH, NotificationCompat.PRIORITY_MAX);
+
+  /**
+   * The notification channel importance corresponding to this interruption level on Android O+.
+   *
+   * @hide
+   */
+  public final int channelImportance;
+
+  /**
+   * The notification priority corresponding to this interruption level on older platforms.
+   *
+   * @hide
+   */
+  public final int notificationPriority;
+
+  InterruptionLevel(int channelImportance, int notificationPriority) {
+    this.channelImportance = channelImportance;
+    this.notificationPriority = notificationPriority;
+  }
 }

firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionNotificationsManager.java

@@ -162,7 +162,7 @@ public void showFeedbackNotification(
             .setSmallIcon(appIconSource.getNonAdaptiveIconOrDefault(context))
             .setContentTitle(context.getString(R.string.feedback_notification_title))
             .setContentText(context.getString(R.string.feedback_notification_text, appLabel))
-            .setPriority(getNotificationPriority(interruptionLevel))
+            .setPriority(interruptionLevel.notificationPriority)
             .setOngoing(true)
             .setOnlyAlertOnce(true)
             .setAutoCancel(false)
@@ -178,46 +178,15 @@ public void cancelFeedbackNotification() {
         .cancel(Notification.FEEDBACK.tag, Notification.FEEDBACK.id);
   }
 
-  private int getNotificationPriority(InterruptionLevel interruptionLevel) {
-    switch (interruptionLevel) {
-      case MIN:
-        return NotificationCompat.PRIORITY_MIN;
-      case LOW:
-        return NotificationCompat.PRIORITY_LOW;
-      case HIGH:
-        return NotificationCompat.PRIORITY_HIGH;
-      case MAX:
-        return NotificationCompat.PRIORITY_MAX;
-      case DEFAULT:
-      default:
-        return NotificationCompat.PRIORITY_DEFAULT;
-    }
-  }
-
-  private int getChannelImportance(InterruptionLevel interruptionLevel) {
-    switch (interruptionLevel) {
-      case MIN:
-        return NotificationManagerCompat.IMPORTANCE_MIN;
-      case LOW:
-        return NotificationManagerCompat.IMPORTANCE_LOW;
-      case HIGH:
-      case MAX: // IMPORTANCE_MAX exists but is so far unused
-        return NotificationManagerCompat.IMPORTANCE_HIGH;
-      case DEFAULT:
-      default:
-        return NotificationManagerCompat.IMPORTANCE_DEFAULT;
-    }
-  }
-
   @RequiresApi(Build.VERSION_CODES.O)
   private void createChannel(
       Notification notification, int name, int description, InterruptionLevel interruptionLevel) {
     notificationManager.createNotificationChannelGroup(
         new NotificationChannelGroup(
             CHANNEL_GROUP_ID, context.getString(R.string.notifications_group_name)));
-    int importance = getChannelImportance(interruptionLevel);
     NotificationChannel channel =
-        new NotificationChannel(notification.channelId, context.getString(name), importance);
+        new NotificationChannel(
+            notification.channelId, context.getString(name), interruptionLevel.channelImportance);
     channel.setDescription(context.getString(description));
     channel.setGroup(CHANNEL_GROUP_ID);
     // Register the channel with the system; you can't change the importance