From cac563f6c6a2656c74527bfa2c8b5780765baf69 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Thu, 7 Mar 2019 19:25:11 -0500 Subject: Prepare generic db --- .../kotlin/com/pitchedapps/frost/db/GenericDb.kt | 72 ++++++++++++++++++++++ .../com/pitchedapps/frost/db/NotificationDb.kt | 3 + .../pitchedapps/frost/settings/Notifications.kt | 7 +-- 3 files changed, 76 insertions(+), 6 deletions(-) create mode 100644 app/src/main/kotlin/com/pitchedapps/frost/db/GenericDb.kt (limited to 'app') diff --git a/app/src/main/kotlin/com/pitchedapps/frost/db/GenericDb.kt b/app/src/main/kotlin/com/pitchedapps/frost/db/GenericDb.kt new file mode 100644 index 00000000..c191b673 --- /dev/null +++ b/app/src/main/kotlin/com/pitchedapps/frost/db/GenericDb.kt @@ -0,0 +1,72 @@ +/* + * Copyright 2018 Allan Wang + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.pitchedapps.frost.db + +import androidx.room.Dao +import androidx.room.Entity +import androidx.room.Insert +import androidx.room.OnConflictStrategy +import androidx.room.PrimaryKey +import androidx.room.Query +import com.pitchedapps.frost.facebook.FbItem +import com.pitchedapps.frost.facebook.defaultTabs +import com.pitchedapps.frost.utils.L + +/** + * Created by Allan Wang on 2017-05-30. + */ + +/** + * Generic cache to store serialized content + */ +@Entity(tableName = "frost_generic") +data class GenericEntity( + @PrimaryKey + val type: String, + val contents: String +) + +@Dao +interface GenericDao { + + @Query("SELECT contents FROM frost_generic WHERE type = :type") + suspend fun select(type: String): String? + + @Insert(onConflict = OnConflictStrategy.REPLACE) + suspend fun save(entity: GenericEntity) + + @Query("DELETE FROM frost_generic WHERE type = :type") + suspend fun delete(type: String) + + suspend fun saveTabs(tabs: List) { + val content = tabs.joinToString(",") { it.name } + save(GenericEntity(TYPE_TABS, content)) + } + + suspend fun getTabs(): List { + val allTabs = FbItem.values.map { it.name to it }.toMap() + return select(TYPE_TABS) + ?.split(",") + ?.mapNotNull { allTabs[it] } + ?.takeIf { it.isNotEmpty() } + ?: defaultTabs() + } + + companion object { + const val TYPE_TABS = "generic_tabs" + } +} \ No newline at end of file diff --git a/app/src/main/kotlin/com/pitchedapps/frost/db/NotificationDb.kt b/app/src/main/kotlin/com/pitchedapps/frost/db/NotificationDb.kt index d2771754..01baa43e 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/db/NotificationDb.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/db/NotificationDb.kt @@ -119,6 +119,9 @@ interface NotificationDao { @Query("DELETE FROM notifications WHERE userId = :userId AND type = :type") fun _deleteNotifications(userId: Long, type: String) + @Query("DELETE FROM notifications") + suspend fun deleteAll() + /** * It is assumed that the notification batch comes from the same user */ diff --git a/app/src/main/kotlin/com/pitchedapps/frost/settings/Notifications.kt b/app/src/main/kotlin/com/pitchedapps/frost/settings/Notifications.kt index 3444d0b0..dafb259f 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/settings/Notifications.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/settings/Notifications.kt @@ -30,7 +30,6 @@ import com.pitchedapps.frost.BuildConfig import com.pitchedapps.frost.R import com.pitchedapps.frost.activities.SettingsActivity import com.pitchedapps.frost.db.FrostDatabase -import com.pitchedapps.frost.db.NotificationModel import com.pitchedapps.frost.services.fetchNotifications import com.pitchedapps.frost.services.scheduleNotifications import com.pitchedapps.frost.utils.Prefs @@ -173,11 +172,7 @@ fun SettingsActivity.getNotificationPrefs(): KPrefAdapterBuilder.() -> Unit = { plainText(R.string.reset_notif_epoch) { onClick = { launch { - FrostDatabase.get() - .cookieDao() - .selectAll() - .map { NotificationModel(it.id) } - .forEach { it.save() } + FrostDatabase.get().notifDao().deleteAll() } } } -- cgit v1.2.3