mirror of
https://github.com/oxen-io/session-android.git
synced 2024-12-23 00:17:34 +00:00
Fix Huawei message parsing
This commit is contained in:
parent
5a5b2f593f
commit
e60c05cee0
@ -4,6 +4,7 @@ import android.os.Bundle
|
|||||||
import com.huawei.hms.push.HmsMessageService
|
import com.huawei.hms.push.HmsMessageService
|
||||||
import com.huawei.hms.push.RemoteMessage
|
import com.huawei.hms.push.RemoteMessage
|
||||||
import dagger.hilt.android.AndroidEntryPoint
|
import dagger.hilt.android.AndroidEntryPoint
|
||||||
|
import org.json.JSONException
|
||||||
import org.session.libsession.utilities.TextSecurePreferences
|
import org.session.libsession.utilities.TextSecurePreferences
|
||||||
import org.session.libsignal.utilities.Base64
|
import org.session.libsignal.utilities.Base64
|
||||||
import org.session.libsignal.utilities.Log
|
import org.session.libsignal.utilities.Log
|
||||||
@ -17,13 +18,9 @@ class HuaweiPushService: HmsMessageService() {
|
|||||||
@Inject lateinit var pushRegistry: PushRegistry
|
@Inject lateinit var pushRegistry: PushRegistry
|
||||||
@Inject lateinit var pushReceiver: PushReceiver
|
@Inject lateinit var pushReceiver: PushReceiver
|
||||||
|
|
||||||
override fun onCreate() {
|
|
||||||
Log.d(TAG, "onCreate Huawei Service")
|
|
||||||
super.onCreate()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onMessageReceived(message: RemoteMessage?) {
|
override fun onMessageReceived(message: RemoteMessage?) {
|
||||||
Log.d(TAG, "onMessageReceived: $message.")
|
Log.d(TAG, "onMessageReceived")
|
||||||
|
message?.dataOfMap?.takeIf { it.isNotEmpty() }?.let(pushReceiver::onPush) ?:
|
||||||
pushReceiver.onPush(message?.data?.let(Base64::decode))
|
pushReceiver.onPush(message?.data?.let(Base64::decode))
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -33,10 +30,11 @@ class HuaweiPushService: HmsMessageService() {
|
|||||||
|
|
||||||
override fun onNewToken(token: String?, bundle: Bundle?) {
|
override fun onNewToken(token: String?, bundle: Bundle?) {
|
||||||
Log.d(TAG, "New HCM token: $token.")
|
Log.d(TAG, "New HCM token: $token.")
|
||||||
onNewToken(token)
|
pushRegistry.register(token)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDeletedMessages() {
|
override fun onDeletedMessages() {
|
||||||
pushRegistry.refresh(true)
|
Log.d(TAG, "onDeletedMessages")
|
||||||
|
pushRegistry.refresh(false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user