Merge pull request #575 from DevKor-github/feature/issue-529-android-notification-first

fix: align Android schedule notifications with ADR-0008

Author: jjoonleo

android/app/src/main/AndroidManifest.xml

@@ -38,8 +38,6 @@
             android:launchMode="singleTask"
             android:taskAffinity="club.devkor.ontime.alarm"
             android:theme="@style/NormalTheme"
-            android:showWhenLocked="true"
-            android:turnScreenOn="true"
             android:excludeFromRecents="true"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true" />

android/app/src/main/kotlin/club/devkor/ontime/AlarmRingingActivity.kt

@@ -65,6 +65,11 @@ class AlarmRingingActivity : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         NativeLog.d(TAG, "AlarmRingingActivity onCreate ${NativeLog.summarizeIntent(intent)}")
+        if (!NativeAlarmPolicy.isAndroidFullScreenAlarmApproved()) {
+            NativeLog.d(TAG, "AlarmRingingActivity finishing: full-screen alarm approval is disabled")
+            finish()
+            return
+        }
         configureWindow()
         capturePayload(intent)
         buildContent()

android/app/src/main/kotlin/club/devkor/ontime/MainActivity.kt

@@ -45,9 +45,15 @@ open class MainActivity : FlutterActivity() {
         methodChannel?.setMethodCallHandler { call, result ->
             when (call.method) {
                 "getCapabilities" -> {
+                    val nativeAlarmApproved =
+                        NativeAlarmPolicy.isAndroidFullScreenAlarmApproved()
                     val capabilities = mapOf(
-                        "supportsNativeAlarm" to true,
-                        "nativeAlarmProvider" to "androidAlarmManager",
+                        "supportsNativeAlarm" to nativeAlarmApproved,
+                        "nativeAlarmProvider" to if (nativeAlarmApproved) {
+                            "androidAlarmManager"
+                        } else {
+                            "none"
+                        },
                         "fallbackProvider" to "localNotification",
                     )
                     NativeLog.d(TAG, "getCapabilities -> $capabilities")
@@ -84,6 +90,16 @@ open class MainActivity : FlutterActivity() {
     }
 
     private fun scheduleNativeAlarm(call: MethodCall, result: MethodChannel.Result) {
+        if (!NativeAlarmPolicy.isAndroidFullScreenAlarmApproved()) {
+            NativeLog.w(TAG, "scheduleNativeAlarm blocked: full-screen alarm approval is disabled")
+            result.error(
+                "unsupported",
+                "Android native alarms require full-screen alarm policy approval",
+                null,
+            )
+            return
+        }
+
         val args = call.arguments as? Map<*, *>
         if (args == null) {
             NativeLog.w(TAG, "scheduleNativeAlarm invalid: missing args")
@@ -267,6 +283,7 @@ open class MainActivity : FlutterActivity() {
     }
 
     private fun configureAlarmLaunchWindow(intent: Intent?) {
+        if (!NativeAlarmPolicy.isAndroidFullScreenAlarmApproved()) return
         if (payloadFromIntent(intent) == null) return
         NativeLog.d(TAG, "configureAlarmLaunchWindow for alarm launch")
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {

android/app/src/main/kotlin/club/devkor/ontime/NativeAlarmBootReceiver.kt

@@ -40,6 +40,10 @@ class NativeAlarmBootReceiver : BroadcastReceiver() {
     }
 
     private fun restorePersistedNativeAlarms(context: Context) {
+        if (!NativeAlarmPolicy.isAndroidFullScreenAlarmApproved()) {
+            NativeLog.d(TAG, "restorePersistedNativeAlarms skipped: full-screen alarm approval is disabled")
+            return
+        }
         val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as? AlarmManager
         if (alarmManager == null) {
             NativeLog.w(TAG, "restorePersistedNativeAlarms skipped: AlarmManager unavailable")

android/app/src/main/kotlin/club/devkor/ontime/NativeAlarmPolicy.kt

@@ -0,0 +1,9 @@
+package club.devkor.ontime
+
+object NativeAlarmPolicy {
+    const val ANDROID_FULL_SCREEN_ALARM_APPROVED = false
+
+    fun isAndroidFullScreenAlarmApproved(): Boolean {
+        return ANDROID_FULL_SCREEN_ALARM_APPROVED
+    }
+}

android/app/src/main/kotlin/club/devkor/ontime/NativeAlarmReceiver.kt

@@ -211,6 +211,10 @@ class NativeAlarmReceiver : BroadcastReceiver() {
     }
 
     private fun handleFireAlarm(context: Context, intent: Intent) {
+        if (!NativeAlarmPolicy.isAndroidFullScreenAlarmApproved()) {
+            NativeLog.d(TAG, "Native alarm broadcast ignored: full-screen alarm approval is disabled")
+            return
+        }
         val extras = payloadFromIntent(intent)
         val requestCode = intent.getIntExtra(
             "nativeAlarmId",

lib/core/services/notification_routing.dart

@@ -25,7 +25,6 @@ bool isScheduleAlarmPayload(Map<dynamic, dynamic>? payload) {
   final type = payload['type']?.toString();
   final promptVariant = payload['promptVariant']?.toString();
   return type == 'schedule_alarm' ||
-      payload['alarmLaunchPayloadVersion'] != null ||
       (promptVariant == 'alarm' && payload['scheduleId'] != null);
 }
 
@@ -56,7 +55,8 @@ NotificationRouteTarget? notificationRouteForData(Map<dynamic, dynamic> data) {
   final type = data['type']?.toString();
   final scheduleId = data['scheduleId']?.toString();
 
-  if (type == 'schedule_alarm' && scheduleId != null) {
+  if ((type == 'schedule_alarm' || type == 'schedule_notification') &&
+      scheduleId != null) {
     return NotificationRouteTarget(
       '/scheduleStart',
       extra: Map<String, dynamic>.from(data),

lib/core/services/notification_service.dart

@@ -316,9 +316,9 @@ class NotificationService {
         ?.createNotificationChannel(channel);
 
     const alarmChannel = AndroidNotificationChannel(
-      'scheduled_alarm_channel',
-      'Scheduled alarms',
-      description: 'Schedule preparation alarm fallback notifications.',
+      'scheduled_notification_channel',
+      'Schedule notifications',
+      description: 'Schedule preparation notifications.',
       importance: Importance.max,
     );
 
@@ -540,13 +540,12 @@ class NotificationService {
       scheduledDate: scheduledAt,
       notificationDetails: const NotificationDetails(
         android: AndroidNotificationDetails(
-          'scheduled_alarm_channel',
-          'Scheduled alarms',
-          channelDescription:
-              'Schedule preparation alarm fallback notifications.',
+          'scheduled_notification_channel',
+          'Schedule notifications',
+          channelDescription: 'Schedule preparation notifications.',
           importance: Importance.max,
           priority: Priority.max,
-          category: AndroidNotificationCategory.alarm,
+          category: AndroidNotificationCategory.reminder,
           icon: '@mipmap/ic_launcher',
           playSound: true,
           enableVibration: true,

lib/domain/entities/alarm_entities.dart

@@ -3,22 +3,26 @@ import 'package:on_time_front/domain/entities/schedule_entity.dart';
 import 'package:on_time_front/domain/entities/schedule_with_preparation_entity.dart';
 
 const alarmDefaultOffset = Duration(minutes: 5);
-const alarmLaunchPayloadVersion = '7';
+const alarmLaunchPayloadVersion = '8';
 
-enum AlarmProvider {
-  androidAlarmManager,
-  iosAlarmKit,
-  localNotification,
-  none,
-}
+enum AlarmProvider { androidAlarmManager, iosAlarmKit, localNotification, none }
 
-enum AlarmPermissionState {
-  granted,
-  denied,
-  notDetermined,
-  unsupported,
+const androidFullScreenAlarmPolicyApproved = false;
+
+bool nativeAlarmProviderAllowedByReleasePolicy(AlarmProvider provider) {
+  switch (provider) {
+    case AlarmProvider.iosAlarmKit:
+      return true;
+    case AlarmProvider.androidAlarmManager:
+      return androidFullScreenAlarmPolicyApproved;
+    case AlarmProvider.localNotification:
+    case AlarmProvider.none:
+      return false;
+  }
 }
 
+enum AlarmPermissionState { granted, denied, notDetermined, unsupported }
+
 enum AlarmPermissionIssue {
   nativePermissionDenied,
   notificationPermissionDenied,
@@ -222,10 +226,10 @@ class AlarmSettings extends Equatable {
 
   @override
   List<Object?> get props => [
-        alarmsEnabled,
-        defaultAlarmOffsetMinutes,
-        updatedAt,
-      ];
+    alarmsEnabled,
+    defaultAlarmOffsetMinutes,
+    updatedAt,
+  ];
 }
 
 class AlarmDeviceInfo extends Equatable {
@@ -249,14 +253,14 @@ class AlarmDeviceInfo extends Equatable {
 
   @override
   List<Object?> get props => [
-        deviceId,
-        platform,
-        appVersion,
-        osVersion,
-        supportsNativeAlarm,
-        nativeAlarmProvider,
-        fallbackProvider,
-      ];
+    deviceId,
+    platform,
+    appVersion,
+    osVersion,
+    supportsNativeAlarm,
+    nativeAlarmProvider,
+    fallbackProvider,
+  ];
 }
 
 class AlarmSchedulerCapabilities extends Equatable {
@@ -278,10 +282,10 @@ class AlarmSchedulerCapabilities extends Equatable {
 
   @override
   List<Object?> get props => [
-        supportsNativeAlarm,
-        nativeAlarmProvider,
-        fallbackProvider,
-      ];
+    supportsNativeAlarm,
+    nativeAlarmProvider,
+    fallbackProvider,
+  ];
 }
 
 class ScheduledAlarmRecord extends Equatable {
@@ -333,28 +337,24 @@ class ScheduledAlarmRecord extends Equatable {
 
   @override
   List<Object?> get props => [
-        scheduleId,
-        alarmTime,
-        preparationStartTime,
-        scheduleFingerprint,
-        nativeAlarmId,
-        fallbackNotificationId,
-        provider,
-        scheduleTitle,
-        payload,
-      ];
+    scheduleId,
+    alarmTime,
+    preparationStartTime,
+    scheduleFingerprint,
+    nativeAlarmId,
+    fallbackNotificationId,
+    provider,
+    scheduleTitle,
+    payload,
+  ];
 }
 
 class AlarmFailure extends Equatable {
   final String? scheduleId;
   final AlarmFailureReason reason;
   final String? message;
 
-  const AlarmFailure({
-    required this.reason,
-    this.scheduleId,
-    this.message,
-  });
+  const AlarmFailure({required this.reason, this.scheduleId, this.message});
 
   @override
   List<Object?> get props => [scheduleId, reason, message];
@@ -391,18 +391,18 @@ class AlarmReconciliationResult extends Equatable {
 
   @override
   List<Object?> get props => [
-        status,
-        permissionIssue,
-        nativeAlarmProvider,
-        fallbackProvider,
-        armedScheduleIds,
-        skippedScheduleCount,
-        failures,
-        scheduleWindowStart,
-        scheduleWindowEnd,
-        alarmCoverageStart,
-        alarmCoverageEnd,
-      ];
+    status,
+    permissionIssue,
+    nativeAlarmProvider,
+    fallbackProvider,
+    armedScheduleIds,
+    skippedScheduleCount,
+    failures,
+    scheduleWindowStart,
+    scheduleWindowEnd,
+    alarmCoverageStart,
+    alarmCoverageEnd,
+  ];
 }
 
 class AlarmStatusReport extends Equatable {
@@ -440,21 +440,21 @@ class AlarmStatusReport extends Equatable {
 
   @override
   List<Object?> get props => [
-        deviceId,
-        reconciledAt,
-        scheduleWindowStart,
-        scheduleWindowEnd,
-        alarmCoverageStart,
-        alarmCoverageEnd,
-        status,
-        permissionIssue,
-        nativeAlarmProvider,
-        fallbackProvider,
-        armedScheduleCount,
-        armedScheduleIds,
-        skippedScheduleCount,
-        failures,
-      ];
+    deviceId,
+    reconciledAt,
+    scheduleWindowStart,
+    scheduleWindowEnd,
+    alarmCoverageStart,
+    alarmCoverageEnd,
+    status,
+    permissionIssue,
+    nativeAlarmProvider,
+    fallbackProvider,
+    armedScheduleCount,
+    armedScheduleIds,
+    skippedScheduleCount,
+    failures,
+  ];
 }
 
 bool isAlarmEligibleSchedule(ScheduleWithPreparationEntity schedule) {
@@ -501,14 +501,14 @@ ScheduledAlarmRecord buildScheduledAlarmRecord(
     provider: provider,
     scheduleTitle: schedule.scheduleName,
     payload: {
-      'type': 'schedule_alarm',
+      'type': 'schedule_notification',
       'alarmLaunchPayloadVersion': alarmLaunchPayloadVersion,
       'scheduleId': schedule.id,
       'alarmTime': alarmTime.toIso8601String(),
       'preparationStartTime': preparationStartTime.toIso8601String(),
       'scheduleFingerprint': buildAlarmScheduleFingerprint(schedule),
       'placeName': schedule.place.placeName,
-      'promptVariant': 'alarm',
+      'promptVariant': 'notification',
     },
   );
 }

lib/domain/use-cases/reconcile_alarms_use_case.dart

@@ -353,8 +353,7 @@ class ReconcileAlarmsUseCase {
   Future<AlarmPermissionState> _checkNativePermission(
     AlarmSchedulerCapabilities capabilities,
   ) async {
-    if (!capabilities.supportsNativeAlarm ||
-        capabilities.nativeAlarmProvider == AlarmProvider.none) {
+    if (!_canUseNativeProvider(capabilities)) {
       return AlarmPermissionState.unsupported;
     }
     return _schedulerService.checkPermission().catchError(
@@ -541,10 +540,18 @@ class ReconcileAlarmsUseCase {
       return capabilities.fallbackProvider == AlarmProvider.localNotification;
     }
     if (record.provider == AlarmProvider.none) return false;
-    return capabilities.supportsNativeAlarm &&
+    return _canUseNativeProvider(capabilities) &&
         record.provider == capabilities.nativeAlarmProvider;
   }
 
+  bool _canUseNativeProvider(AlarmSchedulerCapabilities capabilities) {
+    return capabilities.supportsNativeAlarm &&
+        capabilities.nativeAlarmProvider != AlarmProvider.none &&
+        nativeAlarmProviderAllowedByReleasePolicy(
+          capabilities.nativeAlarmProvider,
+        );
+  }
+
   Future<void> _cancelRecords(List<ScheduledAlarmRecord> records) async {
     for (final record in records) {
       try {