Merge branch 'master' into v5

src/@ionic-native/plugins/onesignal/index.ts

@@ -6,11 +6,11 @@ export interface OSNotification {
   /**
    * Was app in focus.
    */
-  isAppInFocus: boolean;
+  isAppInFocus?: boolean;
   /**
    * Was notification shown to the user. Will be false for silent notifications.
    */
-  shown: boolean;
+  shown?: boolean;
   /**
    * **ANDROID** - Android Notification assigned to the notification. Can be used to cancel or replace the notification.
    */
@@ -18,17 +18,17 @@ export interface OSNotification {
   /**
    * Payload received from OneSignal.
    */
-  payload: OSNotificationPayload;
+  payload?: OSNotificationPayload;
   /**
    * How the notification was displayed to the user. Can be set to `Notification`, `InAppAlert`, or `None` if it was not displayed.
    */
-  displayType: OSDisplayType;
+  displayType?: OSDisplayType;
   /**
    * **ANDROID** - Notification is a summary notification for a group this will contain all notification payloads it was created from.
    */
   groupedNotifications?: OSNotificationPayload[];
   app_id?: string;
-  contents: any;
+  contents?: any;
   headings?: any;
   isIos?: boolean;
   isAndroid?: boolean;
@@ -60,6 +60,7 @@ export interface OSNotification {
   wp_wns_sound?: string;
   data?: any;
   buttons?: any;
+  collapse_id?: string;
   small_icon?: string;
   large_icon?: string;
   big_picture?: string;
@@ -229,9 +230,13 @@ export interface OSPermissionState {
    */
   hasPrompted: boolean;
   /**
-   * Permissions Status
+   * Permissions Status (iOS Only)
    */
   status: any;
+  /**
+   * Permissions State (Android Only)
+   */
+  state: any;
 }
 
 /**