Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 7f61b0d4 authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #5391 from k9mail/fix_AndroidAlarmManager 

Fix AndroidAlarmManager dropping alarms
parents 09ce55e7 cac4874f

app/k9mail-jmap/src/main/java/com/fsck/k9/backends/AndroidAlarmManager.kt

+15 −7
Original line number Diff line number Diff line
@@ -9,14 +9,18 @@ import android.os.Build 
import android.os.SystemClock

import com.fsck.k9.backend.imap.SystemAlarmManager

import com.fsck.k9.helper.AlarmManagerCompat

import java.util.concurrent.atomic.AtomicReference

import kotlinx.coroutines.CoroutineDispatcher

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.Dispatchers

import kotlinx.coroutines.launch

import timber.log.Timber



private const val ALARM_ACTION = "com.fsck.k9.backends.ALARM"

private const val REQUEST_CODE = 1



private typealias Callback = () -> Unit



class AndroidAlarmManager(

    private val context: Context,

    private val alarmManager: AlarmManagerCompat,
@@ -33,17 +37,20 @@ class AndroidAlarmManager( 
        PendingIntent.getBroadcast(context, REQUEST_CODE, intent, flags)

    }



    @Volatile

    private var callback: (() -> Unit)? = null

    private val callback = AtomicReference<Callback?>(null)



    init {

        val intentFilter = IntentFilter(ALARM_ACTION)

        context.registerReceiver(

            object : BroadcastReceiver() {

                override fun onReceive(context: Context?, intent: Intent?) {

                    val callback = callback.getAndSet(null)

                    if (callback == null) {

                        Timber.w("Alarm triggered but 'callback' was null")

                    } else {

                        coroutineScope.launch {

                        callback?.invoke()

                        callback = null

                            callback.invoke()

                        }

                    }

                }

            },
@@ -51,12 +58,13 @@ class AndroidAlarmManager( 
        )

    }



    override fun setAlarm(triggerTime: Long, callback: () -> Unit) {

        this.callback = callback

    override fun setAlarm(triggerTime: Long, callback: Callback) {

        this.callback.set(callback)

        alarmManager.scheduleAlarm(triggerTime, pendingIntent)

    }



    override fun cancelAlarm() {

        callback.set(null)

        alarmManager.cancelAlarm(pendingIntent)

    }

app/k9mail/src/main/java/com/fsck/k9/backends/AndroidAlarmManager.kt

+15 −7
Original line number Diff line number Diff line
@@ -9,14 +9,18 @@ import android.os.Build 
import android.os.SystemClock

import com.fsck.k9.backend.imap.SystemAlarmManager

import com.fsck.k9.helper.AlarmManagerCompat

import java.util.concurrent.atomic.AtomicReference

import kotlinx.coroutines.CoroutineDispatcher

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.Dispatchers

import kotlinx.coroutines.launch

import timber.log.Timber



private const val ALARM_ACTION = "com.fsck.k9.backends.ALARM"

private const val REQUEST_CODE = 1



private typealias Callback = () -> Unit



class AndroidAlarmManager(

    private val context: Context,

    private val alarmManager: AlarmManagerCompat,
@@ -33,17 +37,20 @@ class AndroidAlarmManager( 
        PendingIntent.getBroadcast(context, REQUEST_CODE, intent, flags)

    }



    @Volatile

    private var callback: (() -> Unit)? = null

    private val callback = AtomicReference<Callback?>(null)



    init {

        val intentFilter = IntentFilter(ALARM_ACTION)

        context.registerReceiver(

            object : BroadcastReceiver() {

                override fun onReceive(context: Context?, intent: Intent?) {

                    val callback = callback.getAndSet(null)

                    if (callback == null) {

                        Timber.w("Alarm triggered but 'callback' was null")

                    } else {

                        coroutineScope.launch {

                        callback?.invoke()

                        callback = null

                            callback.invoke()

                        }

                    }

                }

            },
@@ -51,12 +58,13 @@ class AndroidAlarmManager( 
        )

    }



    override fun setAlarm(triggerTime: Long, callback: () -> Unit) {

        this.callback = callback

    override fun setAlarm(triggerTime: Long, callback: Callback) {

        this.callback.set(callback)

        alarmManager.scheduleAlarm(triggerTime, pendingIntent)

    }



    override fun cancelAlarm() {

        callback.set(null)

        alarmManager.cancelAlarm(pendingIntent)

    }