From 841d3e581c8e0f54d81dcb1d46f86c8959293780 Mon Sep 17 00:00:00 2001 From: Gary van der Merwe Date: Fri, 15 Dec 2017 09:09:25 +0200 Subject: [PATCH] For hidden flavor, make notificaion not open the app when clicked, use different icon. This only apply to when the notificaion can't be hidden, i.e. SDK >= 25. --- app/src/hidden/res/drawable/ic_stat_notify.xml | 9 +++++++++ .../org/traccar/client/TrackingService.java | 18 +++++++++++------- 2 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 app/src/hidden/res/drawable/ic_stat_notify.xml diff --git a/app/src/hidden/res/drawable/ic_stat_notify.xml b/app/src/hidden/res/drawable/ic_stat_notify.xml new file mode 100644 index 0000000..1415242 --- /dev/null +++ b/app/src/hidden/res/drawable/ic_stat_notify.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/java/org/traccar/client/TrackingService.java b/app/src/main/java/org/traccar/client/TrackingService.java index ae51dc8..a5018e3 100644 --- a/app/src/main/java/org/traccar/client/TrackingService.java +++ b/app/src/main/java/org/traccar/client/TrackingService.java @@ -35,16 +35,20 @@ public class TrackingService extends Service { private TrackingController trackingController; private static Notification createNotification(Context context) { - PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, new Intent(context, MainActivity.class), 0); - return new NotificationCompat.Builder(context, MainApplication.PRIMARY_CHANNEL) + NotificationCompat.Builder builder = new NotificationCompat.Builder(context, MainApplication.PRIMARY_CHANNEL) + .setSmallIcon(R.drawable.ic_stat_notify) + .setPriority(NotificationCompat.PRIORITY_LOW) + .setCategory(Notification.CATEGORY_SERVICE); + + if (!BuildConfig.HIDDEN_APP) { + PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, new Intent(context, MainActivity.class), 0); + builder .setContentTitle(context.getString(R.string.settings_status_on_summary)) .setTicker(context.getString(R.string.settings_status_on_summary)) .setContentIntent(pendingIntent) - .setSmallIcon(R.drawable.ic_stat_notify) - .setPriority(NotificationCompat.PRIORITY_LOW) - .setCategory(Notification.CATEGORY_SERVICE) - .setColor(ContextCompat.getColor(context, R.color.primary_dark)) - .build(); + .setColor(ContextCompat.getColor(context, R.color.primary_dark)); + } + return builder.build(); } @TargetApi(Build.VERSION_CODES.ECLAIR)