Merge pull request #463 from Microsoft/fix/android_8_update_notification

Fix android 8 update notification

Author: guperrot

sdk/mobile-center-distribute/src/main/java/com/microsoft/azure/mobile/distribute/Distribute.java

@@ -6,6 +6,7 @@
 import android.app.Dialog;
 import android.app.DownloadManager;
 import android.app.Notification;
+import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.ProgressDialog;
@@ -69,6 +70,7 @@
 import static com.microsoft.azure.mobile.distribute.DistributeConstants.HEADER_API_TOKEN;
 import static com.microsoft.azure.mobile.distribute.DistributeConstants.LOG_TAG;
 import static com.microsoft.azure.mobile.distribute.DistributeConstants.MEBIBYTE_IN_BYTES;
+import static com.microsoft.azure.mobile.distribute.DistributeConstants.NOTIFICATION_CHANNEL_ID;
 import static com.microsoft.azure.mobile.distribute.DistributeConstants.POSTPONE_TIME_THRESHOLD;
 import static com.microsoft.azure.mobile.distribute.DistributeConstants.PREFERENCE_KEY_DOWNLOAD_ID;
 import static com.microsoft.azure.mobile.distribute.DistributeConstants.PREFERENCE_KEY_DOWNLOAD_STATE;
@@ -167,7 +169,11 @@ public class Distribute extends AbstractMobileCenterService {
 
     /**
      * Last download progress dialog that was shown.
+     * Android 8 deprecates this dialog but only reason is that they want us to use a non modal
+     * progress indicator while we actually use it to be a modal dialog for forced update.
+     * They will always keep this dialog to remain compatible but just mark it deprecated.
      */
+    @SuppressWarnings("deprecation")
     private ProgressDialog mProgressDialog;
 
     /**
@@ -1246,8 +1252,22 @@ synchronized boolean notifyDownload(ReleaseDetails releaseDetails, Intent intent
 
         /* Post notification. */
         MobileCenterLog.debug(LOG_TAG, "Post a notification as the download finished in background.");
-        Notification.Builder builder = new Notification.Builder(mContext)
-                .setTicker(mContext.getString(R.string.mobile_center_distribute_install_ready_title))
+        NotificationManager notificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
+        Notification.Builder builder;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+
+            /* Create or update notification channel (mandatory on Android 8 target). */
+            NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL_ID,
+                    mContext.getString(R.string.mobile_center_distribute_notification_category),
+                    NotificationManager.IMPORTANCE_DEFAULT);
+            notificationManager.createNotificationChannel(channel);
+            builder = new Notification.Builder(mContext, NOTIFICATION_CHANNEL_ID);
+        } else {
+
+            //noinspection deprecation
+            builder = new Notification.Builder(mContext);
+        }
+        builder.setTicker(mContext.getString(R.string.mobile_center_distribute_install_ready_title))
                 .setContentTitle(mContext.getString(R.string.mobile_center_distribute_install_ready_title))
                 .setContentText(getInstallReadyMessage())
                 .setSmallIcon(mContext.getApplicationInfo().icon)
@@ -1257,7 +1277,6 @@ synchronized boolean notifyDownload(ReleaseDetails releaseDetails, Intent intent
         }
         Notification notification = DistributeUtils.buildNotification(builder);
         notification.flags |= Notification.FLAG_AUTO_CANCEL;
-        NotificationManager notificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
         notificationManager.notify(DistributeUtils.getNotificationId(), notification);
         PreferencesStorage.putInt(PREFERENCE_KEY_DOWNLOAD_STATE, DOWNLOAD_STATE_NOTIFIED);
 
@@ -1290,6 +1309,7 @@ private synchronized void removeDownload(long downloadId) {
     /**
      * Show download progress.
      */
+    @SuppressWarnings("deprecation")
     private void showDownloadProgress() {
         mProgressDialog = new ProgressDialog(mForegroundActivity);
         mProgressDialog.setTitle(R.string.mobile_center_distribute_downloading_mandatory_update);
@@ -1304,6 +1324,7 @@ private void showDownloadProgress() {
     /**
      * Hide progress dialog and stop updating.
      */
+    @SuppressWarnings("deprecation")
     private synchronized void hideProgressDialog() {
         if (mProgressDialog != null) {
             final ProgressDialog progressDialog = mProgressDialog;

sdk/mobile-center-distribute/src/main/java/com/microsoft/azure/mobile/distribute/DistributeConstants.java

@@ -135,6 +135,11 @@ final class DistributeConstants {
      */
     static final long POSTPONE_TIME_THRESHOLD = 24 * 60 * 60 * 1000;
 
+    /**
+     * Notification channel identifier.
+     */
+    static final String NOTIFICATION_CHANNEL_ID = "mobile.center.distribute";
+
     /**
      * Base key for stored preferences.
      */

sdk/mobile-center-distribute/src/main/res/values/mobile_center_distribute.xml

@@ -14,4 +14,5 @@
     <string name="mobile_center_distribute_install_ready_title">App update downloaded</string>
     <string name="mobile_center_distribute_install_ready_message">%1$s %2$s (%3$d) has been downloaded and is ready to be installed.</string>
     <string name="mobile_center_distribute_install">Install</string>
+    <string name="mobile_center_distribute_notification_category">App updates</string>
 </resources>

sdk/mobile-center-distribute/src/test/java/com/microsoft/azure/mobile/distribute/AbstractDistributeAfterDownloadTest.java

@@ -1,5 +1,6 @@
 package com.microsoft.azure.mobile.distribute;
 
+import android.annotation.SuppressLint;
 import android.app.DownloadManager;
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -293,6 +294,7 @@ Cursor mockSuccessCursor() {
     }
 
     @NonNull
+    @SuppressLint("NewApi")
     Notification.Builder mockNotificationBuilderChain() throws Exception {
         Notification.Builder notificationBuilder = mock(Notification.Builder.class);
         whenNew(Notification.Builder.class).withAnyArguments().thenReturn(notificationBuilder);
@@ -301,6 +303,7 @@ Notification.Builder mockNotificationBuilderChain() throws Exception {
         when(notificationBuilder.setContentText(anyString())).thenReturn(notificationBuilder);
         when(notificationBuilder.setSmallIcon(anyInt())).thenReturn(notificationBuilder);
         when(notificationBuilder.setContentIntent(any(PendingIntent.class))).thenReturn(notificationBuilder);
+        when(notificationBuilder.setChannelId(anyString())).thenReturn(notificationBuilder);
         return notificationBuilder;
     }
 

sdk/mobile-center-distribute/src/test/java/com/microsoft/azure/mobile/distribute/DistributeDownloadTest.java

@@ -1,9 +1,11 @@
 package com.microsoft.azure.mobile.distribute;
 
+import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.DownloadManager;
 import android.app.Notification;
+import android.app.NotificationChannel;
 import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
 import android.content.DialogInterface;
@@ -709,6 +711,7 @@ public void restartDownloadCheckIsLongEnoughToAppCanGoBackgroundAgain() throws E
     }
 
     @Test
+    @SuppressLint("NewApi")
     @SuppressWarnings("deprecation")
     public void dontShowInstallUiIfUpgradedAfterNotification() throws Exception {
 
@@ -732,8 +735,9 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
         mockSuccessCursor();
         Intent installIntent = mockInstallIntent();
         when(mPackageManager.getApplicationInfo(mContext.getPackageName(), 0)).thenReturn(mock(ApplicationInfo.class));
+        TestUtils.setInternalState(Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.O);
         Notification.Builder notificationBuilder = mockNotificationBuilderChain();
-        when(notificationBuilder.getNotification()).thenReturn(mock(Notification.class));
+        when(notificationBuilder.build()).thenReturn(mock(Notification.class));
 
         /* Make notification happen. */
         Distribute.getInstance().onActivityPaused(mActivity);
@@ -742,6 +746,7 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
 
         /* Verify. */
         verify(mNotificationManager).notify(anyInt(), any(Notification.class));
+        verify(mNotificationManager).createNotificationChannel(any(NotificationChannel.class));
         verify(mContext, never()).startActivity(installIntent);
 
         /* Restart app after upgrade, discard download and check update again. */