Merge pull request #502 from Futsch1/319-alarm-sounds-while-phone-is-…

…muted

319 alarm sounds while phone is muted

app/build.gradle.kts

@@ -71,13 +71,18 @@ android {
     kotlinOptions {
         jvmTarget = "17"
     }
+    lint {
+        abortOnError = true
+        warningsAsErrors = true
+        disable.add("IconLocation")
+    }
 }
 
 dependencies {
     val appcompatVersion = "1.7.0"
     val materialVersion = "1.12.0"
-    val constraintLayoutVersion = "2.2.0"
-    val androidXNavigationVersion = "2.8.7"
+    val constraintLayoutVersion = "2.2.1"
+    val androidXNavigationVersion = "2.8.8"
     val preferenceKtxVersion = "1.2.1"
     val lifecycleExtensionsVersion = "2.2.0"
     val workRuntimeVersion = "2.10.0"
@@ -109,7 +114,7 @@ dependencies {
     val androidTestOrchestratorVersion = "1.5.1"
     val baristaVersion = "4.3.0"
 
-    val desugarJdkVersion = "2.1.4"
+    val desugarJdkVersion = "2.1.5"
 
     implementation("androidx.appcompat:appcompat:$appcompatVersion")
     implementation("com.google.android.material:material:$materialVersion")

app/src/androidTest/java/com/futsch1/medtimer/ScreenshotsTest.java

@@ -3,6 +3,7 @@
 
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.Espresso.pressBack;
+import static androidx.test.espresso.action.ViewActions.click;
 import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard;
 import static androidx.test.espresso.action.ViewActions.replaceText;
 import static androidx.test.espresso.action.ViewActions.swipeLeft;
@@ -79,7 +80,7 @@ public void screenshotsTest() {
         AndroidTestHelper.navigateTo(AndroidTestHelper.MainMenu.MEDICINES);
         Screengrab.screenshot("2");
 
-        clickListItem(R.id.medicineList, 0);
+        onView(withId(R.id.medicineList)).perform(RecyclerViewActions.actionOnItemAtPosition(0, click()));
         Screengrab.screenshot("3");
 
         clickListItemChild(R.id.reminderList, 1, R.id.openAdvancedSettings);

app/src/main/AndroidManifest.xml

@@ -16,6 +16,7 @@
         android:name="android.permission.ACCESS_NETWORK_STATE"
         tools:node="remove" />
     <uses-permission android:name="com.futsch1.medtimer.NOTIFICATION_PROCESSED" />
+    <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
 
     <application
         android:allowBackup="false"

app/src/main/java/com/futsch1/medtimer/PreferencesFragment.java

@@ -2,6 +2,7 @@
 
 import android.app.AlarmManager;
 import android.app.AlertDialog;
+import android.app.NotificationManager;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
@@ -75,6 +76,15 @@ private void setupNotificationSettings() {
         if (preference != null) {
             setupNotificationSettingsPreference(preference, ReminderNotificationChannelManager.Importance.DEFAULT);
         }
+        preference = getPreferenceScreen().findPreference(PreferencesNames.OVERRIDE_DND);
+        if (preference != null) {
+            preference.setOnPreferenceChangeListener((preference1, value) -> {
+                if (Boolean.TRUE.equals(value)) {
+                    showDndPermissions();
+                }
+                return true;
+            });
+        }
     }
 
     private void setupPreferencesLink(String preferenceKey, @IdRes int actionId) {
@@ -112,7 +122,7 @@ private void showExactReminderDialog() {
             builder.setMessage(R.string.enable_alarm_dialog).
                     setPositiveButton(R.string.ok, (dialog, id) -> {
                         Intent intent = new Intent(Settings.ACTION_REQUEST_SCHEDULE_EXACT_ALARM);
-                        requireContext().startActivity(intent);
+                        safeStartActivity(intent);
                     }).
                     setNegativeButton(R.string.cancel, (dialog, id) -> {
                         PreferenceManager.getDefaultSharedPreferences(requireContext()).edit().putBoolean(PreferencesNames.EXACT_REMINDERS, false).apply();
@@ -136,9 +146,40 @@ private void setupNotificationSettingsPreference(Preference preference, Reminder
         );
     }
 
+    private void showDndPermissions() {
+        if (!requireContext().getSystemService(NotificationManager.class).isNotificationPolicyAccessGranted()) {
+            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+            builder.setMessage(R.string.enable_dnd_dialog).
+                    setPositiveButton(R.string.ok, (dialog, id) -> {
+                        Intent intent = new Intent(Settings.ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS);
+                        safeStartActivity(intent);
+                    }).
+                    setNegativeButton(R.string.cancel, (dialog, id) -> {
+                        PreferenceManager.getDefaultSharedPreferences(requireContext()).edit().putBoolean(PreferencesNames.OVERRIDE_DND, false).apply();
+                        setPreferenceScreen(null);
+                        addPreferencesFromResource(R.xml.root_preferences);
+                    });
+            AlertDialog d = builder.create();
+            d.show();
+        }
+    }
+
+    private void safeStartActivity(Intent intent) {
+        try {
+            startActivity(intent);
+        } catch (IllegalStateException e) {
+            // Intentionally empty
+        }
+    }
+
     @Override
     public void onResume() {
         super.onResume();
+        resumeExactReminders();
+        resumeOverrideDnd();
+    }
+
+    private void resumeExactReminders() {
         SwitchPreferenceCompat preference = getPreferenceScreen().findPreference(PreferencesNames.EXACT_REMINDERS);
         if (preference != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             AlarmManager alarmManager = requireContext().getSystemService(AlarmManager.class);
@@ -148,4 +189,12 @@ public void onResume() {
         }
     }
 
+    private void resumeOverrideDnd() {
+        SwitchPreferenceCompat preference;
+        preference = getPreferenceScreen().findPreference(PreferencesNames.OVERRIDE_DND);
+        if (preference != null && !requireContext().getSystemService(NotificationManager.class).isNotificationPolicyAccessGranted()) {
+            preference.setChecked(false);
+        }
+    }
+
 }

app/src/main/java/com/futsch1/medtimer/PreferencesNames.java

@@ -8,6 +8,7 @@ public class PreferencesNames {
     public static final String REPEAT_REMINDERS = "repeat_reminders";
     public static final String NUMBER_OF_REPETITIONS = "repeat_reminders_repetitions";
     public static final String REPEAT_DELAY = "repeat_reminders_delay";
+    public static final String OVERRIDE_DND = "override_dnd";
 
     private PreferencesNames() {
         // Intended empty

app/src/main/java/com/futsch1/medtimer/ReminderNotificationChannel.kt

@@ -17,6 +17,10 @@ class ReminderNotificationChannel(
     private var notificationChannel: NotificationChannel =
         getOrCreateChannel()
 
+    init {
+        notificationChannel.setBypassDnd(true)
+    }
+
     private fun getOrCreateChannel(): NotificationChannel {
         return notificationManager.getNotificationChannel(importance.toString()) ?: createChannel()
     }

app/src/main/java/com/futsch1/medtimer/reminders/NotificationSoundManager.kt

@@ -0,0 +1,91 @@
+package com.futsch1.medtimer.reminders
+
+import android.app.NotificationManager
+import android.content.Context
+import android.media.AudioManager
+import android.os.Build
+import android.os.Handler
+import android.os.Looper
+import androidx.preference.PreferenceManager
+import com.futsch1.medtimer.PreferencesNames
+
+class NotificationSoundManager(val context: Context) {
+    private val notificationManager: NotificationManager =
+        context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+    private val audioManager: AudioManager =
+        context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+
+    init {
+        if (notificationManager.isNotificationPolicyAccessGranted() && PreferenceManager.getDefaultSharedPreferences(
+                context
+            )
+                .getBoolean(PreferencesNames.OVERRIDE_DND, false)
+        ) {
+            loadPendingRingerMode(audioManager, notificationManager)
+        }
+    }
+
+    fun restore() {
+        restorePendingRingerMode(audioManager)
+    }
+
+    companion object {
+        private var pending = false
+        private var pendingWasMuted = false
+        private var scheduledRunnable: Runnable? = null
+        private val handler = Handler(Looper.getMainLooper())
+
+        @Synchronized
+        fun loadPendingRingerMode(
+            audioManager: AudioManager,
+            notificationManager: NotificationManager
+        ) {
+            if (!pending) {
+                pending = true
+                if (audioManager.isStreamMute(AudioManager.STREAM_RING) && notificationManager.currentInterruptionFilter == NotificationManager.INTERRUPTION_FILTER_ALL) {
+                    audioManager.adjustStreamVolume(
+                        AudioManager.STREAM_RING,
+                        AudioManager.ADJUST_UNMUTE,
+                        0
+                    )
+                    pendingWasMuted = true
+                }
+                val policy = notificationManager.notificationPolicy
+                notificationManager.notificationPolicy = NotificationManager.Policy(
+                    policy.priorityCategories or NotificationManager.Policy.PRIORITY_CATEGORY_REMINDERS,
+                    policy.priorityCallSenders,
+                    policy.priorityMessageSenders,
+                    0
+                )
+            }
+        }
+
+        @Synchronized
+        fun restorePendingRingerMode(
+            audioManager: AudioManager
+        ) {
+            if (pending && scheduledRunnable == null) {
+                scheduledRunnable = createRunnable(audioManager)
+            }
+            if (scheduledRunnable != null) {
+                handler.removeCallbacks(scheduledRunnable!!)
+                handler.postDelayed(scheduledRunnable!!, 5000)
+            }
+        }
+
+        private fun createRunnable(audioManager: AudioManager) = Runnable {
+            if (pendingWasMuted) {
+                audioManager.adjustStreamVolume(
+                    AudioManager.STREAM_RING,
+                    AudioManager.ADJUST_MUTE,
+                    0
+                )
+                if (Build.VERSION.SDK_INT > 28) {
+                    audioManager.ringerMode = AudioManager.RINGER_MODE_VIBRATE
+                }
+            }
+            pending = false
+            scheduledRunnable = null
+        }
+    }
+}

app/src/main/java/com/futsch1/medtimer/reminders/Notifications.java

@@ -1,6 +1,7 @@
 package com.futsch1.medtimer.reminders;
 
 import android.annotation.SuppressLint;
+import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
@@ -43,7 +44,6 @@ public int showNotification(String remindTime, FullMedicine medicine, Reminder r
         int notificationId = getNextNotificationId();
         ReminderNotificationChannelManager.Importance importance = (medicine.medicine.notificationImportance == ReminderNotificationChannelManager.Importance.HIGH.getValue()) ? ReminderNotificationChannelManager.Importance.HIGH : ReminderNotificationChannelManager.Importance.DEFAULT;
         Color color = medicine.medicine.useColor ? Color.valueOf(medicine.medicine.color) : null;
-        NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
 
         PendingIntent contentIntent = getStartAppIntent(notificationId);
 
@@ -53,6 +53,7 @@ public int showNotification(String remindTime, FullMedicine medicine, Reminder r
                 .setContentTitle(context.getString(R.string.notification_title))
                 .setContentText(getNotificationString(remindTime, reminder, medicine))
                 .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+                .setCategory(Notification.CATEGORY_REMINDER)
                 .setContentIntent(contentIntent);
         if (medicine.medicine.iconId != 0) {
             MedicineIcons icons = new MedicineIcons(context);
@@ -64,7 +65,7 @@ public int showNotification(String remindTime, FullMedicine medicine, Reminder r
 
         buildActions(builder, notificationId, reminderEvent.reminderEventId, reminder);
 
-        notificationManager.notify(notificationId, builder.build());
+        notify(notificationId, builder.build());
         Log.d(LogTags.REMINDER, String.format("Created notification %d", notificationId));
 
         return notificationId;
@@ -130,6 +131,16 @@ private void buildActions(NotificationCompat.Builder builder, int notificationId
         }
     }
 
+    private void notify(int notificationId, Notification notification) {
+        NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+
+        NotificationSoundManager soundManager = new NotificationSoundManager(context);
+
+        notificationManager.notify(notificationId, notification);
+
+        soundManager.restore();
+    }
+
     private PendingIntent getSnoozePendingIntent(Context context, int reminderId, int reminderEventId, int notificationId, int snoozeTime) {
         if (snoozeTime == -1) {
             Intent snooze = ReminderProcessor.getCustomSnoozeActionIntent(context, reminderId, reminderEventId, notificationId);
@@ -176,5 +187,4 @@ public void showOutOfStockNotification(Medicine medicine) {
         notificationManager.notify(notificationId, builder.build());
         Log.d(LogTags.REMINDER, String.format("Created notification %d", notificationId));
     }
-
 }

app/src/main/res/drawable/filetype_csv.xml

@@ -1,10 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="16dp"
     android:height="16dp"
     android:viewportWidth="16"
     android:viewportHeight="16">
   <path
       android:pathData="M14,4.5L14,14a2,2 0,0 1,-2 2h-1v-1h1a1,1 0,0 0,1 -1L13,4.5h-2A1.5,1.5 0,0 1,9.5 3L9.5,1L4,1a1,1 0,0 0,-1 1v9L2,11L2,2a2,2 0,0 1,2 -2h5.5zM3.517,14.841a1.13,1.13 0,0 0,0.401 0.823q0.195,0.162 0.478,0.252 0.284,0.091 0.665,0.091 0.507,0 0.859,-0.158 0.354,-0.158 0.539,-0.44 0.187,-0.284 0.187,-0.656 0,-0.336 -0.134,-0.56a1,1 0,0 0,-0.375 -0.357,2 2,0 0,0 -0.566,-0.21l-0.621,-0.144a1,1 0,0 1,-0.404 -0.176,0.37 0.37,0 0,1 -0.144,-0.299q0,-0.234 0.185,-0.384 0.188,-0.152 0.512,-0.152 0.214,0 0.37,0.068a0.6,0.6 0,0 1,0.246 0.181,0.56 0.56,0 0,1 0.12,0.258h0.75a1.1,1.1 0,0 0,-0.2 -0.566,1.2 1.2,0 0,0 -0.5,-0.41 1.8,1.8 0,0 0,-0.78 -0.152q-0.439,0 -0.776,0.15 -0.337,0.149 -0.527,0.421 -0.19,0.273 -0.19,0.639 0,0.302 0.122,0.524 0.124,0.223 0.352,0.367 0.228,0.143 0.539,0.213l0.618,0.144q0.31,0.073 0.463,0.193a0.39,0.39 0,0 1,0.152 0.326,0.5 0.5,0 0,1 -0.085,0.29 0.56,0.56 0,0 1,-0.255 0.193q-0.167,0.07 -0.413,0.07 -0.175,0 -0.32,-0.04a0.8,0.8 0,0 1,-0.248 -0.115,0.58 0.58,0 0,1 -0.255,-0.384zM0.806,13.693q0,-0.373 0.102,-0.633a0.87,0.87 0,0 1,0.302 -0.399,0.8 0.8,0 0,1 0.475,-0.137q0.225,0 0.398,0.097a0.7,0.7 0,0 1,0.272 0.26,0.85 0.85,0 0,1 0.12,0.381h0.765v-0.072a1.33,1.33 0,0 0,-0.466 -0.964,1.4 1.4,0 0,0 -0.489,-0.272 1.8,1.8 0,0 0,-0.606 -0.097q-0.534,0 -0.911,0.223 -0.375,0.222 -0.572,0.632 -0.195,0.41 -0.196,0.979v0.498q0,0.568 0.193,0.976 0.197,0.407 0.572,0.626 0.375,0.217 0.914,0.217 0.439,0 0.785,-0.164t0.55,-0.454a1.27,1.27 0,0 0,0.226 -0.674v-0.076h-0.764a0.8,0.8 0,0 1,-0.118 0.363,0.7 0.7,0 0,1 -0.272,0.25 0.9,0.9 0,0 1,-0.401 0.087,0.85 0.85,0 0,1 -0.478,-0.132 0.83,0.83 0,0 1,-0.299 -0.392,1.7 1.7,0 0,1 -0.102,-0.627zM9.045,15.931h-0.953l-1.338,-3.999h0.917l0.896,3.138h0.038l0.888,-3.138h0.879z"
       android:fillColor="?android:colorForeground"
-      android:fillType="evenOdd"/>
+      android:fillType="evenOdd"
+      tools:ignore="VectorPath" />
 </vector>

app/src/main/res/drawable/filetype_pdf.xml

@@ -1,10 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="16dp"
     android:height="16dp"
     android:viewportWidth="16"
     android:viewportHeight="16">
   <path
       android:pathData="M14,4.5L14,14a2,2 0,0 1,-2 2h-1v-1h1a1,1 0,0 0,1 -1L13,4.5h-2A1.5,1.5 0,0 1,9.5 3L9.5,1L4,1a1,1 0,0 0,-1 1v9L2,11L2,2a2,2 0,0 1,2 -2h5.5zM1.6,11.85L0,11.85v3.999h0.791v-1.342h0.803q0.43,0 0.732,-0.173 0.305,-0.175 0.463,-0.474a1.4,1.4 0,0 0,0.161 -0.677q0,-0.375 -0.158,-0.677a1.2,1.2 0,0 0,-0.46 -0.477q-0.3,-0.18 -0.732,-0.179m0.545,1.333a0.8,0.8 0,0 1,-0.085 0.38,0.57 0.57,0 0,1 -0.238,0.241 0.8,0.8 0,0 1,-0.375 0.082L0.788,13.886L0.788,12.48h0.66q0.327,0 0.512,0.181 0.185,0.183 0.185,0.522m1.217,-1.333v3.999h1.46q0.602,0 0.998,-0.237a1.45,1.45 0,0 0,0.595 -0.689q0.196,-0.45 0.196,-1.084 0,-0.63 -0.196,-1.075a1.43,1.43 0,0 0,-0.589 -0.68q-0.396,-0.234 -1.005,-0.234zM4.153,12.495h0.563q0.371,0 0.609,0.152a0.9,0.9 0,0 1,0.354 0.454q0.118,0.302 0.118,0.753a2.3,2.3 0,0 1,-0.068 0.592,1.1 1.1,0 0,1 -0.196,0.422 0.8,0.8 0,0 1,-0.334 0.252,1.3 1.3,0 0,1 -0.483,0.082h-0.563zM7.896,14.258v1.591h-0.79L7.106,11.85h2.548v0.653L7.896,12.503v1.117h1.606v0.638z"
       android:fillColor="?android:colorForeground"
-      android:fillType="evenOdd"/>
+      android:fillType="evenOdd"
+      tools:ignore="VectorPath" />
 </vector>

app/src/main/res/layout-land/fragment_overview.xml

@@ -97,10 +97,10 @@
                             android:layout_height="wrap_content"
                             android:checkable="true"
                             android:checked="false"
+                            android:minHeight="32dp"
                             android:text="@string/show_only_open"
                             app:checkedIcon="@drawable/funnel"
-                            app:checkedIconVisible="true"
-                            app:chipMinTouchTargetSize="0dp" />
+                            app:checkedIconVisible="true" />
 
                     </com.google.android.material.chip.ChipGroup>
                 </LinearLayout>