Fix notification opt-out checking on Samsung devices (#2883)

* Fix notification opt-out checking on Samsung devices

* Add comment to Javadoc

* Specify `NotificationManagerCompat#`

* Fix unit test by mocking system notification check

* Fix Javadoc link

Co-authored-by: Thomas Leing <[email protected]>

Author: tjleing

aws-android-sdk-pinpoint/src/main/java/com/amazonaws/mobileconnectors/pinpoint/targeting/notification/NotificationClientBase.java

@@ -31,6 +31,7 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
 
 import com.amazonaws.mobileconnectors.pinpoint.analytics.AnalyticsEvent;
 import com.amazonaws.mobileconnectors.pinpoint.internal.core.PinpointContext;
@@ -957,6 +958,9 @@ public final NotificationClient.PushResult handleCampaignPush(NotificationDetail
      * notifications was a feature added on devices supporting API Level 16 and
      * above, so devices from API level 16 to 18 will return true from this
      * method even when local notifications have been disabled for the app.
+     * Also, at API level 24 and higher, we use the more consistent API
+     * {@link NotificationManagerCompat#areNotificationsEnabled()} to fix an issue we were
+     * seeing with Samsung devices.
      *
      * @return true if local notifications are enabled for this app, otherwise
      * false.
@@ -975,6 +979,10 @@ boolean areAppNotificationsEnabledOnPlatform() {
             return true;
         }
 
+        if (android.os.Build.VERSION.SDK_INT >= ANDROID_NOUGAT) {
+            return NotificationManagerCompat.from(pinpointContext.getApplicationContext()).areNotificationsEnabled();
+        }
+
         final String appOpsServiceName;
         try {
             final Field appOpsServiceNameField = Context.class.getDeclaredField(APP_OPS_SERVICE);

aws-android-sdk-pinpoint/src/test/java/com/amazonaws/mobileconnectors/pinpoint/targeting/EndpointProfileTest.java

@@ -38,6 +38,8 @@
 import com.amazonaws.mobileconnectors.pinpoint.targeting.endpointProfile.EndpointProfile;
 import com.amazonaws.mobileconnectors.pinpoint.targeting.endpointProfile.EndpointProfileDemographic;
 import com.amazonaws.mobileconnectors.pinpoint.targeting.endpointProfile.EndpointProfileLocation;
+
+import android.app.NotificationManager;
 import android.content.Context;
 import android.os.Build;
 
@@ -280,6 +282,9 @@ public void testCountryWithInvalidISO3Code() {
         when(mockResources.getConfiguration()).thenReturn(mockConfiguration);
         when(mockApplicationContext.getResources()).thenReturn(mockResources);
         when(mockApplicationContext.getApplicationContext()).thenReturn(mockedContext);
+        NotificationManager notificationManager = mock(NotificationManager.class);
+        when(mockApplicationContext.getSystemService(Context.NOTIFICATION_SERVICE)).thenReturn(notificationManager);
+        when(notificationManager.areNotificationsEnabled()).thenReturn(true);
         when(mockContext.getApplicationContext()).thenReturn(mockApplicationContext);
 
         final TargetingClient targetingClient = new TargetingClient(mockContext, mock(ThreadPoolExecutor.class));