diff --git a/api/openapi.yaml b/api/openapi.yaml index dc7a687..8e99911 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -2195,7 +2195,7 @@ paths: summary: Export CSV of Subscriptions x-content-type: application/json x-accepts: application/json - /notifications/{notification_id}/export_events?app_id={app_id}: + /notifications/{notification_id}/export_events: post: description: |- Generate a compressed CSV report of all of the events data for a notification. @@ -5953,6 +5953,15 @@ components: nullable: true type: string writeOnly: true + global_image: + description: "Channel: Push Notifications\nPlatform: All\nPicture to display\ + \ on all platforms that support it. Must be a URL to an image file.\n\ + Platform-specific picture fields (big_picture, huawei_big_picture, adm_big_picture,\ + \ chrome_web_image, ios_attachments, firefox_icon) take precedence over\ + \ this value when set.\n" + nullable: true + type: string + writeOnly: true huawei_big_picture: description: "Channel: Push Notifications\nPlatform: Huawei\nPicture to\ \ display in the expanded view. Can be a drawable resource name or a URL.\n" diff --git a/docs/BasicNotification.md b/docs/BasicNotification.md index 7bc341e..0b8389e 100644 --- a/docs/BasicNotification.md +++ b/docs/BasicNotification.md @@ -52,6 +52,7 @@ |**mutableContent** | **Boolean** | Channel: Push Notifications Platform: iOS 10+ Always defaults to true and cannot be turned off. Allows tracking of notification receives and changing of the notification content in your app before it is displayed. Triggers didReceive(_:withContentHandler:) on your UNNotificationServiceExtension. | [optional] | |**targetContentIdentifier** | **String** | Channel: Push Notifications Platform: iOS 13+ Use to target a specific experience in your App Clip, or to target your notification to a specific window in a multi-scene App. | [optional] | |**bigPicture** | **String** | Channel: Push Notifications Platform: Android Picture to display in the expanded view. Can be a drawable resource name or a URL. | [optional] | +|**globalImage** | **String** | Channel: Push Notifications Platform: All Picture to display on all platforms that support it. Must be a URL to an image file. Platform-specific picture fields (big_picture, huawei_big_picture, adm_big_picture, chrome_web_image, ios_attachments, firefox_icon) take precedence over this value when set. | [optional] | |**huaweiBigPicture** | **String** | Channel: Push Notifications Platform: Huawei Picture to display in the expanded view. Can be a drawable resource name or a URL. | [optional] | |**admBigPicture** | **String** | Channel: Push Notifications Platform: Amazon Picture to display in the expanded view. Can be a drawable resource name or a URL. | [optional] | |**chromeBigPicture** | **String** | Channel: Push Notifications Platform: ChromeApp Large picture to display below the notification text. Must be a local URL. | [optional] | diff --git a/docs/BasicNotificationAllOf.md b/docs/BasicNotificationAllOf.md index 4c3454b..e3b406e 100644 --- a/docs/BasicNotificationAllOf.md +++ b/docs/BasicNotificationAllOf.md @@ -38,6 +38,7 @@ |**mutableContent** | **Boolean** | Channel: Push Notifications Platform: iOS 10+ Always defaults to true and cannot be turned off. Allows tracking of notification receives and changing of the notification content in your app before it is displayed. Triggers didReceive(_:withContentHandler:) on your UNNotificationServiceExtension. | [optional] | |**targetContentIdentifier** | **String** | Channel: Push Notifications Platform: iOS 13+ Use to target a specific experience in your App Clip, or to target your notification to a specific window in a multi-scene App. | [optional] | |**bigPicture** | **String** | Channel: Push Notifications Platform: Android Picture to display in the expanded view. Can be a drawable resource name or a URL. | [optional] | +|**globalImage** | **String** | Channel: Push Notifications Platform: All Picture to display on all platforms that support it. Must be a URL to an image file. Platform-specific picture fields (big_picture, huawei_big_picture, adm_big_picture, chrome_web_image, ios_attachments, firefox_icon) take precedence over this value when set. | [optional] | |**huaweiBigPicture** | **String** | Channel: Push Notifications Platform: Huawei Picture to display in the expanded view. Can be a drawable resource name or a URL. | [optional] | |**admBigPicture** | **String** | Channel: Push Notifications Platform: Amazon Picture to display in the expanded view. Can be a drawable resource name or a URL. | [optional] | |**chromeBigPicture** | **String** | Channel: Push Notifications Platform: ChromeApp Large picture to display below the notification text. Must be a local URL. | [optional] | diff --git a/docs/DefaultApi.md b/docs/DefaultApi.md index 6bd60f0..9e2c778 100644 --- a/docs/DefaultApi.md +++ b/docs/DefaultApi.md @@ -22,7 +22,7 @@ All URIs are relative to *https://api.onesignal.com* | [**deleteSubscription**](DefaultApi.md#deleteSubscription) | **DELETE** /apps/{app_id}/subscriptions/{subscription_id} | | | [**deleteTemplate**](DefaultApi.md#deleteTemplate) | **DELETE** /templates/{template_id} | Delete template | | [**deleteUser**](DefaultApi.md#deleteUser) | **DELETE** /apps/{app_id}/users/by/{alias_label}/{alias_id} | | -| [**exportEvents**](DefaultApi.md#exportEvents) | **POST** /notifications/{notification_id}/export_events?app_id={app_id} | Export CSV of Events | +| [**exportEvents**](DefaultApi.md#exportEvents) | **POST** /notifications/{notification_id}/export_events | Export CSV of Events | | [**exportSubscriptions**](DefaultApi.md#exportSubscriptions) | **POST** /players/csv_export?app_id={app_id} | Export CSV of Subscriptions | | [**getAliases**](DefaultApi.md#getAliases) | **GET** /apps/{app_id}/users/by/{alias_label}/{alias_id}/identity | | | [**getAliasesBySubscription**](DefaultApi.md#getAliasesBySubscription) | **GET** /apps/{app_id}/subscriptions/{subscription_id}/user/identity | | diff --git a/docs/Notification.md b/docs/Notification.md index 5e59357..bf9988f 100644 --- a/docs/Notification.md +++ b/docs/Notification.md @@ -52,6 +52,7 @@ |**mutableContent** | **Boolean** | Channel: Push Notifications Platform: iOS 10+ Always defaults to true and cannot be turned off. Allows tracking of notification receives and changing of the notification content in your app before it is displayed. Triggers didReceive(_:withContentHandler:) on your UNNotificationServiceExtension. | [optional] | |**targetContentIdentifier** | **String** | Channel: Push Notifications Platform: iOS 13+ Use to target a specific experience in your App Clip, or to target your notification to a specific window in a multi-scene App. | [optional] | |**bigPicture** | **String** | Channel: Push Notifications Platform: Android Picture to display in the expanded view. Can be a drawable resource name or a URL. | [optional] | +|**globalImage** | **String** | Channel: Push Notifications Platform: All Picture to display on all platforms that support it. Must be a URL to an image file. Platform-specific picture fields (big_picture, huawei_big_picture, adm_big_picture, chrome_web_image, ios_attachments, firefox_icon) take precedence over this value when set. | [optional] | |**huaweiBigPicture** | **String** | Channel: Push Notifications Platform: Huawei Picture to display in the expanded view. Can be a drawable resource name or a URL. | [optional] | |**admBigPicture** | **String** | Channel: Push Notifications Platform: Amazon Picture to display in the expanded view. Can be a drawable resource name or a URL. | [optional] | |**chromeBigPicture** | **String** | Channel: Push Notifications Platform: ChromeApp Large picture to display below the notification text. Must be a local URL. | [optional] | diff --git a/docs/NotificationWithMeta.md b/docs/NotificationWithMeta.md index c410f93..53f43ed 100644 --- a/docs/NotificationWithMeta.md +++ b/docs/NotificationWithMeta.md @@ -52,6 +52,7 @@ |**mutableContent** | **Boolean** | Channel: Push Notifications Platform: iOS 10+ Always defaults to true and cannot be turned off. Allows tracking of notification receives and changing of the notification content in your app before it is displayed. Triggers didReceive(_:withContentHandler:) on your UNNotificationServiceExtension. | [optional] | |**targetContentIdentifier** | **String** | Channel: Push Notifications Platform: iOS 13+ Use to target a specific experience in your App Clip, or to target your notification to a specific window in a multi-scene App. | [optional] | |**bigPicture** | **String** | Channel: Push Notifications Platform: Android Picture to display in the expanded view. Can be a drawable resource name or a URL. | [optional] | +|**globalImage** | **String** | Channel: Push Notifications Platform: All Picture to display on all platforms that support it. Must be a URL to an image file. Platform-specific picture fields (big_picture, huawei_big_picture, adm_big_picture, chrome_web_image, ios_attachments, firefox_icon) take precedence over this value when set. | [optional] | |**huaweiBigPicture** | **String** | Channel: Push Notifications Platform: Huawei Picture to display in the expanded view. Can be a drawable resource name or a URL. | [optional] | |**admBigPicture** | **String** | Channel: Push Notifications Platform: Amazon Picture to display in the expanded view. Can be a drawable resource name or a URL. | [optional] | |**chromeBigPicture** | **String** | Channel: Push Notifications Platform: ChromeApp Large picture to display below the notification text. Must be a local URL. | [optional] | diff --git a/src/main/java/com/onesignal/client/api/DefaultApi.java b/src/main/java/com/onesignal/client/api/DefaultApi.java index 40a11df..1e549a4 100644 --- a/src/main/java/com/onesignal/client/api/DefaultApi.java +++ b/src/main/java/com/onesignal/client/api/DefaultApi.java @@ -2994,7 +2994,7 @@ public okhttp3.Call exportEventsCall(String notificationId, String appId, final Object localVarPostBody = null; // create path and map variables - String localVarPath = "/notifications/{notification_id}/export_events?app_id={app_id}" + String localVarPath = "/notifications/{notification_id}/export_events" .replaceAll("\\{" + "notification_id" + "\\}", localVarApiClient.escapeString(notificationId.toString())); List localVarQueryParams = new ArrayList(); diff --git a/src/main/java/com/onesignal/client/model/BasicNotification.java b/src/main/java/com/onesignal/client/model/BasicNotification.java index a2e2548..fc2c3a3 100644 --- a/src/main/java/com/onesignal/client/model/BasicNotification.java +++ b/src/main/java/com/onesignal/client/model/BasicNotification.java @@ -341,6 +341,10 @@ public AggregationEnum read(final JsonReader jsonReader) throws IOException { @SerializedName(SERIALIZED_NAME_BIG_PICTURE) private String bigPicture; + public static final String SERIALIZED_NAME_GLOBAL_IMAGE = "global_image"; + @SerializedName(SERIALIZED_NAME_GLOBAL_IMAGE) + private String globalImage; + public static final String SERIALIZED_NAME_HUAWEI_BIG_PICTURE = "huawei_big_picture"; @SerializedName(SERIALIZED_NAME_HUAWEI_BIG_PICTURE) private String huaweiBigPicture; @@ -1834,6 +1838,29 @@ public void setBigPicture(String bigPicture) { } + public BasicNotification globalImage(String globalImage) { + + this.globalImage = globalImage; + return this; + } + + /** + * Channel: Push Notifications Platform: All Picture to display on all platforms that support it. Must be a URL to an image file. Platform-specific picture fields (big_picture, huawei_big_picture, adm_big_picture, chrome_web_image, ios_attachments, firefox_icon) take precedence over this value when set. + * @return globalImage + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Channel: Push Notifications Platform: All Picture to display on all platforms that support it. Must be a URL to an image file. Platform-specific picture fields (big_picture, huawei_big_picture, adm_big_picture, chrome_web_image, ios_attachments, firefox_icon) take precedence over this value when set. ") + + public String getGlobalImage() { + return globalImage; + } + + + public void setGlobalImage(String globalImage) { + this.globalImage = globalImage; + } + + public BasicNotification huaweiBigPicture(String huaweiBigPicture) { this.huaweiBigPicture = huaweiBigPicture; @@ -3585,6 +3612,7 @@ public boolean equals(Object o) { Objects.equals(this.mutableContent, basicNotification.mutableContent) && Objects.equals(this.targetContentIdentifier, basicNotification.targetContentIdentifier) && Objects.equals(this.bigPicture, basicNotification.bigPicture) && + Objects.equals(this.globalImage, basicNotification.globalImage) && Objects.equals(this.huaweiBigPicture, basicNotification.huaweiBigPicture) && Objects.equals(this.admBigPicture, basicNotification.admBigPicture) && Objects.equals(this.chromeBigPicture, basicNotification.chromeBigPicture) && @@ -3665,7 +3693,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(includedSegments, excludedSegments, includeSubscriptionIds, includeEmailTokens, emailTo, includePhoneNumbers, includeIosTokens, includeWpWnsUris, includeAmazonRegIds, includeChromeRegIds, includeChromeWebRegIds, includeAndroidRegIds, includeAliases, targetChannel, id, value, name, aggregation, isIos, isAndroid, isHuawei, isAnyWeb, isChromeWeb, isFirefox, isSafari, isWPWNS, isAdm, isChrome, appId, externalId, idempotencyKey, contents, headings, subtitle, data, huaweiMsgType, url, webUrl, appUrl, iosAttachments, templateId, contentAvailable, mutableContent, targetContentIdentifier, bigPicture, huaweiBigPicture, admBigPicture, chromeBigPicture, chromeWebImage, buttons, webButtons, iosCategory, androidChannelId, huaweiChannelId, existingAndroidChannelId, huaweiExistingChannelId, androidBackgroundLayout, smallIcon, huaweiSmallIcon, largeIcon, huaweiLargeIcon, admSmallIcon, admLargeIcon, chromeWebIcon, chromeWebBadge, firefoxIcon, chromeIcon, iosSound, androidSound, huaweiSound, admSound, wpWnsSound, androidLedColor, huaweiLedColor, androidAccentColor, huaweiAccentColor, androidVisibility, huaweiVisibility, iosBadgeType, iosBadgeCount, collapseId, webPushTopic, apnsAlert, delayedOption, deliveryTimeOfDay, ttl, priority, apnsPushTypeOverride, throttleRatePerMinute, androidGroup, androidGroupMessage, admGroup, admGroupMessage, threadId, summaryArg, summaryArgCount, iosRelevanceScore, iosInterruptionLevel, emailSubject, emailBody, emailFromName, emailFromAddress, emailReplyToAddress, emailPreheader, disableEmailClickTracking, includeUnsubscribed, emailBcc, emailSenderDomain, smsFrom, smsMediaUrls, filters, customData, huaweiBadgeClass, huaweiBadgeAddNum, huaweiBadgeSetNum, huaweiCategory, huaweiBiTag); + return Objects.hash(includedSegments, excludedSegments, includeSubscriptionIds, includeEmailTokens, emailTo, includePhoneNumbers, includeIosTokens, includeWpWnsUris, includeAmazonRegIds, includeChromeRegIds, includeChromeWebRegIds, includeAndroidRegIds, includeAliases, targetChannel, id, value, name, aggregation, isIos, isAndroid, isHuawei, isAnyWeb, isChromeWeb, isFirefox, isSafari, isWPWNS, isAdm, isChrome, appId, externalId, idempotencyKey, contents, headings, subtitle, data, huaweiMsgType, url, webUrl, appUrl, iosAttachments, templateId, contentAvailable, mutableContent, targetContentIdentifier, bigPicture, globalImage, huaweiBigPicture, admBigPicture, chromeBigPicture, chromeWebImage, buttons, webButtons, iosCategory, androidChannelId, huaweiChannelId, existingAndroidChannelId, huaweiExistingChannelId, androidBackgroundLayout, smallIcon, huaweiSmallIcon, largeIcon, huaweiLargeIcon, admSmallIcon, admLargeIcon, chromeWebIcon, chromeWebBadge, firefoxIcon, chromeIcon, iosSound, androidSound, huaweiSound, admSound, wpWnsSound, androidLedColor, huaweiLedColor, androidAccentColor, huaweiAccentColor, androidVisibility, huaweiVisibility, iosBadgeType, iosBadgeCount, collapseId, webPushTopic, apnsAlert, delayedOption, deliveryTimeOfDay, ttl, priority, apnsPushTypeOverride, throttleRatePerMinute, androidGroup, androidGroupMessage, admGroup, admGroupMessage, threadId, summaryArg, summaryArgCount, iosRelevanceScore, iosInterruptionLevel, emailSubject, emailBody, emailFromName, emailFromAddress, emailReplyToAddress, emailPreheader, disableEmailClickTracking, includeUnsubscribed, emailBcc, emailSenderDomain, smsFrom, smsMediaUrls, filters, customData, huaweiBadgeClass, huaweiBadgeAddNum, huaweiBadgeSetNum, huaweiCategory, huaweiBiTag); } private static int hashCodeNullable(JsonNullable a) { @@ -3724,6 +3752,7 @@ public String toString() { sb.append(" mutableContent: ").append(toIndentedString(mutableContent)).append("\n"); sb.append(" targetContentIdentifier: ").append(toIndentedString(targetContentIdentifier)).append("\n"); sb.append(" bigPicture: ").append(toIndentedString(bigPicture)).append("\n"); + sb.append(" globalImage: ").append(toIndentedString(globalImage)).append("\n"); sb.append(" huaweiBigPicture: ").append(toIndentedString(huaweiBigPicture)).append("\n"); sb.append(" admBigPicture: ").append(toIndentedString(admBigPicture)).append("\n"); sb.append(" chromeBigPicture: ").append(toIndentedString(chromeBigPicture)).append("\n"); @@ -3863,6 +3892,7 @@ private String toIndentedString(Object o) { openapiFields.add("mutable_content"); openapiFields.add("target_content_identifier"); openapiFields.add("big_picture"); + openapiFields.add("global_image"); openapiFields.add("huawei_big_picture"); openapiFields.add("adm_big_picture"); openapiFields.add("chrome_big_picture"); diff --git a/src/main/java/com/onesignal/client/model/BasicNotificationAllOf.java b/src/main/java/com/onesignal/client/model/BasicNotificationAllOf.java index 95eb0dc..1c83c8d 100644 --- a/src/main/java/com/onesignal/client/model/BasicNotificationAllOf.java +++ b/src/main/java/com/onesignal/client/model/BasicNotificationAllOf.java @@ -232,6 +232,10 @@ public AggregationEnum read(final JsonReader jsonReader) throws IOException { @SerializedName(SERIALIZED_NAME_BIG_PICTURE) private String bigPicture; + public static final String SERIALIZED_NAME_GLOBAL_IMAGE = "global_image"; + @SerializedName(SERIALIZED_NAME_GLOBAL_IMAGE) + private String globalImage; + public static final String SERIALIZED_NAME_HUAWEI_BIG_PICTURE = "huawei_big_picture"; @SerializedName(SERIALIZED_NAME_HUAWEI_BIG_PICTURE) private String huaweiBigPicture; @@ -1297,6 +1301,29 @@ public void setBigPicture(String bigPicture) { } + public BasicNotificationAllOf globalImage(String globalImage) { + + this.globalImage = globalImage; + return this; + } + + /** + * Channel: Push Notifications Platform: All Picture to display on all platforms that support it. Must be a URL to an image file. Platform-specific picture fields (big_picture, huawei_big_picture, adm_big_picture, chrome_web_image, ios_attachments, firefox_icon) take precedence over this value when set. + * @return globalImage + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Channel: Push Notifications Platform: All Picture to display on all platforms that support it. Must be a URL to an image file. Platform-specific picture fields (big_picture, huawei_big_picture, adm_big_picture, chrome_web_image, ios_attachments, firefox_icon) take precedence over this value when set. ") + + public String getGlobalImage() { + return globalImage; + } + + + public void setGlobalImage(String globalImage) { + this.globalImage = globalImage; + } + + public BasicNotificationAllOf huaweiBigPicture(String huaweiBigPicture) { this.huaweiBigPicture = huaweiBigPicture; @@ -3034,6 +3061,7 @@ public boolean equals(Object o) { Objects.equals(this.mutableContent, basicNotificationAllOf.mutableContent) && Objects.equals(this.targetContentIdentifier, basicNotificationAllOf.targetContentIdentifier) && Objects.equals(this.bigPicture, basicNotificationAllOf.bigPicture) && + Objects.equals(this.globalImage, basicNotificationAllOf.globalImage) && Objects.equals(this.huaweiBigPicture, basicNotificationAllOf.huaweiBigPicture) && Objects.equals(this.admBigPicture, basicNotificationAllOf.admBigPicture) && Objects.equals(this.chromeBigPicture, basicNotificationAllOf.chromeBigPicture) && @@ -3114,7 +3142,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(id, value, name, aggregation, isIos, isAndroid, isHuawei, isAnyWeb, isChromeWeb, isFirefox, isSafari, isWPWNS, isAdm, isChrome, appId, externalId, idempotencyKey, contents, headings, subtitle, data, huaweiMsgType, url, webUrl, appUrl, iosAttachments, templateId, contentAvailable, mutableContent, targetContentIdentifier, bigPicture, huaweiBigPicture, admBigPicture, chromeBigPicture, chromeWebImage, buttons, webButtons, iosCategory, androidChannelId, huaweiChannelId, existingAndroidChannelId, huaweiExistingChannelId, androidBackgroundLayout, smallIcon, huaweiSmallIcon, largeIcon, huaweiLargeIcon, admSmallIcon, admLargeIcon, chromeWebIcon, chromeWebBadge, firefoxIcon, chromeIcon, iosSound, androidSound, huaweiSound, admSound, wpWnsSound, androidLedColor, huaweiLedColor, androidAccentColor, huaweiAccentColor, androidVisibility, huaweiVisibility, iosBadgeType, iosBadgeCount, collapseId, webPushTopic, apnsAlert, delayedOption, deliveryTimeOfDay, ttl, priority, apnsPushTypeOverride, throttleRatePerMinute, androidGroup, androidGroupMessage, admGroup, admGroupMessage, threadId, summaryArg, summaryArgCount, iosRelevanceScore, iosInterruptionLevel, emailSubject, emailBody, emailFromName, emailFromAddress, emailReplyToAddress, emailPreheader, disableEmailClickTracking, includeUnsubscribed, emailBcc, emailSenderDomain, smsFrom, smsMediaUrls, filters, customData, huaweiBadgeClass, huaweiBadgeAddNum, huaweiBadgeSetNum, huaweiCategory, huaweiBiTag); + return Objects.hash(id, value, name, aggregation, isIos, isAndroid, isHuawei, isAnyWeb, isChromeWeb, isFirefox, isSafari, isWPWNS, isAdm, isChrome, appId, externalId, idempotencyKey, contents, headings, subtitle, data, huaweiMsgType, url, webUrl, appUrl, iosAttachments, templateId, contentAvailable, mutableContent, targetContentIdentifier, bigPicture, globalImage, huaweiBigPicture, admBigPicture, chromeBigPicture, chromeWebImage, buttons, webButtons, iosCategory, androidChannelId, huaweiChannelId, existingAndroidChannelId, huaweiExistingChannelId, androidBackgroundLayout, smallIcon, huaweiSmallIcon, largeIcon, huaweiLargeIcon, admSmallIcon, admLargeIcon, chromeWebIcon, chromeWebBadge, firefoxIcon, chromeIcon, iosSound, androidSound, huaweiSound, admSound, wpWnsSound, androidLedColor, huaweiLedColor, androidAccentColor, huaweiAccentColor, androidVisibility, huaweiVisibility, iosBadgeType, iosBadgeCount, collapseId, webPushTopic, apnsAlert, delayedOption, deliveryTimeOfDay, ttl, priority, apnsPushTypeOverride, throttleRatePerMinute, androidGroup, androidGroupMessage, admGroup, admGroupMessage, threadId, summaryArg, summaryArgCount, iosRelevanceScore, iosInterruptionLevel, emailSubject, emailBody, emailFromName, emailFromAddress, emailReplyToAddress, emailPreheader, disableEmailClickTracking, includeUnsubscribed, emailBcc, emailSenderDomain, smsFrom, smsMediaUrls, filters, customData, huaweiBadgeClass, huaweiBadgeAddNum, huaweiBadgeSetNum, huaweiCategory, huaweiBiTag); } private static int hashCodeNullable(JsonNullable a) { @@ -3159,6 +3187,7 @@ public String toString() { sb.append(" mutableContent: ").append(toIndentedString(mutableContent)).append("\n"); sb.append(" targetContentIdentifier: ").append(toIndentedString(targetContentIdentifier)).append("\n"); sb.append(" bigPicture: ").append(toIndentedString(bigPicture)).append("\n"); + sb.append(" globalImage: ").append(toIndentedString(globalImage)).append("\n"); sb.append(" huaweiBigPicture: ").append(toIndentedString(huaweiBigPicture)).append("\n"); sb.append(" admBigPicture: ").append(toIndentedString(admBigPicture)).append("\n"); sb.append(" chromeBigPicture: ").append(toIndentedString(chromeBigPicture)).append("\n"); @@ -3284,6 +3313,7 @@ private String toIndentedString(Object o) { openapiFields.add("mutable_content"); openapiFields.add("target_content_identifier"); openapiFields.add("big_picture"); + openapiFields.add("global_image"); openapiFields.add("huawei_big_picture"); openapiFields.add("adm_big_picture"); openapiFields.add("chrome_big_picture"); diff --git a/src/main/java/com/onesignal/client/model/Notification.java b/src/main/java/com/onesignal/client/model/Notification.java index 7c587e2..da4d0fb 100644 --- a/src/main/java/com/onesignal/client/model/Notification.java +++ b/src/main/java/com/onesignal/client/model/Notification.java @@ -342,6 +342,10 @@ public AggregationEnum read(final JsonReader jsonReader) throws IOException { @SerializedName(SERIALIZED_NAME_BIG_PICTURE) private String bigPicture; + public static final String SERIALIZED_NAME_GLOBAL_IMAGE = "global_image"; + @SerializedName(SERIALIZED_NAME_GLOBAL_IMAGE) + private String globalImage; + public static final String SERIALIZED_NAME_HUAWEI_BIG_PICTURE = "huawei_big_picture"; @SerializedName(SERIALIZED_NAME_HUAWEI_BIG_PICTURE) private String huaweiBigPicture; @@ -1839,6 +1843,29 @@ public void setBigPicture(String bigPicture) { } + public Notification globalImage(String globalImage) { + + this.globalImage = globalImage; + return this; + } + + /** + * Channel: Push Notifications Platform: All Picture to display on all platforms that support it. Must be a URL to an image file. Platform-specific picture fields (big_picture, huawei_big_picture, adm_big_picture, chrome_web_image, ios_attachments, firefox_icon) take precedence over this value when set. + * @return globalImage + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Channel: Push Notifications Platform: All Picture to display on all platforms that support it. Must be a URL to an image file. Platform-specific picture fields (big_picture, huawei_big_picture, adm_big_picture, chrome_web_image, ios_attachments, firefox_icon) take precedence over this value when set. ") + + public String getGlobalImage() { + return globalImage; + } + + + public void setGlobalImage(String globalImage) { + this.globalImage = globalImage; + } + + public Notification huaweiBigPicture(String huaweiBigPicture) { this.huaweiBigPicture = huaweiBigPicture; @@ -3613,6 +3640,7 @@ public boolean equals(Object o) { Objects.equals(this.mutableContent, notification.mutableContent) && Objects.equals(this.targetContentIdentifier, notification.targetContentIdentifier) && Objects.equals(this.bigPicture, notification.bigPicture) && + Objects.equals(this.globalImage, notification.globalImage) && Objects.equals(this.huaweiBigPicture, notification.huaweiBigPicture) && Objects.equals(this.admBigPicture, notification.admBigPicture) && Objects.equals(this.chromeBigPicture, notification.chromeBigPicture) && @@ -3694,7 +3722,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(includedSegments, excludedSegments, includeSubscriptionIds, includeEmailTokens, emailTo, includePhoneNumbers, includeIosTokens, includeWpWnsUris, includeAmazonRegIds, includeChromeRegIds, includeChromeWebRegIds, includeAndroidRegIds, includeAliases, targetChannel, id, value, name, aggregation, isIos, isAndroid, isHuawei, isAnyWeb, isChromeWeb, isFirefox, isSafari, isWPWNS, isAdm, isChrome, appId, externalId, idempotencyKey, contents, headings, subtitle, data, huaweiMsgType, url, webUrl, appUrl, iosAttachments, templateId, contentAvailable, mutableContent, targetContentIdentifier, bigPicture, huaweiBigPicture, admBigPicture, chromeBigPicture, chromeWebImage, buttons, webButtons, iosCategory, androidChannelId, huaweiChannelId, existingAndroidChannelId, huaweiExistingChannelId, androidBackgroundLayout, smallIcon, huaweiSmallIcon, largeIcon, huaweiLargeIcon, admSmallIcon, admLargeIcon, chromeWebIcon, chromeWebBadge, firefoxIcon, chromeIcon, iosSound, androidSound, huaweiSound, admSound, wpWnsSound, androidLedColor, huaweiLedColor, androidAccentColor, huaweiAccentColor, androidVisibility, huaweiVisibility, iosBadgeType, iosBadgeCount, collapseId, webPushTopic, apnsAlert, delayedOption, deliveryTimeOfDay, ttl, priority, apnsPushTypeOverride, throttleRatePerMinute, androidGroup, androidGroupMessage, admGroup, admGroupMessage, threadId, summaryArg, summaryArgCount, iosRelevanceScore, iosInterruptionLevel, emailSubject, emailBody, emailFromName, emailFromAddress, emailReplyToAddress, emailPreheader, disableEmailClickTracking, includeUnsubscribed, emailBcc, emailSenderDomain, smsFrom, smsMediaUrls, filters, customData, huaweiBadgeClass, huaweiBadgeAddNum, huaweiBadgeSetNum, huaweiCategory, huaweiBiTag, sendAfter); + return Objects.hash(includedSegments, excludedSegments, includeSubscriptionIds, includeEmailTokens, emailTo, includePhoneNumbers, includeIosTokens, includeWpWnsUris, includeAmazonRegIds, includeChromeRegIds, includeChromeWebRegIds, includeAndroidRegIds, includeAliases, targetChannel, id, value, name, aggregation, isIos, isAndroid, isHuawei, isAnyWeb, isChromeWeb, isFirefox, isSafari, isWPWNS, isAdm, isChrome, appId, externalId, idempotencyKey, contents, headings, subtitle, data, huaweiMsgType, url, webUrl, appUrl, iosAttachments, templateId, contentAvailable, mutableContent, targetContentIdentifier, bigPicture, globalImage, huaweiBigPicture, admBigPicture, chromeBigPicture, chromeWebImage, buttons, webButtons, iosCategory, androidChannelId, huaweiChannelId, existingAndroidChannelId, huaweiExistingChannelId, androidBackgroundLayout, smallIcon, huaweiSmallIcon, largeIcon, huaweiLargeIcon, admSmallIcon, admLargeIcon, chromeWebIcon, chromeWebBadge, firefoxIcon, chromeIcon, iosSound, androidSound, huaweiSound, admSound, wpWnsSound, androidLedColor, huaweiLedColor, androidAccentColor, huaweiAccentColor, androidVisibility, huaweiVisibility, iosBadgeType, iosBadgeCount, collapseId, webPushTopic, apnsAlert, delayedOption, deliveryTimeOfDay, ttl, priority, apnsPushTypeOverride, throttleRatePerMinute, androidGroup, androidGroupMessage, admGroup, admGroupMessage, threadId, summaryArg, summaryArgCount, iosRelevanceScore, iosInterruptionLevel, emailSubject, emailBody, emailFromName, emailFromAddress, emailReplyToAddress, emailPreheader, disableEmailClickTracking, includeUnsubscribed, emailBcc, emailSenderDomain, smsFrom, smsMediaUrls, filters, customData, huaweiBadgeClass, huaweiBadgeAddNum, huaweiBadgeSetNum, huaweiCategory, huaweiBiTag, sendAfter); } private static int hashCodeNullable(JsonNullable a) { @@ -3753,6 +3781,7 @@ public String toString() { sb.append(" mutableContent: ").append(toIndentedString(mutableContent)).append("\n"); sb.append(" targetContentIdentifier: ").append(toIndentedString(targetContentIdentifier)).append("\n"); sb.append(" bigPicture: ").append(toIndentedString(bigPicture)).append("\n"); + sb.append(" globalImage: ").append(toIndentedString(globalImage)).append("\n"); sb.append(" huaweiBigPicture: ").append(toIndentedString(huaweiBigPicture)).append("\n"); sb.append(" admBigPicture: ").append(toIndentedString(admBigPicture)).append("\n"); sb.append(" chromeBigPicture: ").append(toIndentedString(chromeBigPicture)).append("\n"); @@ -3893,6 +3922,7 @@ private String toIndentedString(Object o) { openapiFields.add("mutable_content"); openapiFields.add("target_content_identifier"); openapiFields.add("big_picture"); + openapiFields.add("global_image"); openapiFields.add("huawei_big_picture"); openapiFields.add("adm_big_picture"); openapiFields.add("chrome_big_picture"); diff --git a/src/main/java/com/onesignal/client/model/NotificationWithMeta.java b/src/main/java/com/onesignal/client/model/NotificationWithMeta.java index 2b1d3d3..08e8dbd 100644 --- a/src/main/java/com/onesignal/client/model/NotificationWithMeta.java +++ b/src/main/java/com/onesignal/client/model/NotificationWithMeta.java @@ -345,6 +345,10 @@ public AggregationEnum read(final JsonReader jsonReader) throws IOException { @SerializedName(SERIALIZED_NAME_BIG_PICTURE) private String bigPicture; + public static final String SERIALIZED_NAME_GLOBAL_IMAGE = "global_image"; + @SerializedName(SERIALIZED_NAME_GLOBAL_IMAGE) + private String globalImage; + public static final String SERIALIZED_NAME_HUAWEI_BIG_PICTURE = "huawei_big_picture"; @SerializedName(SERIALIZED_NAME_HUAWEI_BIG_PICTURE) private String huaweiBigPicture; @@ -1890,6 +1894,29 @@ public void setBigPicture(String bigPicture) { } + public NotificationWithMeta globalImage(String globalImage) { + + this.globalImage = globalImage; + return this; + } + + /** + * Channel: Push Notifications Platform: All Picture to display on all platforms that support it. Must be a URL to an image file. Platform-specific picture fields (big_picture, huawei_big_picture, adm_big_picture, chrome_web_image, ios_attachments, firefox_icon) take precedence over this value when set. + * @return globalImage + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Channel: Push Notifications Platform: All Picture to display on all platforms that support it. Must be a URL to an image file. Platform-specific picture fields (big_picture, huawei_big_picture, adm_big_picture, chrome_web_image, ios_attachments, firefox_icon) take precedence over this value when set. ") + + public String getGlobalImage() { + return globalImage; + } + + + public void setGlobalImage(String globalImage) { + this.globalImage = globalImage; + } + + public NotificationWithMeta huaweiBigPicture(String huaweiBigPicture) { this.huaweiBigPicture = huaweiBigPicture; @@ -3948,6 +3975,7 @@ public boolean equals(Object o) { Objects.equals(this.mutableContent, notificationWithMeta.mutableContent) && Objects.equals(this.targetContentIdentifier, notificationWithMeta.targetContentIdentifier) && Objects.equals(this.bigPicture, notificationWithMeta.bigPicture) && + Objects.equals(this.globalImage, notificationWithMeta.globalImage) && Objects.equals(this.huaweiBigPicture, notificationWithMeta.huaweiBigPicture) && Objects.equals(this.admBigPicture, notificationWithMeta.admBigPicture) && Objects.equals(this.chromeBigPicture, notificationWithMeta.chromeBigPicture) && @@ -4041,7 +4069,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(includedSegments, excludedSegments, includeSubscriptionIds, includeEmailTokens, emailTo, includePhoneNumbers, includeIosTokens, includeWpWnsUris, includeAmazonRegIds, includeChromeRegIds, includeChromeWebRegIds, includeAndroidRegIds, includeAliases, targetChannel, id, value, name, aggregation, isIos, isAndroid, isHuawei, isAnyWeb, isChromeWeb, isFirefox, isSafari, isWPWNS, isAdm, isChrome, appId, externalId, idempotencyKey, contents, headings, subtitle, data, huaweiMsgType, url, webUrl, appUrl, iosAttachments, templateId, contentAvailable, mutableContent, targetContentIdentifier, bigPicture, huaweiBigPicture, admBigPicture, chromeBigPicture, chromeWebImage, buttons, webButtons, iosCategory, androidChannelId, huaweiChannelId, existingAndroidChannelId, huaweiExistingChannelId, androidBackgroundLayout, smallIcon, huaweiSmallIcon, largeIcon, huaweiLargeIcon, admSmallIcon, admLargeIcon, chromeWebIcon, chromeWebBadge, firefoxIcon, chromeIcon, iosSound, androidSound, huaweiSound, admSound, wpWnsSound, androidLedColor, huaweiLedColor, androidAccentColor, huaweiAccentColor, androidVisibility, huaweiVisibility, iosBadgeType, iosBadgeCount, collapseId, webPushTopic, apnsAlert, delayedOption, deliveryTimeOfDay, ttl, priority, apnsPushTypeOverride, throttleRatePerMinute, androidGroup, androidGroupMessage, admGroup, admGroupMessage, threadId, summaryArg, summaryArgCount, iosRelevanceScore, iosInterruptionLevel, emailSubject, emailBody, emailFromName, emailFromAddress, emailReplyToAddress, emailPreheader, disableEmailClickTracking, includeUnsubscribed, emailBcc, emailSenderDomain, smsFrom, smsMediaUrls, filters, customData, huaweiBadgeClass, huaweiBadgeAddNum, huaweiBadgeSetNum, huaweiCategory, huaweiBiTag, successful, failed, errored, converted, received, outcomes, remaining, queuedAt, sendAfter, completedAt, platformDeliveryStats, canceled, bccSent); + return Objects.hash(includedSegments, excludedSegments, includeSubscriptionIds, includeEmailTokens, emailTo, includePhoneNumbers, includeIosTokens, includeWpWnsUris, includeAmazonRegIds, includeChromeRegIds, includeChromeWebRegIds, includeAndroidRegIds, includeAliases, targetChannel, id, value, name, aggregation, isIos, isAndroid, isHuawei, isAnyWeb, isChromeWeb, isFirefox, isSafari, isWPWNS, isAdm, isChrome, appId, externalId, idempotencyKey, contents, headings, subtitle, data, huaweiMsgType, url, webUrl, appUrl, iosAttachments, templateId, contentAvailable, mutableContent, targetContentIdentifier, bigPicture, globalImage, huaweiBigPicture, admBigPicture, chromeBigPicture, chromeWebImage, buttons, webButtons, iosCategory, androidChannelId, huaweiChannelId, existingAndroidChannelId, huaweiExistingChannelId, androidBackgroundLayout, smallIcon, huaweiSmallIcon, largeIcon, huaweiLargeIcon, admSmallIcon, admLargeIcon, chromeWebIcon, chromeWebBadge, firefoxIcon, chromeIcon, iosSound, androidSound, huaweiSound, admSound, wpWnsSound, androidLedColor, huaweiLedColor, androidAccentColor, huaweiAccentColor, androidVisibility, huaweiVisibility, iosBadgeType, iosBadgeCount, collapseId, webPushTopic, apnsAlert, delayedOption, deliveryTimeOfDay, ttl, priority, apnsPushTypeOverride, throttleRatePerMinute, androidGroup, androidGroupMessage, admGroup, admGroupMessage, threadId, summaryArg, summaryArgCount, iosRelevanceScore, iosInterruptionLevel, emailSubject, emailBody, emailFromName, emailFromAddress, emailReplyToAddress, emailPreheader, disableEmailClickTracking, includeUnsubscribed, emailBcc, emailSenderDomain, smsFrom, smsMediaUrls, filters, customData, huaweiBadgeClass, huaweiBadgeAddNum, huaweiBadgeSetNum, huaweiCategory, huaweiBiTag, successful, failed, errored, converted, received, outcomes, remaining, queuedAt, sendAfter, completedAt, platformDeliveryStats, canceled, bccSent); } private static int hashCodeNullable(JsonNullable a) { @@ -4100,6 +4128,7 @@ public String toString() { sb.append(" mutableContent: ").append(toIndentedString(mutableContent)).append("\n"); sb.append(" targetContentIdentifier: ").append(toIndentedString(targetContentIdentifier)).append("\n"); sb.append(" bigPicture: ").append(toIndentedString(bigPicture)).append("\n"); + sb.append(" globalImage: ").append(toIndentedString(globalImage)).append("\n"); sb.append(" huaweiBigPicture: ").append(toIndentedString(huaweiBigPicture)).append("\n"); sb.append(" admBigPicture: ").append(toIndentedString(admBigPicture)).append("\n"); sb.append(" chromeBigPicture: ").append(toIndentedString(chromeBigPicture)).append("\n"); @@ -4252,6 +4281,7 @@ private String toIndentedString(Object o) { openapiFields.add("mutable_content"); openapiFields.add("target_content_identifier"); openapiFields.add("big_picture"); + openapiFields.add("global_image"); openapiFields.add("huawei_big_picture"); openapiFields.add("adm_big_picture"); openapiFields.add("chrome_big_picture");