Merge pull request #247 from naz013/feature/REM-882_Remove_full_scree…

…n_intent REM-882 - Remove full screen intent permission
naz013 · Dec 17, 2024 · 26ffe83 · 26ffe83
2 parents 348ba47 + 7572af9
commit 26ffe83
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 40 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -76,7 +76,6 @@
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />

diff --git a/app/src/main/java/com/elementary/tasks/core/data/platform/ReminderCreatorConfig.kt b/app/src/main/java/com/elementary/tasks/core/data/platform/ReminderCreatorConfig.kt
@@ -102,16 +102,6 @@ data class ReminderCreatorConfig(private val value: String) {
     updateBitAndByte(1, LED_PICKER_BIT, enabled)
   }
 
-  @Deprecated("Do not use it")
-  fun isWindowTypePickerEnabled(): Boolean {
-    return bytes.isBitSet(1, WINDOW_TYPE_PICKER_BIT)
-  }
-
-  @Deprecated("Do not use it")
-  fun setWindowTypePickerEnabled(enabled: Boolean) {
-    updateBitAndByte(1, WINDOW_TYPE_PICKER_BIT, enabled)
-  }
-
   fun isICalendarEnabled(): Boolean {
     return bytes.isBitSet(1, ICALENDAR_BIT)
   }

diff --git a/.../main/java/com/elementary/tasks/core/services/action/birthday/process/BirthdayHandlerQ.kt b/.../main/java/com/elementary/tasks/core/services/action/birthday/process/BirthdayHandlerQ.kt
@@ -66,7 +66,7 @@ class BirthdayHandlerQ(
       PendingIntent.FLAG_CANCEL_CURRENT
     )
 
-    builder.setFullScreenIntent(intent, true)
+    builder.setContentIntent(intent)
 
     getActionReceiverIntent(BirthdayActionReceiver.ACTION_HIDE, birthday.uuId).let {
       PendingIntentWrapper.getBroadcast(

diff --git a/.../main/java/com/elementary/tasks/core/services/action/reminder/process/ReminderHandlerQ.kt b/.../main/java/com/elementary/tasks/core/services/action/reminder/process/ReminderHandlerQ.kt
@@ -61,11 +61,7 @@ class ReminderHandlerQ(
       PendingIntent.FLAG_CANCEL_CURRENT
     )
 
-    if (reminder.priority >= 2) {
-      builder.setFullScreenIntent(intent, true)
-    } else {
-      builder.setContentIntent(intent)
-    }
+    builder.setContentIntent(intent)
 
     val dismissIntent = getActionReceiverIntent(ReminderActionReceiver.ACTION_HIDE, reminder.uuId)
     val piDismiss = PendingIntentWrapper.getBroadcast(

diff --git a/app/src/main/java/com/elementary/tasks/core/utils/PresetInitProcessor.kt b/app/src/main/java/com/elementary/tasks/core/utils/PresetInitProcessor.kt
@@ -42,7 +42,6 @@ class PresetInitProcessor(
 
       prefs.reminderCreatorParams.apply {
         setICalendarEnabled(true)
-        setWindowTypePickerEnabled(true)
         setPhoneCallEnabled(true)
         setSendSmsEnabled(true)
         setOpenAppEnabled(true)

diff --git a/app/src/main/java/com/elementary/tasks/reminder/build/formatter/WindowTypeFormatter.kt b/app/src/main/java/com/elementary/tasks/reminder/build/formatter/WindowTypeFormatter.kt