TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-05-01 00:00:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unregister v1 push

Browse Source
This commit is contained in:
andrew 2023-06-09 18:10:06 +09:30
parent 01d80ae54b
commit be4d742e84
2 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/play/kotlin/org/thoughtcrime/securesms/notifications/FirebasePushManager.kt
View File

@ -41,6 +41,8 @@ import org.session.libsignal.utilities.retryIfNeeded
import org.thoughtcrime.securesms.crypto.IdentityKeyUtil import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
import org.thoughtcrime.securesms.crypto.KeyPairUtilities import org.thoughtcrime.securesms.crypto.KeyPairUtilities
private const val TAG = "FirebasePushManager"
class FirebasePushManager(private val context: Context, private val prefs: TextSecurePreferences): PushManager { class FirebasePushManager(private val context: Context, private val prefs: TextSecurePreferences): PushManager {
companion object { companion object {
@ -87,8 +89,7 @@ class FirebasePushManager(private val context: Context, private val prefs: TextS
else else
check(metadata.data_len == content.size) { "wrong message data size" } check(metadata.data_len == content.size) { "wrong message data size" }
Log.d("Loki", Log.d(TAG, "Received push for ${metadata.account}/${metadata.namespace}, msg ${metadata.msg_hash}, ${metadata.data_len}B")
"Received push for ${metadata.account}/${metadata.namespace}, msg ${metadata.msg_hash}, ${metadata.data_len}B")
return content return content
} }
@ -102,11 +103,11 @@ class FirebasePushManager(private val context: Context, private val prefs: TextS
} }
private fun refresh(task: Task<InstanceIdResult>, force: Boolean) { private fun refresh(task: Task<InstanceIdResult>, force: Boolean) {
Log.d(TAG, "refresh")
// context in here is Dispatchers.IO // context in here is Dispatchers.IO
if (!task.isSuccessful) { if (!task.isSuccessful) {
Log.w( Log.w(TAG, "FirebaseInstanceId.getInstance().getInstanceId() failed." + task.exception
"Loki",
"FirebaseInstanceId.getInstance().getInstanceId() failed." + task.exception
) )
return return
} }
@ -143,18 +144,21 @@ class FirebasePushManager(private val context: Context, private val prefs: TextS
retryIfNeeded(maxRetryCount) { retryIfNeeded(maxRetryCount) {
getResponseBody<UnsubscribeResponse>(request.build()).map { response -> getResponseBody<UnsubscribeResponse>(request.build()).map { response ->
if (response.success == true) { if (response.success == true) {
Log.d(TAG, "Unsubscribe FCM success")
TextSecurePreferences.setFCMToken(context, null) TextSecurePreferences.setFCMToken(context, null)
Log.d("Loki", "Unsubscribe FCM success") PushNotificationAPI.unregister(token)
} else { } else {
Log.e("Loki", "Couldn't unregister for FCM due to error: ${response.message}") Log.e(TAG, "Couldn't unregister for FCM due to error: ${response.message}")
} }
}.fail { exception -> }.fail { exception ->
Log.e("Loki", "Couldn't unregister for FCM due to error: ${exception}.", exception) Log.e(TAG, "Couldn't unregister for FCM due to error: ${exception}.", exception)
} }
} }
} }
private fun register(token: String, publicKey: String, userEd25519Key: KeyPair, force: Boolean, namespaces: List<Int> = listOf(Namespace.DEFAULT)) { private fun register(token: String, publicKey: String, userEd25519Key: KeyPair, force: Boolean, namespaces: List<Int> = listOf(Namespace.DEFAULT)) {
Log.d(TAG, "register token: $token")
val oldToken = TextSecurePreferences.getFCMToken(context) val oldToken = TextSecurePreferences.getFCMToken(context)
val lastUploadDate = TextSecurePreferences.getLastFCMUploadTime(context) val lastUploadDate = TextSecurePreferences.getLastFCMUploadTime(context)
if (!force && token == oldToken && System.currentTimeMillis() - lastUploadDate < tokenExpirationInterval) return if (!force && token == oldToken && System.currentTimeMillis() - lastUploadDate < tokenExpirationInterval) return
@ -184,14 +188,16 @@ class FirebasePushManager(private val context: Context, private val prefs: TextS
retryIfNeeded(maxRetryCount) { retryIfNeeded(maxRetryCount) {
getResponseBody<SubscriptionResponse>(request.build()).map { response -> getResponseBody<SubscriptionResponse>(request.build()).map { response ->
if (response.isSuccess()) { if (response.isSuccess()) {
Log.d(TAG, "Success $token")
TextSecurePreferences.setFCMToken(context, token) TextSecurePreferences.setFCMToken(context, token)
TextSecurePreferences.setLastFCMUploadTime(context, System.currentTimeMillis()) TextSecurePreferences.setLastFCMUploadTime(context, System.currentTimeMillis())
PushNotificationAPI.register(token)
} else { } else {
val (_, message) = response.errorInfo() val (_, message) = response.errorInfo()
Log.e("Loki", "Couldn't register for FCM due to error: $message.") Log.e(TAG, "Couldn't register for FCM due to error: $message.")
} }
}.fail { exception -> }.fail { exception ->
Log.e("Loki", "Couldn't register for FCM due to error: ${exception}.", exception) Log.e(TAG, "Couldn't register for FCM due to error: ${exception}.", exception)
} }
} }
} }

26
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/PushNotificationAPI.kt
View File

@ -15,6 +15,8 @@ import org.session.libsignal.utilities.retryIfNeeded
@SuppressLint("StaticFieldLeak") @SuppressLint("StaticFieldLeak")
object PushNotificationAPI { object PushNotificationAPI {
private const val TAG = "PushNotificationAPI"
val context = MessagingModuleConfiguration.shared.context val context = MessagingModuleConfiguration.shared.context
const val server = "https://push.getsession.org" const val server = "https://push.getsession.org"
const val serverPublicKey: String = "d7557fe563e2610de876c0ac7341b62f3c82d5eea4b62c702392ea4368f51b3b" const val serverPublicKey: String = "d7557fe563e2610de876c0ac7341b62f3c82d5eea4b62c702392ea4368f51b3b"
@ -28,28 +30,33 @@ object PushNotificationAPI {
} }
fun register(token: String? = TextSecurePreferences.getFCMToken(context)) { fun register(token: String? = TextSecurePreferences.getFCMToken(context)) {
Log.d(TAG, "register: $token")
token?.let(::unregisterV1) token?.let(::unregisterV1)
subscribeGroups() subscribeGroups()
} }
@JvmStatic @JvmStatic
fun unregister(token: String) { fun unregister(token: String) {
Log.d(TAG, "unregister: $token")
unregisterV1(token) unregisterV1(token)
unsubscribeGroups() unsubscribeGroups()
} }
private fun unregisterV1(token: String) { private fun unregisterV1(token: String) {
val parameters = mapOf( "token" to token ) val parameters = mapOf( "token" to token )
val url = "$server/unregister" val url = "$legacyServer/unregister"
val body = RequestBody.create(MediaType.get("application/json"), JsonUtil.toJson(parameters)) val body = RequestBody.create(MediaType.get("application/json"), JsonUtil.toJson(parameters))
val request = Request.Builder().url(url).post(body) val request = Request.Builder().url(url).post(body).build()
retryIfNeeded(maxRetryCount) { retryIfNeeded(maxRetryCount) {
OnionRequestAPI.sendOnionRequest(request.build(), server, serverPublicKey, Version.V2).map { response -> OnionRequestAPI.sendOnionRequest(request, legacyServer, legacyServerPublicKey, Version.V2).map { response ->
when (response.info["code"]) { when (response.info["code"]) {
null, 0 -> Log.d("Loki", "Couldn't disable FCM due to error: ${response.info["message"]}.") null, 0 -> Log.d(TAG, "Couldn't disable FCM due to error: ${response.info["message"]}.")
else -> Log.d(TAG, "unregisterV1 success token: $token")
} }
}.fail { exception -> }.fail { exception ->
Log.d("Loki", "Couldn't disable FCM due to error: ${exception}.") Log.d(TAG, "Couldn't disable FCM due to error: ${exception}.")
} }
} }
} }
@ -86,15 +93,16 @@ object PushNotificationAPI {
val parameters = mapOf( "closedGroupPublicKey" to closedGroupPublicKey, "pubKey" to publicKey ) val parameters = mapOf( "closedGroupPublicKey" to closedGroupPublicKey, "pubKey" to publicKey )
val url = "$legacyServer/${operation.rawValue}" val url = "$legacyServer/${operation.rawValue}"
val body = RequestBody.create(MediaType.get("application/json"), JsonUtil.toJson(parameters)) val body = RequestBody.create(MediaType.get("application/json"), JsonUtil.toJson(parameters))
val request = Request.Builder().url(url).post(body) val request = Request.Builder().url(url).post(body).build()
retryIfNeeded(maxRetryCount) { retryIfNeeded(maxRetryCount) {
OnionRequestAPI.sendOnionRequest(request.build(), legacyServer, legacyServerPublicKey, Version.V2).map { response -> OnionRequestAPI.sendOnionRequest(request, legacyServer, legacyServerPublicKey, Version.V2).map { response ->
when (response.info["code"]) { when (response.info["code"]) {
null, 0 -> Log.d("Loki", "Couldn't subscribe/unsubscribe closed group: $closedGroupPublicKey due to error: ${response.info["message"]}.") null, 0 -> Log.d(TAG, "performGroupOperation fail: ${operation.rawValue}: $closedGroupPublicKey due to error: ${response.info["message"]}.")
else -> Log.d(TAG, "performGroupOperation success: ${operation.rawValue}")
} }
}.fail { exception -> }.fail { exception ->
Log.d("Loki", "Couldn't subscribe/unsubscribe closed group: $closedGroupPublicKey due to error: ${exception}.") Log.d(TAG, "Couldn't ${operation.rawValue}: $closedGroupPublicKey due to error: ${exception}.")
} }
} }
} }