From 954ca9b2d13ac5be85227b4eb50528ac8459be80 Mon Sep 17 00:00:00 2001 From: Hocuri Date: Wed, 29 Jul 2020 11:06:24 +0200 Subject: [PATCH 1/4] Already ask the user to disable doze on the first start --- .../securesms/ConversationListFragment.java | 1 + .../components/reminder/DozeReminder.java | 25 ++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java index 2a9ba40a6..4554185eb 100644 --- a/src/org/thoughtcrime/securesms/ConversationListFragment.java +++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java @@ -160,6 +160,7 @@ public class ConversationListFragment extends Fragment super.onResume(); updateReminders(); + DozeReminder.maybeAskDirectly(getActivity()); list.getAdapter().notifyDataSetChanged(); } diff --git a/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java b/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java index 0ab376db5..6c0361dae 100644 --- a/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java +++ b/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java @@ -10,8 +10,7 @@ import android.net.Uri; import android.os.Build; import android.os.PowerManager; import android.provider.Settings; -import androidx.annotation.NonNull; -import androidx.annotation.RequiresApi; + import androidx.appcompat.app.AlertDialog; import androidx.core.content.ContextCompat; @@ -21,11 +20,11 @@ import com.b44t.messenger.DcMsg; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.connect.DcHelper; -import org.thoughtcrime.securesms.util.IntentUtils; import org.thoughtcrime.securesms.util.Prefs; @SuppressLint("BatteryLife") public class DozeReminder { + private static final String ALREADY_ASKED_DIRECTLY = "DOZE_ALREADY_ASKED_DIRECTLY"; public static boolean isEligible(Context context) { if(context==null) { @@ -40,6 +39,11 @@ public class DozeReminder { return false; } + // If we did never ask directly, we do not want to add a device message yet. First we want to try to ask directly. + if (!Prefs.getBooleanPreference(context, DozeReminder.ALREADY_ASKED_DIRECTLY, false)) { + return false; + } + PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE); if(pm.isIgnoringBatteryOptimizations(context.getPackageName())) { return false; @@ -101,4 +105,19 @@ public class DozeReminder { context.startActivity(intent); } } + + public static void maybeAskDirectly(Context context) { + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M + && !Prefs.getBooleanPreference(context, DozeReminder.ALREADY_ASKED_DIRECTLY, false) + && ContextCompat.checkSelfPermission(context, Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)==PackageManager.PERMISSION_GRANTED + && !((PowerManager)context.getSystemService(Context.POWER_SERVICE)).isIgnoringBatteryOptimizations(context.getPackageName())) { + + Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS, + Uri.parse("package:" + context.getPackageName())); + context.startActivity(intent); + } + Prefs.setBooleanPreference(context, DozeReminder.ALREADY_ASKED_DIRECTLY, true); + // ALREADY_ASKED_DIRECTLY is also used above in isEligible(). As long as ALREADY_ASKED_DIRECTLY is false, isEligible() will return false + // and no device message will be added. + } } From 94cda3f81f034f00a76f9b2afc21f9c3445a38b5 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Sun, 6 Sep 2020 16:07:42 +0200 Subject: [PATCH 2/4] move pref-string 'DOZE_ASKED_DIRECTLY' to the other pref-strings --- .../securesms/components/reminder/DozeReminder.java | 11 +++++------ src/org/thoughtcrime/securesms/util/Prefs.java | 1 + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java b/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java index 6c0361dae..c5c7aa477 100644 --- a/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java +++ b/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java @@ -24,8 +24,6 @@ import org.thoughtcrime.securesms.util.Prefs; @SuppressLint("BatteryLife") public class DozeReminder { - private static final String ALREADY_ASKED_DIRECTLY = "DOZE_ALREADY_ASKED_DIRECTLY"; - public static boolean isEligible(Context context) { if(context==null) { return false; @@ -40,7 +38,7 @@ public class DozeReminder { } // If we did never ask directly, we do not want to add a device message yet. First we want to try to ask directly. - if (!Prefs.getBooleanPreference(context, DozeReminder.ALREADY_ASKED_DIRECTLY, false)) { + if (!Prefs.getBooleanPreference(context, Prefs.DOZE_ASKED_DIRECTLY, false)) { return false; } @@ -108,7 +106,7 @@ public class DozeReminder { public static void maybeAskDirectly(Context context) { if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M - && !Prefs.getBooleanPreference(context, DozeReminder.ALREADY_ASKED_DIRECTLY, false) + && !Prefs.getBooleanPreference(context, Prefs.DOZE_ASKED_DIRECTLY, false) && ContextCompat.checkSelfPermission(context, Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)==PackageManager.PERMISSION_GRANTED && !((PowerManager)context.getSystemService(Context.POWER_SERVICE)).isIgnoringBatteryOptimizations(context.getPackageName())) { @@ -116,8 +114,9 @@ public class DozeReminder { Uri.parse("package:" + context.getPackageName())); context.startActivity(intent); } - Prefs.setBooleanPreference(context, DozeReminder.ALREADY_ASKED_DIRECTLY, true); - // ALREADY_ASKED_DIRECTLY is also used above in isEligible(). As long as ALREADY_ASKED_DIRECTLY is false, isEligible() will return false + Prefs.setBooleanPreference(context, Prefs.DOZE_ASKED_DIRECTLY, true); + // Prefs.DOZE_ASKED_DIRECTLY is also used above in isEligible(). + // As long as Prefs.DOZE_ASKED_DIRECTLY is false, isEligible() will return false // and no device message will be added. } } diff --git a/src/org/thoughtcrime/securesms/util/Prefs.java b/src/org/thoughtcrime/securesms/util/Prefs.java index 48bc0fc7c..00797cdf8 100644 --- a/src/org/thoughtcrime/securesms/util/Prefs.java +++ b/src/org/thoughtcrime/securesms/util/Prefs.java @@ -49,6 +49,7 @@ public class Prefs { public static final String SCREEN_SECURITY_PREF = "pref_screen_security"; private static final String ENTER_SENDS_PREF = "pref_enter_sends"; private static final String PROMPTED_DOZE_MSG_ID_PREF = "pref_prompted_doze_msg_id"; + public static final String DOZE_ASKED_DIRECTLY = "pref_doze_asked_directly"; private static final String IN_THREAD_NOTIFICATION_PREF = "pref_key_inthread_notifications"; public static final String MESSAGE_BODY_TEXT_SIZE_PREF = "pref_message_body_text_size"; public static final String EPHEMERAL_MESSAGES_PREF = "pref_ephemeral_messages"; From 1caaac58b9991315cf69c5cec5183f24206dd2aa Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Sun, 6 Sep 2020 16:11:35 +0200 Subject: [PATCH 3/4] move always-executed doze-checks to a try/catch block --- .../components/reminder/DozeReminder.java | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java b/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java index c5c7aa477..1905d6156 100644 --- a/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java +++ b/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java @@ -105,18 +105,22 @@ public class DozeReminder { } public static void maybeAskDirectly(Context context) { - if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M - && !Prefs.getBooleanPreference(context, Prefs.DOZE_ASKED_DIRECTLY, false) - && ContextCompat.checkSelfPermission(context, Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)==PackageManager.PERMISSION_GRANTED - && !((PowerManager)context.getSystemService(Context.POWER_SERVICE)).isIgnoringBatteryOptimizations(context.getPackageName())) { + try { + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M + && !Prefs.getBooleanPreference(context, Prefs.DOZE_ASKED_DIRECTLY, false) + && ContextCompat.checkSelfPermission(context, Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS) == PackageManager.PERMISSION_GRANTED + && !((PowerManager) context.getSystemService(Context.POWER_SERVICE)).isIgnoringBatteryOptimizations(context.getPackageName())) { - Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS, - Uri.parse("package:" + context.getPackageName())); - context.startActivity(intent); + Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS, + Uri.parse("package:" + context.getPackageName())); + context.startActivity(intent); + } + // Prefs.DOZE_ASKED_DIRECTLY is also used above in isEligible(). + // As long as Prefs.DOZE_ASKED_DIRECTLY is false, isEligible() will return false + // and no device message will be added. + Prefs.setBooleanPreference(context, Prefs.DOZE_ASKED_DIRECTLY, true); + } catch(Exception e) { + e.printStackTrace(); } - Prefs.setBooleanPreference(context, Prefs.DOZE_ASKED_DIRECTLY, true); - // Prefs.DOZE_ASKED_DIRECTLY is also used above in isEligible(). - // As long as Prefs.DOZE_ASKED_DIRECTLY is false, isEligible() will return false - // and no device message will be added. } } From 537ea4a1956a36bcbb598451c472812ae1273a4f Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Sun, 6 Sep 2020 21:16:00 +0200 Subject: [PATCH 4/4] move maybeAskDirectly() to the updateReminders()-AsyncTask, this avoids the keyboard not being closed during the permission-quesions --- src/org/thoughtcrime/securesms/ConversationListFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java index 4554185eb..17a183bb3 100644 --- a/src/org/thoughtcrime/securesms/ConversationListFragment.java +++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java @@ -160,7 +160,6 @@ public class ConversationListFragment extends Fragment super.onResume(); updateReminders(); - DozeReminder.maybeAskDirectly(getActivity()); list.getAdapter().notifyDataSetChanged(); } @@ -239,6 +238,7 @@ public class ConversationListFragment extends Fragment @Override protected void onPostExecute(Optional reminder) { + DozeReminder.maybeAskDirectly(getActivity()); if (reminder.isPresent() && getActivity() != null && !isRemoving()) { reminderView.showReminder(reminder.get()); } else if (!reminder.isPresent()) {