Merge pull request #84065 from spelluru/nhubxamarinandroid0801

No need of FirebaseInstanceID class

Author: GitHubber17

articles/notification-hubs/media/notification-hubs-android-get-started/notification-hubs-gcm-api.png

@@ -14,7 +14,7 @@ ms.tgt_pltfrm: mobile-xamarin-android
 ms.devlang: dotnet
 ms.topic: tutorial
 ms.custom: mvc
-ms.date: 05/01/2019
+ms.date: 08/01/2019
 ms.author: jowargo
 ---
 
@@ -48,10 +48,10 @@ In this tutorial, you take the following steps:
 
 [!INCLUDE [notification-hubs-portal-create-new-hub](../../includes/notification-hubs-portal-create-new-hub.md)]
 
-### Configure GCM settings for the notification hub
+### Configure GCM/FCM settings for the notification hub
 
-1. Select **Google (GCM)** in the **NOTIFICATION SETTINGS** section.
-2. Enter the **Legacy server key** you noted down from the Google Firebase Console.
+1. Select **Google (GCM/FCM)/** in the **Settings** section on the left menu.
+2. Enter the **server key** you noted down from the Google Firebase Console.
 3. Select **Save** on the toolbar.
 
     ![](./media/notification-hubs-android-get-started/notification-hubs-gcm-api.png)
@@ -214,123 +214,100 @@ Your notification hub is configured to work with FCM, and you have the connectio
     CreateNotificationChannel();
     ```
 
-11. Create a new class, `MyFirebaseIIDService` like you created the `Constants` class.
-12. Add the following using statements to `MyFirebaseIIDService.cs`:
-
-    ```csharp
-    using Android.Util;
-    using WindowsAzure.Messaging;
-    using Firebase.Iid;
-    ```
-
-13. In `MyFirebaseIIDService.cs`, add the following `class` declaration, and have your class inherit from `FirebaseInstanceIdService`:
-
-    ```csharp
-    [Service]
-    [IntentFilter(new[] { "com.google.firebase.INSTANCE_ID_EVENT" })]
-    public class MyFirebaseIIDService : FirebaseInstanceIdService
-    ```
-
-14. In `MyFirebaseIIDService.cs`, add the following code:
-
-    ```csharp
-    const string TAG = "MyFirebaseIIDService";
-    NotificationHub hub;
-
-    public override void OnTokenRefresh()
-    {
-        var refreshedToken = FirebaseInstanceId.Instance.Token;
-        Log.Debug(TAG, "FCM token: " + refreshedToken);
-        SendRegistrationToServer(refreshedToken);
-    }
-
-    void SendRegistrationToServer(string token)
-    {
-        // Register with Notification Hubs
-        hub = new NotificationHub(Constants.NotificationHubName,
-                                    Constants.ListenConnectionString, this);
-
-        var tags = new List<string>() { };
-        var regID = hub.Register(token, tags.ToArray()).RegistrationId;
-
-        Log.Debug(TAG, $"Successful registration of ID {regID}");
-    }
-    ```
-
-15. Create another new class for your project, name it `MyFirebaseMessagingService`.
+15. Add a class named `MyFirebaseMessagingService` to your project. 
 16. Add the following using statements to `MyFirebaseMessagingService.cs`.
 
     ```csharp
     using Android.Util;
     using Firebase.Messaging;
-    using Android.Support.V4.App;
-    using Build = Android.OS.Build;
+    using Android.Support.V4.App;    
+    using WindowsAzure.Messaging;
     ```
 
 17. Add the following above your class declaration, and have your class inherit from `FirebaseMessagingService`:
 
     ```csharp
     [Service]
     [IntentFilter(new[] { "com.google.firebase.MESSAGING_EVENT" })]
+    [IntentFilter(new[] { "com.google.firebase.INSTANCE_ID_EVENT" })]
     public class MyFirebaseMessagingService : FirebaseMessagingService
     ```
 
-18. Add the following code to `MyFirebaseMessagingService.cs`:
+18. Add the following code to `MyFirebaseMessagingService.cs` to process messages that are received. 
 
     ```csharp
-    const string TAG = "MyFirebaseMsgService";
-    public override void OnMessageReceived(RemoteMessage message)
-    {
-        Log.Debug(TAG, "From: " + message.From);
-        if(message.GetNotification()!= null)
+        const string TAG = "MyFirebaseMsgService";
+        NotificationHub hub;
+    
+        public override void OnMessageReceived(RemoteMessage message)
         {
-            //These is how most messages will be received
-            Log.Debug(TAG, "Notification Message Body: " + message.GetNotification().Body);
-            SendNotification(message.GetNotification().Body);
+            Log.Debug(TAG, "From: " + message.From);
+            if (message.GetNotification() != null)
+            {
+                //These is how most messages will be received
+                Log.Debug(TAG, "Notification Message Body: " + message.GetNotification().Body);
+                SendNotification(message.GetNotification().Body);
+            }
+            else
+            {
+                //Only used for debugging payloads sent from the Azure portal
+                SendNotification(message.Data.Values.First());
+    
+            }
         }
-        else
+    
+        void SendNotification(string messageBody)
         {
-            //Only used for debugging payloads sent from the Azure portal
-            SendNotification(message.Data.Values.First());
-
+            var intent = new Intent(this, typeof(MainActivity));
+            intent.AddFlags(ActivityFlags.ClearTop);
+            var pendingIntent = PendingIntent.GetActivity(this, 0, intent, PendingIntentFlags.OneShot);
+    
+            var notificationBuilder = new NotificationCompat.Builder(this, MainActivity.CHANNEL_ID);
+    
+            notificationBuilder.SetContentTitle("FCM Message")
+                        .SetSmallIcon(Resource.Drawable.ic_launcher)
+                        .SetContentText(messageBody)
+                        .SetAutoCancel(true)
+                        .SetShowWhen(false)
+                        .SetContentIntent(pendingIntent);
+    
+            var notificationManager = NotificationManager.FromContext(this);
+    
+            notificationManager.Notify(0, notificationBuilder.Build());
         }
-    }
+    ```
 
-    void SendNotification(string messageBody)
-    {
-        var intent = new Intent(this, typeof(MainActivity));
-        intent.AddFlags(ActivityFlags.ClearTop);
-        var pendingIntent = PendingIntent.GetActivity(this, 0, intent, PendingIntentFlags.OneShot);
-
-        var notificationBuilder = new NotificationCompat.Builder(this)
-                    .SetContentTitle("FCM Message")
-                    .SetSmallIcon(Resource.Drawable.ic_launcher)
-                    .SetContentText(messageBody)
-                    .SetAutoCancel(true)
-                    .SetShowWhen(false)
-                    .SetContentIntent(pendingIntent);
-
-        if (Build.VERSION.SdkInt >= BuildVersionCodes.O)
+19. Add the following methods to the MyFirebaseMessagingService class to receive the FCM registration token and send it to the Notification Hubs instance (hub). 
+
+    ```csharp
+        public override void OnNewToken(string token)
         {
-            notificationBuilder.SetChannelId(MainActivity.CHANNEL_ID);
+            Log.Debug(TAG, "FCM token: " + token);
+            SendRegistrationToServer(token);
         }
 
-        var notificationManager = NotificationManager.FromContext(this);
+        void SendRegistrationToServer(string token)
+        {
+            // Register with Notification Hubs
+            hub = new NotificationHub(Constants.NotificationHubName,
+                                        Constants.ListenConnectionString, this);
 
-        notificationManager.Notify(0, notificationBuilder.Build());
-    }
-    ```
+            var tags = new List<string>() { };
+            var regID = hub.Register(token, tags.ToArray()).RegistrationId;
 
-19. **Build** your project.
-20. **Run** your app on your device or loaded emulator
+            Log.Debug(TAG, $"Successful registration of ID {regID}");
+        }
+    ```
+1. **Build** your project.
+1. **Run** your app on your device or loaded emulator
 
 ## Send test notification from the Azure portal
 
 You can test receiving notifications in your app with the **Test Send** option in the [Azure portal]. It sends a test push notification to your device.
 
 ![Azure portal - Test Send](media/partner-xamarin-notification-hubs-android-get-started/send-test-notification.png)
 
-Push notifications are normally sent in a back-end service like Mobile Services or ASP.NET through a compatible library. If a library is not available for your back-end, you can also use the REST API directly to send notification messages.
+Push notifications are normally sent in a back-end service like Mobile Services or ASP.NET through a compatible library. If a library isn't available for your back-end, you can also use the REST API directly to send notification messages.
 
 ## Next steps
 

articles/notification-hubs/xamarin-notification-hubs-push-notifications-android-gcm.md

@@ -5,7 +5,7 @@
  author: spelluru
  ms.service: notification-hubs
  ms.topic: include
- ms.date: 03/11/2019
+ ms.date: 08/01/2019
  ms.author: spelluru
  ms.custom: include file
 ---
@@ -16,28 +16,23 @@
     ![Add Firebase to your Android app](./media/notification-hubs-enable-firebase-cloud-messaging/notification-hubs-add-firebase-to-android-app.png)
 
 3. On the **Add Firebase to your Android app** page, take the following steps: 
-1. 
     1. For the **Android package name**, enter a name for your package. For example: `tutorials.tutoria1.xamarinfcmapp`. 
 
         ![Specify the package name](./media/notification-hubs-enable-firebase-cloud-messaging/specify-package-name-fcm-settings.png)
+    2. Select **Register app**.  
+    1. Select **Download google-services.json**. Then save the file into the folder of your project and select **Next**. If you haven't created the Visual Studio project yet, you can do this step after you create the project. 
 
-2. Select **Register app**. 
-1. 
-1. Select **Download google-services.json**. Then save the file into the **app** folder of your project and  select **Next**. 
-
-    ![Download google-services.json](./media/notification-hubs-enable-firebase-cloud-messaging/download-google-service-button.png)
-
-6. Select **Next**. 
-7. Select **Skip this step**. 
-
-    ![Skip the last step](./media/notification-hubs-enable-firebase-cloud-messaging/skip-this-step.png)
+        ![Download google-services.json](./media/notification-hubs-enable-firebase-cloud-messaging/download-google-service-button.png)
+    6. Select **Next**. 
+    7. Select **Skip this step**. 
 
+        ![Skip the last step](./media/notification-hubs-enable-firebase-cloud-messaging/skip-this-step.png)
 8. In the Firebase console, select the cog for your project. Then select **Project Settings**.
 
     ![Select Project Settings](./media/notification-hubs-enable-firebase-cloud-messaging/notification-hubs-firebase-console-project-settings.png)
-
 4. If you haven't downloaded the **google-services.json** file, you can do download it on this page. 
 
-1. Switch to the **Cloud Messaging** tab at the top. 
+    ![Download google-services.json from the General tab](./media/notification-hubs-enable-firebase-cloud-messaging/download-google-services-json-general-page.png)
+1. Switch to the **Cloud Messaging** tab at the top. Copy and save the **Server key** for later use. You use this value to configure your notification hub.
 
-1. Copy and save the **Legacy Server key** for later use. You use this value to configure your notification hub.
+    ![Copy server key](./media/notification-hubs-enable-firebase-cloud-messaging/server-key.png)