Merge pull request #87555 from andrewwang2015/andrwan/android-fcm-updates

Add updates to NH Tutorials for Android FCM

Author: PMEds28

articles/notification-hubs/media/notification-hubs-android-push-notification-google-fcm-get-started/activity-main-xml.png

@@ -15,7 +15,7 @@ ms.tgt_pltfrm: mobile-android
 ms.devlang: java
 ms.topic: tutorial
 ms.custom: mvc
-ms.date: 07/15/2019
+ms.date: 09/11/2019
 ms.author: jowargo
 ---
 
@@ -186,7 +186,7 @@ Your hub is now configured to work with Firebase Cloud Messaging. You also have
      > [!IMPORTANT]
      > Enter the **name** and the **DefaultListenSharedAccessSignature** of your hub before proceeding further. 
 
-3. Add another new class to your project named `RegistrationIntentService`. This class implements the `IntentService` interface. It also handles [refreshing the FCM token](https://developers.google.com/instance-id/guides/android-implementation#refresh_tokens) and [registering with the notification hub](notification-hubs-push-notification-registration-management.md).
+2. Add another new class to your project named `RegistrationIntentService`. This class implements the `IntentService` interface. It also handles [refreshing the FCM token](https://developers.google.com/instance-id/guides/android-implementation#refresh_tokens) and [registering with the notification hub](notification-hubs-push-notification-registration-management.md).
 
     Use the following code for this class.
 
@@ -288,7 +288,7 @@ Your hub is now configured to work with Firebase Cloud Messaging. You also have
     }
     ```
 
-4. In the `MainActivity` class, add the following `import` statements above the class declaration.
+3. In the `MainActivity` class, add the following `import` statements above the class declaration.
 
     ```java
     import com.google.android.gms.common.ConnectionResult;
@@ -299,7 +299,7 @@ Your hub is now configured to work with Firebase Cloud Messaging. You also have
     import android.widget.Toast;
     ```
 
-5. Add the following members at the top of the class. You use these fields to [check the availability of Google Play Services as recommended by Google](https://developers.google.com/android/guides/setup#ensure_devices_have_the_google_play_services_apk).
+4. Add the following members at the top of the class. You use these fields to [check the availability of Google Play Services as recommended by Google](https://developers.google.com/android/guides/setup#ensure_devices_have_the_google_play_services_apk).
 
     ```java
     public static MainActivity mainActivity;
@@ -308,7 +308,7 @@ Your hub is now configured to work with Firebase Cloud Messaging. You also have
     private static final int PLAY_SERVICES_RESOLUTION_REQUEST = 9000;
     ```
 
-6. In the `MainActivity` class, add the following method to check the availability of Google Play Services.
+5. In the `MainActivity` class, add the following method to check the availability of Google Play Services.
 
     ```java
     /**
@@ -335,7 +335,7 @@ Your hub is now configured to work with Firebase Cloud Messaging. You also have
     }
     ```
 
-7. In the `MainActivity` class, add the following code that checks for Google Play Services before calling the `IntentService` to get your FCM registration token and register with your hub:
+6. In the `MainActivity` class, add the following code that checks for Google Play Services before calling the `IntentService` to get your FCM registration token and register with your hub:
 
     ```java
     public void registerWithNotificationHubs()
@@ -348,7 +348,7 @@ Your hub is now configured to work with Firebase Cloud Messaging. You also have
     }
     ```
 
-8. In the `OnCreate` method of the `MainActivity` class, add the following code to start the registration process when the activity is created:
+7. In the `OnCreate` method of the `MainActivity` class, add the following code to start the registration process when the activity is created:
 
     ```java
     @Override
@@ -362,7 +362,7 @@ Your hub is now configured to work with Firebase Cloud Messaging. You also have
     }
     ```
 
-9. To verify app state and report status in your app, add these additional methods to `MainActivity`:
+8. To verify app state and report status in your app, add these additional methods to `MainActivity`:
 
     ```java
     @Override
@@ -401,15 +401,17 @@ Your hub is now configured to work with Firebase Cloud Messaging. You also have
     }
     ```
 
-10. The `ToastNotify` method uses the *"Hello World"* `TextView` control to report status and notifications persistently in the app. In your **res** > **layout** > **activity_main.xml** layout, add the following ID for that control.
+9. The `ToastNotify` method uses the *"Hello World"* `TextView` control to report status and notifications persistently in the app. In your **res** > **layout** > **activity_main.xml** layout, add the following ID for that control.
 
     ```java
     android:id="@+id/text_hello"
     ```
 
-11. Next you add a subclass for the receiver that you defined in AndroidManifest.xml. Add another new class to your project named `FirebaseService`.
+    ![Azure Notification Hubs - Test Send](./media/notification-hubs-android-push-notification-google-fcm-get-started/activity-main-xml.png)
 
-12. Add the following import statements at the top of `FirebaseService.java`:
+10. Next you add a subclass for the receiver that you defined in AndroidManifest.xml. Add another new class to your project named `FirebaseService`.
+
+11. Add the following import statements at the top of `FirebaseService.java`:
 
     ```java
     import com.google.firebase.messaging.FirebaseMessagingService;
@@ -424,10 +426,10 @@ Your hub is now configured to work with Firebase Cloud Messaging. You also have
     import android.net.Uri;
     import android.os.Build;
     import android.os.Bundle;
-    import android.support.v4.app.NotificationCompat;
+    import androidx.core.app.NotificationCompat;
     ```
 
-13. Add the following code for the `FirebaseService` class, making it a subclass of `FirebaseMessagingService`.
+12. Add the following code for the `FirebaseService` class, making it a subclass of `FirebaseMessagingService`.
 
     This code overrides the `onMessageReceived` method and reports notifications that are received. it also sends the push notification to the Android notification manager by using the `sendNotification()` method. Call the `sendNotification()` method when the app isn't running and a notification is received.
 
@@ -514,12 +516,16 @@ Your hub is now configured to work with Firebase Cloud Messaging. You also have
     }
     ```
 
-14. In Android Studio, on the menu bar, select **Build** > **Rebuild Project** to make sure that there aren't any errors in your code. If you receive an error about the `ic_launcher` icon, remove the following statement from the AndroidManifest.xml file: 
+13. In Android Studio, on the menu bar, select **Build** > **Rebuild Project** to make sure that there aren't any errors in your code. If you receive an error about the `ic_launcher` icon, remove the following statement from the AndroidManifest.xml file: 
 
     ```
         android:icon="@mipmap/ic_launcher"
     ```
-15. Run the app on your device and verify that it registers successfully with the hub.
+14. Ensure you have a virtual device for running the app. If you do not have one, add one as follows:
+    1. ![Open device manager](./media/notification-hubs-android-push-notification-google-fcm-get-started/open-device-manager.png)
+    2. ![Create virtual device](./media/notification-hubs-android-push-notification-google-fcm-get-started/your-virtual-devices.PNG)
+
+15. Run the app on your selected device and verify that it registers successfully with the hub.
 
     > [!NOTE]
     > Registration might fail during the initial launch until the `onTokenRefresh()` method of the instance ID service is called. The refresh should initiate a successful registration with the notification hub.

articles/notification-hubs/media/notification-hubs-android-push-notification-google-fcm-get-started/open-device-manager.png

@@ -14,7 +14,7 @@ ms.tgt_pltfrm: mobile-android
 ms.devlang: java
 ms.topic: tutorial
 ms.custom: mvc
-ms.date: 05/01/2019
+ms.date: 09/11/2019
 ms.author: jowargo
 ---
 
@@ -466,7 +466,14 @@ The next step is to update the Android application created in the [Tutorial: Pus
     ```java
     useLibrary 'org.apache.http.legacy'
     ```
-13. Build the project.
+13. If your app is targeting API level 28 (Android 9.0) or above, include the following declaration within the `<application>` element of `AndroidManifest.xml`.
+
+    ```xml
+    <uses-library
+        android:name="org.apache.http.legacy"
+        android:required="false" />
+    ```
+14. Build the project.
 
 ## Test the app
 

articles/notification-hubs/media/notification-hubs-android-push-notification-google-fcm-get-started/your-virtual-devices.PNG

@@ -5,7 +5,7 @@
  author: spelluru
  ms.service: notification-hubs
  ms.topic: include
- ms.date: 03/22/2019
+ ms.date: 09/11/2019
  ms.author: spelluru
  ms.custom: include file
 ---
@@ -180,6 +180,9 @@ In this section, you add a new controller to the WebAPI backend to handle reques
         }
     }
     ```
+    > [!IMPORTANT]
+    > Enter the **name** and the **DefaultFullSharedAccessSignature** of your hub before proceeding further. 
+    
 7. Next, create a new controller named **RegisterController**. In Solution Explorer, right-click the **Controllers** folder, select **Add**, and then select **Controller**.
 
 8. Select **Web API 2 Controller - Empty**, and then select **Add**.

articles/notification-hubs/notification-hubs-android-push-notification-google-fcm-get-started.md

@@ -5,7 +5,7 @@
  author: spelluru
  ms.service: notification-hubs
  ms.topic: include
- ms.date: 02/05/2019
+ ms.date: 09/11/2019
  ms.author: spelluru
  ms.custom: include file
 ---
@@ -28,10 +28,11 @@
         ```
         classpath 'com.google.gms:google-services:4.0.1'
         ```
-    2. In your app-level build.gradle file (<project>/<app-module>/build.gradle), add the following statement to the **dependencies** section. 
+    2. In your app-level build.gradle file (<project>/<app-module>/build.gradle), add the following statements to the **dependencies** section. 
 
         ```
-        implementation 'com.google.firebase:firebase-core:16.0.1'
+        implementation 'com.google.firebase:firebase-core:16.0.8'
+        implementation 'com.google.firebase:firebase-messaging:17.3.4'
         ```
 
     3. Add the following line to the end of the app-level build.gradle file after the dependencies section.