Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix compilation when using SDK 23

Browse source
This commit is contained in:
Sylvain Berfini 2015-08-31 12:10:37 +02:00
parent f1d2c1a6ea
commit b3da0fac2e
1 changed files with 28 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/org/linphone/compatibility/ApiFivePlus.java
View file

@ -32,6 +32,7 @@ import android.provider.ContactsContract.CommonDataKinds;
import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Data; import android.provider.ContactsContract.Data;
import android.support.v4.app.NotificationCompat;
import android.text.ClipboardManager; import android.text.ClipboardManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.ViewTreeObserver; import android.view.ViewTreeObserver;
@ -291,32 +292,28 @@ public class ApiFivePlus {
} }
public static Notification createMessageNotification(Context context, String title, String msg, PendingIntent intent) { public static Notification createMessageNotification(Context context, String title, String msg, PendingIntent intent) {
Notification notif = new Notification(); NotificationCompat.Builder notifBuilder = new NotificationCompat.Builder(context)
notif.icon = R.drawable.chat_icon_over; .setSmallIcon(R.drawable.chat_icon_over)
notif.iconLevel = 0; .setContentTitle(title)
notif.when = System.currentTimeMillis(); .setContentText(msg)
notif.flags &= Notification.FLAG_ONGOING_EVENT; .setContentIntent(intent);
Notification notif = notifBuilder.build();
notif.defaults |= Notification.DEFAULT_VIBRATE; notif.defaults |= Notification.DEFAULT_VIBRATE;
notif.defaults |= Notification.DEFAULT_SOUND; notif.defaults |= Notification.DEFAULT_SOUND;
notif.defaults |= Notification.DEFAULT_LIGHTS; notif.defaults |= Notification.DEFAULT_LIGHTS;
notif.setLatestEventInfo(context, title, msg, intent);
return notif; return notif;
} }
public static Notification createInCallNotification(Context context, public static Notification createInCallNotification(Context context, String title, String msg, int iconID, PendingIntent intent) {
String title, String msg, int iconID, PendingIntent intent) { NotificationCompat.Builder notifBuilder = new NotificationCompat.Builder(context)
Notification notif = new Notification(); .setSmallIcon(iconID)
notif.icon = iconID; .setContentTitle(title)
notif.iconLevel = 0; .setContentText(msg)
notif.when = System.currentTimeMillis(); .setContentIntent(intent);
notif.flags &= Notification.FLAG_ONGOING_EVENT;
notif.setLatestEventInfo(context, title, msg, intent); return notifBuilder.build();
return notif;
} }
public static void setPreferenceChecked(Preference preference, boolean checked) { public static void setPreferenceChecked(Preference preference, boolean checked) {
@ -390,31 +387,27 @@ public class ApiFivePlus {
} }
public static Notification createNotification(Context context, String title, String message, int icon, int level, PendingIntent intent, boolean isOngoingEvent) { public static Notification createNotification(Context context, String title, String message, int icon, int level, PendingIntent intent, boolean isOngoingEvent) {
Notification notif = new Notification(); NotificationCompat.Builder notifBuilder = new NotificationCompat.Builder(context)
notif.icon = icon; .setSmallIcon(icon, level)
notif.iconLevel = level; .setContentTitle(title)
notif.when = System.currentTimeMillis(); .setContentText(message)
if (isOngoingEvent) { .setContentIntent(intent);
notif.flags |= Notification.FLAG_ONGOING_EVENT;
}
notif.setLatestEventInfo(context, title, message, intent);
return notif; return notifBuilder.build();
} }
public static Notification createSimpleNotification(Context context, String title, String text, PendingIntent intent) { public static Notification createSimpleNotification(Context context, String title, String text, PendingIntent intent) {
Notification notif = new Notification(); NotificationCompat.Builder notifBuilder = new NotificationCompat.Builder(context)
notif.icon = R.drawable.logo_linphone_57x57; .setSmallIcon(R.drawable.logo_linphone_57x57)
notif.iconLevel = 0; .setContentTitle(title)
notif.when = System.currentTimeMillis(); .setContentText(text)
notif.flags &= Notification.FLAG_ONGOING_EVENT; .setContentIntent(intent);
Notification notif = notifBuilder.build();
notif.defaults |= Notification.DEFAULT_VIBRATE; notif.defaults |= Notification.DEFAULT_VIBRATE;
notif.defaults |= Notification.DEFAULT_SOUND; notif.defaults |= Notification.DEFAULT_SOUND;
notif.defaults |= Notification.DEFAULT_LIGHTS; notif.defaults |= Notification.DEFAULT_LIGHTS;
notif.setLatestEventInfo(context, title, text, intent);
return notif; return notif;
} }
} }