diff --git a/app/src/main/java/org/linphone/call/CallActivity.java b/app/src/main/java/org/linphone/call/CallActivity.java index 5420af913..2375f07c0 100644 --- a/app/src/main/java/org/linphone/call/CallActivity.java +++ b/app/src/main/java/org/linphone/call/CallActivity.java @@ -437,7 +437,8 @@ public class CallActivity extends LinphoneGenericActivity Call call = mCore.getCurrentCall(); boolean videoEnabled = LinphonePreferences.instance().isVideoEnabled() - && call != null && call.getCurrentParams().videoEnabled(); + && call != null + && call.getCurrentParams().videoEnabled(); if (videoEnabled) { mAudioManager = LinphoneManager.getAudioManager(); @@ -825,7 +826,8 @@ public class CallActivity extends LinphoneGenericActivity boolean videoEnabled = LinphonePreferences.instance().isVideoEnabled() - && call != null && call.getCurrentParams().videoEnabled(); + && call != null + && call.getCurrentParams().videoEnabled(); showVideoControls(videoEnabled); } diff --git a/app/src/main/java/org/linphone/compatibility/ApiTwentyOnePlus.java b/app/src/main/java/org/linphone/compatibility/ApiTwentyOnePlus.java index 47faa1a2b..761830adb 100644 --- a/app/src/main/java/org/linphone/compatibility/ApiTwentyOnePlus.java +++ b/app/src/main/java/org/linphone/compatibility/ApiTwentyOnePlus.java @@ -183,7 +183,7 @@ class ApiTwentyOnePlus { } public static Notification createMissedCallNotification( - Context context, String title, String text, PendingIntent intent) { + Context context, String title, String text, PendingIntent intent, int count) { return new Notification.Builder(context) .setContentTitle(title) @@ -201,6 +201,7 @@ class ApiTwentyOnePlus { .setPriority(Notification.PRIORITY_HIGH) .setWhen(System.currentTimeMillis()) .setShowWhen(true) + .setNumber(count) .build(); } diff --git a/app/src/main/java/org/linphone/compatibility/ApiTwentySixPlus.java b/app/src/main/java/org/linphone/compatibility/ApiTwentySixPlus.java index 4474cd15e..76d466cac 100644 --- a/app/src/main/java/org/linphone/compatibility/ApiTwentySixPlus.java +++ b/app/src/main/java/org/linphone/compatibility/ApiTwentySixPlus.java @@ -255,7 +255,7 @@ class ApiTwentySixPlus { } public static Notification createMissedCallNotification( - Context context, String title, String text, PendingIntent intent) { + Context context, String title, String text, PendingIntent intent, int count) { return new Notification.Builder( context, context.getString(R.string.notification_channel_id)) .setContentTitle(title) @@ -269,6 +269,7 @@ class ApiTwentySixPlus { .setPriority(Notification.PRIORITY_HIGH) .setWhen(System.currentTimeMillis()) .setShowWhen(true) + .setNumber(count) .setColor(context.getColor(R.color.notification_led_color)) .build(); } diff --git a/app/src/main/java/org/linphone/compatibility/Compatibility.java b/app/src/main/java/org/linphone/compatibility/Compatibility.java index ad2b2af26..a4e05e732 100644 --- a/app/src/main/java/org/linphone/compatibility/Compatibility.java +++ b/app/src/main/java/org/linphone/compatibility/Compatibility.java @@ -103,11 +103,12 @@ public class Compatibility { } public static Notification createMissedCallNotification( - Context context, String title, String text, PendingIntent intent) { + Context context, String title, String text, PendingIntent intent, int count) { if (Version.sdkAboveOrEqual(Version.API26_O_80)) { - return ApiTwentySixPlus.createMissedCallNotification(context, title, text, intent); + return ApiTwentySixPlus.createMissedCallNotification( + context, title, text, intent, count); } - return ApiTwentyOnePlus.createMissedCallNotification(context, title, text, intent); + return ApiTwentyOnePlus.createMissedCallNotification(context, title, text, intent, count); } public static Notification createInCallNotification( diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.java b/app/src/main/java/org/linphone/notifications/NotificationsManager.java index 8cc5e8638..12ff8c176 100644 --- a/app/src/main/java/org/linphone/notifications/NotificationsManager.java +++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.java @@ -521,7 +521,8 @@ public class NotificationsManager { mContext, mContext.getString(R.string.missed_calls_notif_title), body, - pendingIntent); + pendingIntent, + missedCallCount); sendNotification(MISSED_CALLS_NOTIF_ID, notif); }