Merge pull request #31 from virresh/push_notifs

Push notifs
virresh · Nov 5, 2019 · 8dd9517 · 8dd9517
2 parents c462fee + eca6f11
commit 8dd9517
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/src/main/java/com/mobilecomputing/sahayak/FireBaseFCMService.java b/app/src/main/java/com/mobilecomputing/sahayak/FireBaseFCMService.java
@@ -71,6 +71,7 @@ public void onMessageReceived(RemoteMessage remoteMessage) {
         // Check if message contains a notification payload.
         if (remoteMessage.getNotification() != null) {
             Log.d(TAG, "Message Notification Body: " + remoteMessage.getNotification().getBody());
+            sendNotification(remoteMessage.getNotification().getBody(), remoteMessage.getNotification().getTitle());
         }
 
         // Also if you intend on generating your own notifications as a result of a received FCM
@@ -130,7 +131,7 @@ public static void sendRegistrationToServer(String token) {
      *
      * @param messageBody FCM message body received.
      */
-    private void sendNotification(String messageBody) {
+    private void sendNotification(String messageBody, String messageTitle) {
         Intent intent = new Intent(this, MainActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         PendingIntent pendingIntent = PendingIntent.getActivity(this, 0 /* Request code */, intent,
@@ -141,7 +142,7 @@ private void sendNotification(String messageBody) {
         NotificationCompat.Builder notificationBuilder =
                 new NotificationCompat.Builder(this, channelId)
                         .setSmallIcon(R.drawable.app_logo)
-                        .setContentTitle(getString(R.string.fcm_message))
+                        .setContentTitle(messageTitle)
                         .setContentText(messageBody)
                         .setAutoCancel(true)
                         .setSound(defaultSoundUri)

diff --git a/app/src/main/res/layout/activity_mentor_options.xml b/app/src/main/res/layout/activity_mentor_options.xml
@@ -107,7 +107,7 @@
                     android:background="@color/colorPrimary"
                     android:textColor="@color/white"
                     android:layout_gravity="center"
-                    android:drawableLeft="@drawable/ic_date_range_black_24dp"
+                    android:drawableLeft="@drawable/ic_access_time_black_24dp"
                     android:drawablePadding="8dp"
                     android:text="Select Time" />