github/szkolny
1
0
Fork 1
mirror of https://github.com/szkolny-eu/szkolny-android.git synced 2024-09-20 05:49:09 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Sync] Fix showing notifications. Implement notifications web push.

Browse Source
This commit is contained in:
Kuba Szczodrzyński 2019-12-15 16:43:24 +01:00
parent 9978a11c52
commit 92e0fc2847
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/Data.kt
View File

@ -337,6 +337,7 @@ open class Data(val app: App, val profile: Profile?, val loginStore: LoginStore)
} }
try { try {
DataNotifications(this) DataNotifications(this)
db.notificationDao().addAll(notifications)
onSuccess() onSuccess()
} catch (e: Exception) { } catch (e: Exception) {
error(ApiError(TAG, EXCEPTION_NOTIFY) error(ApiError(TAG, EXCEPTION_NOTIFY)

4
app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyApi.kt
View File

@ -52,6 +52,7 @@ class SzkolnyApi(val app: App) {
fun getEvents(profiles: List<ProfileFull>): List<EventFull> { fun getEvents(profiles: List<ProfileFull>): List<EventFull> {
val teams = app.db.teamDao().allNow val teams = app.db.teamDao().allNow
val notifications = app.db.notificationDao().getNotPostedNow()
val response = api.serverSync(ServerSyncRequest( val response = api.serverSync(ServerSyncRequest(
deviceId = app.deviceId, deviceId = app.deviceId,
@ -74,7 +75,8 @@ class SzkolnyApi(val app: App) {
profile.loginStoreType, profile.loginStoreType,
teams.filter { it.profileId == profile.id }.map { it.code } teams.filter { it.profileId == profile.id }.map { it.code }
) )
} },
notifications = notifications.map { ServerSyncRequest.Notification(it.profileName ?: "", it.type, it.text) }
)).execute().body() )).execute().body()
val events = mutableListOf<EventFull>() val events = mutableListOf<EventFull>()

10
app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/ServerSyncRequest.kt
View File

@ -10,7 +10,9 @@ data class ServerSyncRequest(
val device: Device? = null, val device: Device? = null,
val userCodes: List<String>, val userCodes: List<String>,
val users: List<User>? = null val users: List<User>? = null,
val notifications: List<Notification>? = null
) { ) {
data class Device( data class Device(
val osType: String, val osType: String,
@ -30,4 +32,10 @@ data class ServerSyncRequest(
val loginType: Int, val loginType: Int,
val teamCodes: List<String> val teamCodes: List<String>
) )
data class Notification(
val profileName: String,
val type: Int,
val text: String
)
} }

2
app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/NotifyTask.kt
View File

@ -24,7 +24,7 @@ class NotifyTask : IApiTask(-1) {
fun run(app: App, taskCallback: EdziennikCallback) { fun run(app: App, taskCallback: EdziennikCallback) {
val list = app.db.notificationDao().getNotPostedNow() val list = app.db.notificationDao().getNotPostedNow()
val notificationList = list.subList(0, min(15, list.size)) val notificationList = list.subList(0, min(10, list.size))
var unreadCount = list.size var unreadCount = list.size