diff options
| author | Allan Wang <me@allanwang.ca> | 2020-02-29 23:34:58 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-29 23:34:58 -0800 |
| commit | e732e30d97babca49ba5f7d97aea1620ba14024b (patch) | |
| tree | 3101fb9e17eede3ffbf75e96358c6ac0a330aaf7 /app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt | |
| parent | e893c5ab9a976031c15e792583b411f6c9a429e5 (diff) | |
| parent | 551dbbcf1a56c33c378d6edfc3a3615311867001 (diff) | |
| download | frost-e732e30d97babca49ba5f7d97aea1620ba14024b.tar.gz frost-e732e30d97babca49ba5f7d97aea1620ba14024b.tar.bz2 frost-e732e30d97babca49ba5f7d97aea1620ba14024b.zip | |
Merge pull request #1657 from AllanWang/versions
Update versions
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt')
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt b/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt index 7b20e07c..5b62a4ed 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt @@ -33,6 +33,7 @@ import com.pitchedapps.frost.R import com.pitchedapps.frost.activities.FrostWebActivity import com.pitchedapps.frost.db.CookieEntity import com.pitchedapps.frost.db.FrostDatabase +import com.pitchedapps.frost.db.NotificationDao import com.pitchedapps.frost.db.latestEpoch import com.pitchedapps.frost.db.saveNotifications import com.pitchedapps.frost.enums.OverlayContext @@ -112,8 +113,7 @@ enum class NotificationType( * Returns the number of notifications generated, * or -1 if an error occurred */ - suspend fun fetch(context: Context, data: CookieEntity, prefs: Prefs): Int { - val notifDao = FrostDatabase.get().notifDao() + suspend fun fetch(context: Context, data: CookieEntity, prefs: Prefs, notifDao: NotificationDao): Int { val response = try { parser.parse(data.cookie) } catch (ignored: Exception) { @@ -170,7 +170,7 @@ enum class NotificationType( val ringtone = ringtoneProvider(prefs) notifs.forEachIndexed { i, notif -> // Ring at most twice - notif.withAlert(context, i < 2, ringtone).notify(context) + notif.withAlert(context, i < 2, ringtone, prefs).notify(context) } return notifs.size } @@ -307,8 +307,8 @@ data class FrostNotification( val notif: NotificationCompat.Builder ) { - fun withAlert(context: Context, enable: Boolean, ringtone: String): FrostNotification { - notif.setFrostAlert(context, enable, ringtone) + fun withAlert(context: Context, enable: Boolean, ringtone: String, prefs: Prefs): FrostNotification { + notif.setFrostAlert(context, enable, ringtone, prefs) return this } |