summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormvglasow <michael -at- vonglasow.com>2019-02-26 01:12:00 +0100
committermvglasow <michael -at- vonglasow.com>2019-02-26 01:12:00 +0100
commit3b01bc26d67a967002fc1877d62d2fd34fc19751 (patch)
tree0806de74dbab3ffc147b07e3cde92cbdea1d247f
parentc1bac9a01f731f0008554ef5eb8b1a4a2e3e753d (diff)
downloadnavit-3b01bc26d67a967002fc1877d62d2fd34fc19751.tar.gz
Fix:port/android:Fix bug that broke notifications on APIs 9/10
Signed-off-by: mvglasow <michael -at- vonglasow.com>
-rw-r--r--navit/android/src/org/navitproject/navit/Navit.java28
1 files changed, 18 insertions, 10 deletions
diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java
index 488095a4a..03e34add4 100644
--- a/navit/android/src/org/navitproject/navit/Navit.java
+++ b/navit/android/src/org/navitproject/navit/Navit.java
@@ -369,17 +369,25 @@ public class Navit extends Activity {
nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); // Grab a handle to the NotificationManager
PendingIntent appIntent = PendingIntent.getActivity(getApplicationContext(), 0, getIntent(), 0);
- Notification.Builder builder;
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ Notification.Builder builder;
builder = new Notification.Builder(getApplicationContext(), CHANNEL_ID);
- else
- builder = new Notification.Builder(getApplicationContext());
- builder.setContentIntent(appIntent);
- builder.setAutoCancel(false).setOngoing(true);
- builder.setContentTitle(getTstring(R.string.app_name));
- builder.setContentText(getTstring(R.string.notification_event_default));
- builder.setSmallIcon(R.drawable.ic_notify);
- Notification NavitNotification = builder.build();
+ builder.setContentIntent(appIntent);
+ builder.setAutoCancel(false).setOngoing(true);
+ builder.setContentTitle(getTstring(R.string.app_name));
+ builder.setContentText(getTstring(R.string.notification_event_default));
+ builder.setSmallIcon(R.drawable.ic_notify);
+ Notification NavitNotification = builder.build();
+ } else {
+ NotificationCompat.Builder builder;
+ builder = new NotificationCompat.Builder(getApplicationContext());
+ builder.setContentIntent(appIntent);
+ builder.setAutoCancel(false).setOngoing(true);
+ builder.setContentTitle(getTstring(R.string.app_name));
+ builder.setContentText(getTstring(R.string.notification_event_default));
+ builder.setSmallIcon(R.drawable.ic_notify);
+ Notification NavitNotification = builder.build();
+ }
nm.notify(R.string.app_name, NavitNotification);// Show the notification
if ((ContextCompat.checkSelfPermission(this,