fix(pinpoint): Remove GCM service as target class usage as it is no l…

…onger allowed in Android 12. (#3110) * Remove GCM service class usage as it is no longer allowed in Android 12.
aws-amplify · Dec 6, 2022 · 094d097 · 094d097
1 parent da2b058
commit 094d097
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/...va/com/amazonaws/mobileconnectors/pinpoint/targeting/notification/NotificationClient.java b/...va/com/amazonaws/mobileconnectors/pinpoint/targeting/notification/NotificationClient.java
@@ -183,8 +183,7 @@ public CampaignPushResult handleFCMCampaignPush(final String from,
      *
      * @param from         the from string received by the GCM service
      * @param data         the bundle received from the GCM service
-     * @param serviceClass the class extending GCMListenerService that handles
-     *                     receiving GCM messages.
+     * @param serviceClass No longer used due to Android 12 restrictions
      * @return {@link PushResult}.
      *
      * @deprecated Use {@link #handleCampaignPush(NotificationDetails)} instead.
@@ -195,7 +194,6 @@ public CampaignPushResult handleGCMCampaignPush(final String from, final Bundle
                 NotificationDetails.builder()
                 .from(from)
                 .bundle(data)
-                .serviceClass(serviceClass)
                 .intentAction(GCM_INTENT_ACTION);
         return handleCampaignPush(notificationDetailsBuilder.build());
     }

diff --git a/...a/com/amazonaws/mobileconnectors/pinpoint/targeting/notification/NotificationDetails.java b/...a/com/amazonaws/mobileconnectors/pinpoint/targeting/notification/NotificationDetails.java
@@ -97,7 +97,6 @@ public static NotificationDetailsBuilder builder() {
      * new NotificationDetails.builder()
      *      .from(from)
      *      .bundle(bundle)
-     *      .serviceClass(serviceClass)
      *      .intentAction(NotificationClient.GCM_INTENT_ACTION)
      *      .build();
      *
@@ -111,7 +110,6 @@ public static NotificationDetailsBuilder builder() {
      * ADM example:
      *  new NotificationDetails.builder()
      *      .intent(intent)
-     *      .serviceClass(serviceClass)
      *      .intentAction(NotificationClient.ADM_INTENT_ACTION)
      *      .build();
      *
@@ -123,7 +121,6 @@ public static NotificationDetailsBuilder builder() {
     public static class NotificationDetailsBuilder {
         private String from;
         private Bundle bundle;
-        private Class<? extends Service> serviceClass;
         private String intentAction;
         private Map<String, String> mapData;
         private Intent intent;
@@ -156,11 +153,12 @@ public NotificationDetailsBuilder bundle(Bundle bundle) {
         /**
          * The Android Service class that received the push notification.
          * @param serviceClass Android service class that received the push notification
+         * @deprecated The set value is no longer used due to Android 12 restrictions
          * @return {@link NotificationDetailsBuilder}
          */
         @SuppressWarnings("checkstyle:hiddenfield")
+        @Deprecated
         public NotificationDetailsBuilder serviceClass(Class<? extends Service> serviceClass) {
-            this.serviceClass = serviceClass;
             return this;
         }
 
@@ -229,7 +227,7 @@ public NotificationDetails build() {
             if (NotificationClient.GCM_INTENT_ACTION.equals(intentAction)) {
                 notificationDetails.setFrom(from);
                 notificationDetails.setBundle(bundle);
-                notificationDetails.setTargetClass(serviceClass);
+                notificationDetails.setTargetClass(PinpointNotificationActivity.class);
                 notificationDetails.setIntentAction(intentAction);
                 notificationDetails.setNotificationChannelId(notificationChannelId);
             }