Bug Fix: Show notification for note after full note is downloaded

This fixes a bug where inline actions were not added to notification because the notification was sometimes shown before full note with actions info was downloaded.

Author: ashiagr

WordPress/src/main/java/org/wordpress/android/push/GCMMessageHandler.java

@@ -351,8 +351,6 @@ private void buildAndShowNotificationFromNoteData(Context context, Bundle data)
             // Try to build the note object from the PN payload, and save it to the DB.
             NotificationsUtils.buildNoteObjectFromBundleAndSaveIt(data);
             EventBus.getDefault().post(new NotificationEvents.NotificationsChanged(true));
-            // Always do this, since a note can be updated on the server after a PN is sent
-            NotificationsActions.downloadNoteAndUpdateDB(wpcomNoteID, null, null);
 
             String noteType = StringUtils.notNullStr(data.getString(PUSH_ARG_TYPE));
 
@@ -415,7 +413,12 @@ private void buildAndShowNotificationFromNoteData(Context context, Bundle data)
                 builder.setLargeIcon(largeIconBitmap);
             }
 
-            showNotificationForNoteData(context, data, builder);
+            // Always do this, since a note can be updated on the server after a PN is sent
+            NotificationsActions.downloadNoteAndUpdateDB(
+                    wpcomNoteID,
+                    success -> showNotificationForNoteData(context, data, builder),
+                    error -> showNotificationForNoteData(context, data, builder)
+            );
         }
 
         private void showNotificationForNoteData(Context context, Bundle noteData, NotificationCompat.Builder builder) {