From 2cb1756be543211e56d4051a77b5457cee883425 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO Date: Fri, 18 Sep 2020 09:54:59 +1000 Subject: [PATCH] using onion routing for PN related requests --- .../loki/api/LokiPushNotificationManager.kt | 113 ++++++------------ 1 file changed, 39 insertions(+), 74 deletions(-) diff --git a/src/org/thoughtcrime/securesms/loki/api/LokiPushNotificationManager.kt b/src/org/thoughtcrime/securesms/loki/api/LokiPushNotificationManager.kt index 19f49bf67e..91e19dbf32 100644 --- a/src/org/thoughtcrime/securesms/loki/api/LokiPushNotificationManager.kt +++ b/src/org/thoughtcrime/securesms/loki/api/LokiPushNotificationManager.kt @@ -1,27 +1,25 @@ package org.thoughtcrime.securesms.loki.api import android.content.Context +import nl.komponents.kovenant.functional.map import okhttp3.* import org.thoughtcrime.securesms.database.DatabaseFactory -import org.thoughtcrime.securesms.jobmanager.Data -import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint -import org.thoughtcrime.securesms.jobs.BaseJob -import org.thoughtcrime.securesms.loki.protocol.ClosedGroupUpdateMessageSendJob import org.thoughtcrime.securesms.util.TextSecurePreferences import org.whispersystems.libsignal.logging.Log import org.whispersystems.signalservice.internal.util.JsonUtil import org.whispersystems.signalservice.loki.api.PushNotificationAcknowledgement +import org.whispersystems.signalservice.loki.api.onionrequests.OnionRequestAPI import java.io.IOException -import java.lang.Exception -import java.util.concurrent.TimeUnit object LokiPushNotificationManager { - private val connection = OkHttpClient() private val tokenExpirationInterval = 12 * 60 * 60 * 1000 private val server by lazy { PushNotificationAcknowledgement.shared.server } + private val PNServerPublicKey by lazy { + PushNotificationAcknowledgement.shared.PNServerPublicKey + } enum class ClosedGroupOperation { Subscribe, Unsubscribe; @@ -38,30 +36,20 @@ object LokiPushNotificationManager { @JvmStatic fun unregister(token: String, context: Context) { val parameters = mapOf( "token" to token ) - val url = "$server/register" + val url = "$server/unregister" val body = RequestBody.create(MediaType.get("application/json"), JsonUtil.toJson(parameters)) - val request = Request.Builder().url(url).post(body).build() - connection.newCall(request).enqueue(object : Callback { - - override fun onResponse(call: Call, response: Response) { - when (response.code()) { - 200 -> { - val bodyAsString = response.body()!!.string() - val json = JsonUtil.fromJson(bodyAsString, Map::class.java) - val code = json?.get("code") as? Int - if (code != null && code != 0) { - TextSecurePreferences.setIsUsingFCM(context, false) - } else { - Log.d("Loki", "Couldn't disable FCM due to error: ${json?.get("message") as? String ?: "null"}.") - } - } - } + val request = Request.Builder().url(url).post(body) + val promise = OnionRequestAPI.sendOnionRequest(request.build(), server, PNServerPublicKey).map { json -> + val code = json["code"] as? Int + if (code != null && code != 0) { + TextSecurePreferences.setIsUsingFCM(context, false) + } else { + Log.d("Loki", "Couldn't disable FCM due to error: ${json["message"] as? String ?: "null"}.") } - - override fun onFailure(call: Call, exception: IOException) { - Log.d("Loki", "Couldn't disable FCM.") - } - }) + } + promise.fail { exception -> + Log.d("Loki", "Couldn't disable FCM due to error: ${exception}.") + } // Unsubscribe from all closed groups val allClosedGroupPublicKeys = DatabaseFactory.getSSKDatabase(context).getAllClosedGroupPublicKeys() val userPublicKey = TextSecurePreferences.getLocalNumber(context) @@ -78,30 +66,20 @@ object LokiPushNotificationManager { val parameters = mapOf( "token" to token, "pubKey" to publicKey ) val url = "$server/register" val body = RequestBody.create(MediaType.get("application/json"), JsonUtil.toJson(parameters)) - val request = Request.Builder().url(url).post(body).build() - connection.newCall(request).enqueue(object : Callback { - - override fun onResponse(call: Call, response: Response) { - when (response.code()) { - 200 -> { - val bodyAsString = response.body()!!.string() - val json = JsonUtil.fromJson(bodyAsString, Map::class.java) - val code = json?.get("code") as? Int - if (code != null && code != 0) { - TextSecurePreferences.setIsUsingFCM(context, true) - TextSecurePreferences.setFCMToken(context, token) - TextSecurePreferences.setLastFCMUploadTime(context, System.currentTimeMillis()) - } else { - Log.d("Loki", "Couldn't register for FCM due to error: ${json?.get("message") as? String ?: "null"}.") - } - } - } + val request = Request.Builder().url(url).post(body) + val promise = OnionRequestAPI.sendOnionRequest(request.build(), server, PNServerPublicKey).map { json -> + val code = json["code"] as? Int + if (code != null && code != 0) { + TextSecurePreferences.setIsUsingFCM(context, true) + TextSecurePreferences.setFCMToken(context, token) + TextSecurePreferences.setLastFCMUploadTime(context, System.currentTimeMillis()) + } else { + Log.d("Loki", "Couldn't register for FCM due to error: ${json["message"] as? String ?: "null"}.") } - - override fun onFailure(call: Call, exception: IOException) { - Log.d("Loki", "Couldn't register for FCM.") - } - }) + } + promise.fail { exception -> + Log.d("Loki", "Couldn't register for FCM due to error: ${exception}.") + } // Subscribe to all closed groups val allClosedGroupPublicKeys = DatabaseFactory.getSSKDatabase(context).getAllClosedGroupPublicKeys() allClosedGroupPublicKeys.forEach { closedGroup -> @@ -115,28 +93,15 @@ object LokiPushNotificationManager { val parameters = mapOf( "closedGroupPublicKey" to closedGroupPublicKey, "pubKey" to publicKey ) val url = "$server/${operation.rawValue}" val body = RequestBody.create(MediaType.get("application/json"), JsonUtil.toJson(parameters)) - val request = Request.Builder().url(url).post(body).build() - connection.newCall(request).enqueue(object : Callback { - - override fun onResponse(call: Call, response: Response) { - when (response.code()) { - 200 -> { - val bodyAsString = response.body()!!.string() - val json = JsonUtil.fromJson(bodyAsString, Map::class.java) - val code = json?.get("code") as? Int - if (code == null || code == 0) { - Log.d("Loki", "Couldn't subscribe/unsubscribe to/from PNs for closed group with ID: $closedGroupPublicKey due to error: ${json?.get("message") as? String ?: "null"}.") - } - } - else -> { - Log.d("Loki", "Couldn't subscribe/unsubscribe to/from PNs for closed group with ID: $closedGroupPublicKey.") - } - } + val request = Request.Builder().url(url).post(body) + val promise = OnionRequestAPI.sendOnionRequest(request.build(), server, PNServerPublicKey).map { json -> + val code = json["code"] as? Int + if (code == null || code == 0) { + Log.d("Loki", "Couldn't subscribe/unsubscribe closed group: $closedGroupPublicKey due to error: ${json["message"] as? String ?: "null"}.") } - - override fun onFailure(call: Call, exception: IOException) { - Log.d("Loki", "Couldn't subscribe/unsubscribe to/from PNs for closed group with ID: $closedGroupPublicKey due to error: $exception.") - } - }) + } + promise.fail { exception -> + Log.d("Loki", "Couldn't subscribe/unsubscribe closed group: $closedGroupPublicKey due to error: ${exception}.") + } } }