Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Importance fallback fix for notification channels #639

Merged
merged 1 commit into from
Oct 5, 2018
Merged

Importance fallback fix for notification channels #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 54 additions & 41 deletions OneSignalSDK/onesignal/src/main/java/com/onesignal/GenerateNotification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,38 +227,11 @@ private static OneSignalNotificationBuilder getBaseOneSignalNotificationBuilder(
.setContentText(message)
.setTicker(message);

// If title is blank; Set to app name if less than Android 7.
// Android 7.0 always displays the app title now in it's own section
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N ||
!gcmBundle.optString("title").equals(""))
notifBuilder.setContentTitle(getTitle(gcmBundle));

int notificationDefaults = 0;

if (OneSignal.getVibrate(currentContext) && gcmBundle.optInt("vib", 1) == 1) {
if (gcmBundle.has("vib_pt")) {
long[] vibrationPattern = OSUtils.parseVibrationPattern(gcmBundle);
if (vibrationPattern != null)
notifBuilder.setVibrate(vibrationPattern);
}
else
notificationDefaults = Notification.DEFAULT_VIBRATE;
}

if (gcmBundle.has("ledc") && gcmBundle.optInt("led", 1) == 1) {
try {
BigInteger ledColor = new BigInteger(gcmBundle.optString("ledc"), 16);
notifBuilder.setLights(ledColor.intValue(), 2000, 5000);
} catch (Throwable t) {
notificationDefaults |= Notification.DEFAULT_LIGHTS;
} // Can throw if an old android support lib is used or parse error.
}
else
notificationDefaults |= Notification.DEFAULT_LIGHTS;

if (notifJob.shownTimeStamp != null) {
try {
notifBuilder.setWhen(notifJob.shownTimeStamp * 1000L);
} catch (Throwable t) {} // Can throw if an old android support lib is used.
}

try {
BigInteger accentColor = getAccentColor(gcmBundle);
Expand All @@ -267,10 +240,10 @@ private static OneSignalNotificationBuilder getBaseOneSignalNotificationBuilder(
} catch (Throwable t) {} // Can throw if an old android support lib is used.

try {
int visibility = NotificationCompat.VISIBILITY_PUBLIC;
int lockScreenVisibility = NotificationCompat.VISIBILITY_PUBLIC;
if (gcmBundle.has("vis"))
visibility = Integer.parseInt(gcmBundle.optString("vis"));
notifBuilder.setVisibility(visibility);
lockScreenVisibility = Integer.parseInt(gcmBundle.optString("vis"));
notifBuilder.setVisibility(lockScreenVisibility);
} catch (Throwable t) {} // Can throw if an old android support lib is used or parse error

Bitmap largeIcon = getLargeIcon(gcmBundle);
Expand All @@ -283,6 +256,52 @@ private static OneSignalNotificationBuilder getBaseOneSignalNotificationBuilder(
if (bigPictureIcon != null)
notifBuilder.setStyle(new NotificationCompat.BigPictureStyle().bigPicture(bigPictureIcon).setSummaryText(message));

if (notifJob.shownTimeStamp != null) {
try {
notifBuilder.setWhen(notifJob.shownTimeStamp * 1000L);
} catch (Throwable t) {} // Can throw if an old android support lib is used.
}

setAlertnessOptions(gcmBundle, notifBuilder);

oneSignalNotificationBuilder.compatBuilder = notifBuilder;
return oneSignalNotificationBuilder;
}

// Sets visibility options including; Priority, LED, Sounds, and Vibration.
private static void setAlertnessOptions(JSONObject gcmBundle, NotificationCompat.Builder notifBuilder) {
int payloadPriority = gcmBundle.optInt("pri", 6);
int androidPriority = convertOSToAndroidPriority(payloadPriority);
notifBuilder.setPriority(androidPriority);
boolean lowDisplayPriority = androidPriority < NotificationCompat.PRIORITY_DEFAULT;

// If notification is a low priority don't set Sound, Vibration, or LED
if (lowDisplayPriority)
return;

int notificationDefaults = 0;

if (gcmBundle.has("ledc") && gcmBundle.optInt("led", 1) == 1) {
try {
BigInteger ledColor = new BigInteger(gcmBundle.optString("ledc"), 16);
notifBuilder.setLights(ledColor.intValue(), 2000, 5000);
} catch (Throwable t) {
notificationDefaults |= Notification.DEFAULT_LIGHTS;
} // Can throw if an old android support lib is used or parse error.
}
else
notificationDefaults |= Notification.DEFAULT_LIGHTS;

if (OneSignal.getVibrate(currentContext) && gcmBundle.optInt("vib", 1) == 1) {
if (gcmBundle.has("vib_pt")) {
long[] vibrationPattern = OSUtils.parseVibrationPattern(gcmBundle);
if (vibrationPattern != null)
notifBuilder.setVibrate(vibrationPattern);
}
else
notificationDefaults |= Notification.DEFAULT_VIBRATE;
}

if (isSoundEnabled(gcmBundle)) {
Uri soundUri = OSUtils.getSoundUri(currentContext, gcmBundle.optString("sound", null));
if (soundUri != null)
Expand All @@ -292,12 +311,6 @@ private static OneSignalNotificationBuilder getBaseOneSignalNotificationBuilder(
}

notifBuilder.setDefaults(notificationDefaults);

int payload_priority = gcmBundle.optInt("pri", 6);
notifBuilder.setPriority(osPriorityToAndroidPriority(payload_priority));

oneSignalNotificationBuilder.compatBuilder = notifBuilder;
return oneSignalNotificationBuilder;
}

private static void removeNotifyOptions(NotificationCompat.Builder builder) {
Expand Down Expand Up @@ -1002,14 +1015,14 @@ private static void addCustomAlertButtons(Context context, JSONObject gcmBundle,
}
}

private static int osPriorityToAndroidPriority(int priority) {
private static int convertOSToAndroidPriority(int priority) {
if (priority > 9)
return NotificationCompat.PRIORITY_MAX;
if (priority > 7)
return NotificationCompat.PRIORITY_HIGH;
if (priority > 5)
if (priority > 4)
return NotificationCompat.PRIORITY_DEFAULT;
if (priority > 3)
if (priority > 2)
return NotificationCompat.PRIORITY_LOW;

return NotificationCompat.PRIORITY_MIN;
Expand Down
4 changes: 4 additions & 0 deletions OneSignalSDK/unittest/src/test/java/com/onesignal/ShadowRoboNotificationManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ public ShadowNotification getShadow() {
}

private static Notification lastNotif;

public static Notification getLastNotif() {
return lastNotif;
}
public static ShadowNotification getLastShadowNotif() {
return shadowOf(lastNotif);
}
Expand Down
20 changes: 20 additions & 0 deletions OneSignalSDK/unittest/src/test/java/com/test/onesignal/GenerateNotificationRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,6 +755,26 @@ public void shouldSetButtonsCorrectly() throws Exception {
assertEquals("id1", new JSONObject(json_data).optString("actionSelected"));
}

@Test
public void shouldSetAlertnessFieldsOnNormalPriority() {
Bundle bundle = getBaseNotifBundle();
bundle.putString("pri", "5"); // Notifications from dashboard have priority 5 by default
NotificationBundleProcessor_ProcessFromGCMIntentService(blankActivity, bundle, null);

assertEquals(NotificationCompat.PRIORITY_DEFAULT, ShadowRoboNotificationManager.getLastNotif().priority);
final int alertnessFlags = Notification.DEFAULT_SOUND | Notification.DEFAULT_LIGHTS | Notification.DEFAULT_VIBRATE;
assertEquals(alertnessFlags, ShadowRoboNotificationManager.getLastNotif().defaults);
}

@Test
public void shouldNotSetAlertnessFieldsOnLowPriority() {
Bundle bundle = getBaseNotifBundle();
bundle.putString("pri", "4");
NotificationBundleProcessor_ProcessFromGCMIntentService(blankActivity, bundle, null);

assertEquals(NotificationCompat.PRIORITY_LOW, ShadowRoboNotificationManager.getLastNotif().priority);
assertEquals(0, ShadowRoboNotificationManager.getLastNotif().defaults);
}

@Test
public void shouldAddDefaultButtonToAlertDialog() throws Exception {
Expand Down