From 8226b53a2d37a69b9b97faedf53df1eaa5ce323c Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 15 Nov 2019 13:30:05 +0100 Subject: [PATCH] Move some things from MainActivity to LinphoneContext to prevent log pollution --- .../java/org/linphone/LinphoneContext.java | 19 +++++++++++++++++++ .../org/linphone/activities/MainActivity.java | 18 ------------------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/org/linphone/LinphoneContext.java b/app/src/main/java/org/linphone/LinphoneContext.java index c02c81a4d..eafd8299b 100644 --- a/app/src/main/java/org/linphone/LinphoneContext.java +++ b/app/src/main/java/org/linphone/LinphoneContext.java @@ -45,7 +45,9 @@ import org.linphone.core.tools.Log; import org.linphone.mediastream.Version; import org.linphone.notifications.NotificationsManager; import org.linphone.settings.LinphonePreferences; +import org.linphone.utils.DeviceUtils; import org.linphone.utils.LinphoneUtils; +import org.linphone.utils.PushNotificationUtils; public class LinphoneContext { private static LinphoneContext sInstance = null; @@ -188,6 +190,23 @@ public class LinphoneContext { mLinphoneManager = new LinphoneManager(context); mNotificationManager = new NotificationsManager(context); + + if (DeviceUtils.isAppUserRestricted(mContext)) { + // See https://firebase.google.com/docs/cloud-messaging/android/receive#restricted + Log.w( + "[Main Activity] Device has been restricted by user (Android 9+), push notifications won't work !"); + } + + int bucket = DeviceUtils.getAppStandbyBucket(mContext); + if (bucket > 0) { + Log.w( + "[Main Activity] Device is in bucket " + + Compatibility.getAppStandbyBucketNameFromValue(bucket)); + } + + if (!PushNotificationUtils.isAvailable(mContext)) { + Log.w("[Main Activity] Push notifications won't work !"); + } } public void start(boolean isPush) { diff --git a/app/src/main/java/org/linphone/activities/MainActivity.java b/app/src/main/java/org/linphone/activities/MainActivity.java index 15e9f5d35..0733202b1 100644 --- a/app/src/main/java/org/linphone/activities/MainActivity.java +++ b/app/src/main/java/org/linphone/activities/MainActivity.java @@ -73,7 +73,6 @@ import org.linphone.settings.LinphonePreferences; import org.linphone.settings.SettingsActivity; import org.linphone.utils.DeviceUtils; import org.linphone.utils.LinphoneUtils; -import org.linphone.utils.PushNotificationUtils; public abstract class MainActivity extends LinphoneGenericActivity implements StatusBarFragment.MenuClikedListener, SideMenuFragment.QuitClikedListener { @@ -275,23 +274,6 @@ public abstract class MainActivity extends LinphoneGenericActivity super.onStart(); requestRequiredPermissions(); - - if (DeviceUtils.isAppUserRestricted(this)) { - // See https://firebase.google.com/docs/cloud-messaging/android/receive#restricted - Log.w( - "[Main Activity] Device has been restricted by user (Android 9+), push notifications won't work !"); - } - - int bucket = DeviceUtils.getAppStandbyBucket(this); - if (bucket > 0) { - Log.w( - "[Main Activity] Device is in bucket " - + Compatibility.getAppStandbyBucketNameFromValue(bucket)); - } - - if (!PushNotificationUtils.isAvailable(this)) { - Log.w("[Main Activity] Push notifications won't work !"); - } } @Override