From f5623976867b71e6049311164aff9c321a18bf62 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Thu, 6 Feb 2014 17:45:54 +0100
Subject: [PATCH] Improved chat message & incall notification for Android >= 16

---
 .../compatibility/ApiSixteenPlus.java         | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/org/linphone/compatibility/ApiSixteenPlus.java b/src/org/linphone/compatibility/ApiSixteenPlus.java
index ec83e5928..3d8288a27 100644
--- a/src/org/linphone/compatibility/ApiSixteenPlus.java
+++ b/src/org/linphone/compatibility/ApiSixteenPlus.java
@@ -36,30 +36,27 @@ public class ApiSixteenPlus {
 	public static Notification createMessageNotification(Context context,
 			int msgCount, String msgSender, String msg, Bitmap contactIcon,
 			PendingIntent intent) {
-		String title, summary;
+		String title;
 		if (msgCount == 1) {
-			title = "Unread message from %s".replace("%s", msgSender);
-			summary = "";
+			title = msgSender;
 		} else {
 			title = "%i unread messages"
 					.replace("%i", String.valueOf(msgCount));
-			summary = "";
 		}
 
-		Notification notif = new Notification.BigPictureStyle(
-				new Notification.Builder(context)
+		Notification notif = new Notification.Builder(context)
 						.setContentTitle(title)
 						.setContentText(msg)
 						.setSmallIcon(R.drawable.chat_icon_over)
 						.setAutoCancel(true)
+						.setContentIntent(intent)
 						.setDefaults(
 								Notification.DEFAULT_LIGHTS
 										| Notification.DEFAULT_SOUND
 										| Notification.DEFAULT_VIBRATE)
 						.setWhen(System.currentTimeMillis())
-						.setLargeIcon(contactIcon)).setSummaryText(summary)
+						.setLargeIcon(contactIcon)
 				.build();
-		notif.contentIntent = intent;
 
 		return notif;
 	}
@@ -68,13 +65,12 @@ public class ApiSixteenPlus {
 			String title, String msg, int iconID, Bitmap contactIcon,
 			String contactName, PendingIntent intent) {
 
-		Notification notif = new Notification.BigPictureStyle(
-				new Notification.Builder(context).setContentTitle(contactName)
+		Notification notif = new Notification.Builder(context).setContentTitle(contactName)
 						.setContentText(msg).setSmallIcon(iconID)
 						.setAutoCancel(false)
+						.setContentIntent(intent)
 						.setWhen(System.currentTimeMillis())
-						.setLargeIcon(contactIcon)).build();
-		notif.contentIntent = intent;
+						.setLargeIcon(contactIcon).build();
 
 		return notif;
 	}