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

Fix check of API

Browse source
This commit is contained in:
Erwan Croze 2017-04-21 16:37:38 +02:00
parent 4d323c7c09
commit 6e287d9ee2
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/android/org/linphone/compatibility/Compatibility.java
View file

@ -24,6 +24,7 @@ import android.app.Notification;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.content.Context; import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.os.Build;
import android.os.PowerManager; import android.os.PowerManager;
import android.provider.Settings; import android.provider.Settings;
import android.text.Html; import android.text.Html;
@ -57,9 +58,9 @@ public class Compatibility {
} }
return notif; return notif;
} }
public static Notification createMessageNotification(Context context, int msgCount, String msgSender, String msg, Bitmap contactIcon, PendingIntent intent) { public static Notification createMessageNotification(Context context, int msgCount, String msgSender, String msg, Bitmap contactIcon, PendingIntent intent) {
Notification notif = null; Notification notif = null;
if (Version.sdkAboveOrEqual(Version.API21_LOLLIPOP_50)) { if (Version.sdkAboveOrEqual(Version.API21_LOLLIPOP_50)) {
return ApiTwentyOnePlus.createMessageNotification(context, msgCount, msgSender, msg, contactIcon, intent); return ApiTwentyOnePlus.createMessageNotification(context, msgCount, msgSender, msg, contactIcon, intent);
} else if (Version.sdkAboveOrEqual(Version.API16_JELLY_BEAN_41)) { } else if (Version.sdkAboveOrEqual(Version.API16_JELLY_BEAN_41)) {
@ -69,7 +70,7 @@ public class Compatibility {
} }
return notif; return notif;
} }
public static Notification createInCallNotification(Context context, String title, String msg, int iconID, Bitmap contactIcon, String contactName, PendingIntent intent) { public static Notification createInCallNotification(Context context, String title, String msg, int iconID, Bitmap contactIcon, String contactName, PendingIntent intent) {
Notification notif = null; Notification notif = null;
if (Version.sdkAboveOrEqual(Version.API21_LOLLIPOP_50)) { if (Version.sdkAboveOrEqual(Version.API21_LOLLIPOP_50)) {
@ -111,7 +112,7 @@ public class Compatibility {
} }
public static boolean canDrawOverlays(Context context) { public static boolean canDrawOverlays(Context context) {
if (Version.sdkAboveOrEqual(Version.API23_MARSHMALLOW_60)) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
return Settings.canDrawOverlays(context); return Settings.canDrawOverlays(context);
} }
return true; return true;
@ -119,11 +120,10 @@ public class Compatibility {
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public static boolean isScreenOn(PowerManager pm) { public static boolean isScreenOn(PowerManager pm) {
if (Version.sdkAboveOrEqual(20)) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT_WATCH) {
return pm.isInteractive(); return pm.isInteractive();
} else {
return pm.isScreenOn();
} }
return pm.isScreenOn();
} }
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")