filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

up: moshi to parse json

Browse Source
This commit is contained in:
S1m 2021-07-07 03:35:16 +02:00
parent 4ac4755868
commit 7ead76c8ca
2 changed files with 41 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/build.gradle
View File

@ -337,6 +337,7 @@ dependencies {
implementation 'androidx.multidex:multidex:2.0.1'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
@ -353,6 +354,7 @@ dependencies {
implementation "com.gabrielittner.threetenbp:lazythreetenbp:0.9.0"
implementation "com.squareup.moshi:moshi-adapters:$moshi_version"
implementation "com.squareup.moshi:moshi-kotlin:$moshi_version"
implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version"

90
vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
View File

@ -27,6 +27,10 @@ import android.widget.Toast
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.ProcessLifecycleOwner
import androidx.localbroadcastmanager.content.LocalBroadcastManager
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
import com.squareup.moshi.Moshi
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
import im.vector.app.BuildConfig
import im.vector.app.core.di.ActiveSessionHolder
import im.vector.app.core.extensions.vectorComponent
@ -41,16 +45,30 @@ import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import org.json.JSONException
import org.json.JSONObject
import org.matrix.android.sdk.api.extensions.tryOrNull
import org.matrix.android.sdk.api.session.Session
import org.unifiedpush.android.connector.MessagingReceiver
import org.unifiedpush.android.connector.MessagingReceiverHandler
import timber.log.Timber
data class UnifiedPushMessage (
val notification: Notification
)
@JsonClass(generateAdapter = true)
data class Notification (
@Json(name = "event_id") val eventId: String = "",
@Json(name = "room_id") val roomId: String = "",
var unread: Int = 0,
val counts: Counts = Counts()
)
data class Counts (
val unread: Int = 0
)
/**
* Unifiedpush handler.
* UnifiedPush handler.
*/
val upHandler = object: MessagingReceiverHandler {
@ -92,49 +110,23 @@ val upHandler = object: MessagingReceiverHandler {
}
Timber.d("## onMessage() received")
lateinit var data: JSONObject
lateinit var notification: JSONObject
val moshi: Moshi = Moshi.Builder()
.add(KotlinJsonAdapterFactory())
.build()
lateinit var notification: Notification
if (UPHelper.isEmbeddedDistributor(context)) {
try {
notification = JSONObject(message)
} catch (e: JSONException) {
Timber.e(e)
return
}
notification = moshi.adapter(Notification::class.java)
.fromJson(message)!!
} else {
try {
data = JSONObject(message)
notification = data.getJSONObject("notification")
} catch (e: JSONException) {
Timber.e(e)
return
}
try {
notification.put("unread",
notification.getJSONObject("count").getInt("unread"))
} catch (e: JSONException) {
Timber.i("No unread on notification")
notification.put("unread", 0)
}
}
val eventId: String = try {
notification.getString("event_id")
} catch (e: JSONException) {
Timber.i("No event_id on notification")
notification.put("event_id", "")
""
}
try {
notification.getString("room_id")
} catch (e: JSONException) {
Timber.i("No room_id on notification")
notification.put("room_id", "")
val data = moshi.adapter(UnifiedPushMessage::class.java)
.fromJson(message)!!
notification = data.notification
notification.unread = notification.counts.unread
}
// Diagnostic Push
if (eventId == PushersManager.TEST_EVENT_ID) {
if (notification.eventId == PushersManager.TEST_EVENT_ID) {
val intent = Intent(NotificationUtils.PUSH_ACTION)
LocalBroadcastManager.getInstance(context).sendBroadcast(intent)
return
@ -200,32 +192,28 @@ val upHandler = object: MessagingReceiverHandler {
/**
* Internal receive method
*
* @param data Data json containing message data.
* @param notification Notification containing message data.
*/
private fun onMessageReceivedInternal(context: Context, data: JSONObject) {
private fun onMessageReceivedInternal(context: Context, notification: Notification) {
try {
if (BuildConfig.LOW_PRIVACY_LOG_ENABLE) {
Timber.d("## onMessageReceivedInternal() : $data")
Timber.d("## onMessageReceivedInternal() : $notification")
}
// update the badge counter
val unreadCount = data.getInt("unread")
BadgeProxy.updateBadgeCount(context, unreadCount)
BadgeProxy.updateBadgeCount(context, notification.unread)
val session = activeSessionHolder.getSafeActiveSession()
if (session == null) {
Timber.w("## Can't sync from push, no current session")
} else {
val eventId = data.getString("event_id")
val roomId = data.getString("room_id")
if (isEventAlreadyKnown(eventId, roomId)) {
if (isEventAlreadyKnown(notification.eventId, notification.roomId)) {
Timber.d("Ignoring push, event already known")
} else {
// Try to get the Event content faster
Timber.d("Requesting event in fast lane")
getEventFastLane(session, roomId, eventId)
getEventFastLane(session, notification.roomId, notification.eventId)
Timber.d("Requesting background sync")
session.requireBackgroundSync()