Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

fix proguard issue with NotificationTypeAdapter (#1129)

This commit is contained in:
Konrad Pozniak 2019-03-17 07:57:10 +01:00 committed by GitHub
parent ff58960801
commit cffb33d705
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/keylesspalace/tusky/entity/Notification.kt
View File

@ -15,8 +15,11 @@
package com.keylesspalace.tusky.entity package com.keylesspalace.tusky.entity
import com.google.gson.JsonDeserializationContext
import com.google.gson.JsonDeserializer
import com.google.gson.JsonElement
import com.google.gson.JsonParseException
import com.google.gson.annotations.JsonAdapter import com.google.gson.annotations.JsonAdapter
import com.keylesspalace.tusky.json.NotificationTypeAdapter
data class Notification( data class Notification(
val type: Type, val type: Type,
@ -59,4 +62,13 @@ data class Notification(
val notification = other as Notification? val notification = other as Notification?
return notification?.id == this.id return notification?.id == this.id
} }
class NotificationTypeAdapter : JsonDeserializer<Type> {
@Throws(JsonParseException::class)
override fun deserialize(json: JsonElement, typeOfT: java.lang.reflect.Type, context: JsonDeserializationContext): Notification.Type {
return Notification.Type.byString(json.asString)
}
}
} }

18
app/src/main/java/com/keylesspalace/tusky/json/NotificationTypeAdapter.kt
View File

@ -1,18 +0,0 @@
package com.keylesspalace.tusky.json
import com.google.gson.JsonDeserializationContext
import com.google.gson.JsonDeserializer
import com.google.gson.JsonElement
import com.google.gson.JsonParseException
import com.keylesspalace.tusky.entity.Notification
import java.lang.reflect.Type
class NotificationTypeAdapter : JsonDeserializer<Notification.Type> {
@Throws(JsonParseException::class)
override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): Notification.Type {
return Notification.Type.byString(json.asString)
}
}