Merge remote-tracking branch 'origin/main'
# Conflicts: # android/app/src/main/kotlin/es/freetimelab/pluriwave/AlarmScheduler.kt
This commit is contained in:
@@ -508,7 +508,8 @@ class AlarmScheduler(private val context: Context) {
|
||||
appContext,
|
||||
requestCode(id, 2),
|
||||
Intent(appContext, MainActivity::class.java).apply {
|
||||
this.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
|
||||
this.flags =
|
||||
Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
|
||||
putExtra(PluriWaveAlarmReceiver.EXTRA_ALARM_ACTION, PluriWaveAlarmReceiver.ACTION_FIRE)
|
||||
},
|
||||
flags or PendingIntent.FLAG_IMMUTABLE
|
||||
|
||||
Reference in New Issue
Block a user