Aligned a few property names

Author: EddyVerbruggen

demo-push/app/push-view-model.ts

@@ -34,7 +34,7 @@ export class PushViewModel extends Observable {
       title: "We'd like to send notifications",
       message: "Do you agree? Please do, we won't spam you. Promised.",
       okButtonText: "Yep!",
-      cancelButtonText: "Nooo"
+      cancelButtonText: "Maybe later"
     }).then(pushAllowed => {
       if (pushAllowed) {
         applicationSettings.setBoolean(PushViewModel.APP_REGISTERED_FOR_NOTIFICATIONS, true);

docs/MESSAGING.md

@@ -114,11 +114,11 @@ Similarly to the message callback you can either wire this through `init` or as
 
 By default, this plugin will display a notification every time it receives one. If you want to disable this
 behaviour and handle the notifications yourself on the `onMessageReceivedCallback`, you need to set the
-`displayNotifications` option to `false`:
+`showNotifications` option to `false`:
 
 ```js
 firebase.init({
-  displayNotifications: false,
+  showNotifications: false,
 });
 ```
 
@@ -130,11 +130,11 @@ This might be helpful too if you or some other plugin you use is already setting
 ### Always show notifications when the application is in foreground
 
 If you always want to display notifications while the application is in foreground withouth sending additional
-parameters/data when sending the push notification, you need to set the `showWhenInForeground` option to `true`:
+parameters/data when sending the push notification, you need to set the `showNotificationsWhenInForeground` option to `true`:
 
 ```js
 firebase.init({
-  showWhenInForeground: true,
+  showNotificationsWhenInForeground: true,
 });
 ```
 

src/firebase.d.ts

@@ -118,14 +118,14 @@ export interface InitOptions {
   onMessageReceivedCallback?: (data: Message) => void;
 
   /**
-   * For FCM. Whether you want this plugin to automatically display the notifications or just notify the callback.
+   * For Messaging (Push Notifications). Whether you want this plugin to automatically display the notifications or just notify the callback.
    */
-  displayNotifications: boolean;
+  showNotifications: boolean;
 
   /**
-   * For FCM. Whether you want this plugin to always handle the notifications when the app is in foreground.
+   * For Messaging (Push Notifications). Whether you want this plugin to always handle the notifications when the app is in foreground.
    */
-  showWhenInForeground: boolean;
+  showNotificationsWhenInForeground: boolean;
 
   /**
    * Get notified when a dynamic link was used to launch the app. Alternatively use addOnDynamicLinkReceivedCallback.

src/messaging/messaging.ios.ts

@@ -20,16 +20,16 @@ let _registerForRemoteNotificationsRanThisSession = false;
 let _userNotificationCenterDelegate: UNUserNotificationCenterDelegateImpl;
 let _messagingConnected: boolean = null;
 let _firebaseRemoteMessageDelegate: FIRMessagingDelegateImpl;
-let _displayNotifications: boolean = true;
-let _showWhenInForeground: boolean = false;
+let _showNotifications: boolean = true;
+let _showNotificationsWhenInForeground: boolean = false;
 
 // Track whether or not registration for remote notifications was request.
 // This way we can suppress the "Allow notifications" consent popup until the listeners are passed in.
 const NOTIFICATIONS_REGISTRATION_KEY = "Firebase-RegisterForRemoteNotifications";
 
 export function initFirebaseMessaging(arg) {
-  _displayNotifications = arg.displayNotifications === undefined ? _displayNotifications : !!arg.displayNotifications;
-  _showWhenInForeground = arg.showWhenInForeground === undefined ? _showWhenInForeground : !!arg.showWhenInForeground;
+  _showNotifications = arg.showNotifications === undefined ? _showNotifications : !!arg.showNotifications;
+  _showNotificationsWhenInForeground = arg.showNotificationsWhenInForeground === undefined ? _showNotificationsWhenInForeground : !!arg.showNotificationsWhenInForeground;
 
   if (arg.onMessageReceivedCallback !== undefined || arg.onPushTokenReceivedCallback !== undefined) {
     if (arg.onMessageReceivedCallback !== undefined) {
@@ -393,7 +393,7 @@ function _registerForRemoteNotifications() {
       }
     });
 
-    if (_displayNotifications) {
+    if (_showNotifications) {
       _userNotificationCenterDelegate = UNUserNotificationCenterDelegateImpl.new().initWithCallback((unnotification, actionIdentifier?, inputText?) => {
         // if the app is in the foreground then this method will receive the notification
         // if the app is in the background, and user has responded to interactive notification, then this method will receive the notification
@@ -551,7 +551,7 @@ class UNUserNotificationCenterDelegateImpl extends NSObject implements UNUserNot
     const userInfo = notification.request.content.userInfo;
     const userInfoJSON = firebaseUtils.toJsObject(userInfo);
 
-    if ( _showWhenInForeground || // Default value, in case we always want to show when in foreground.
+    if (_showNotificationsWhenInForeground || // Default value, in case we always want to show when in foreground.
       userInfoJSON["gcm.notification.showWhenInForeground"] === "true" || // This is for FCM, ...
       userInfoJSON["showWhenInForeground"] === true || // ...this is for non-FCM...
       (userInfoJSON.aps && userInfoJSON.aps.showWhenInForeground === true) // ...and this as well (so users can choose where to put it).