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

Minor refactoring

Browse Source
This commit is contained in:
nielsandriesse
2020-04-16 16:56:12 +10:00
parent 1183b76ef5
commit 84c783fae1
5 changed files with 60 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/org/thoughtcrime/securesms/loki/LokiPushNotificationManager.kt
View File

@@ -5,17 +5,21 @@ import okhttp3.*
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.LokiPushNotificationAcknowledgement
import java.io.IOException
object LokiPushNotificationManager {
//const val server = "https://live.apns.getsession.org/"
const val server = "https://dev.apns.getsession.org/"
const val tokenExpirationInterval = 2 * 24 * 60 * 60 * 1000
private val connection = OkHttpClient()
fun disableRemoteNotification(token: String, context: Context?) {
val parameters = mapOf("token" to token)
val url = "${server}register"
private val server by lazy {
LokiPushNotificationAcknowledgement.shared.server
}
private const val tokenExpirationInterval = 2 * 24 * 60 * 60 * 1000
fun disableFCM(token: String, context: Context?) {
val parameters = mapOf( "token" to token )
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 {
@@ -27,28 +31,27 @@ object LokiPushNotificationManager {
val json = JsonUtil.fromJson(bodyAsString, Map::class.java)
val code = json?.get("code") as? Int
if (code != null && code != 0) {
TextSecurePreferences.setIsUsingRemoteNotification(context, false)
TextSecurePreferences.setIsUsingFCM(context, false)
} else {
Log.d("Loki", "Couldn't disable remote notification due to error: ${json?.get("message") as? String}.")
Log.d("Loki", "Couldn't disable FCM due to error: ${json?.get("message") as? String ?: "null"}.")
}
}
}
}
override fun onFailure(call: Call, exception: IOException) {
Log.d("Loki", "Couldn't disable remote notification.")
Log.d("Loki", "Couldn't disable FCM.")
}
})
}
@JvmStatic
fun register(token: String, hexEncodedPublicKey: String, context: Context?) {
if (token == TextSecurePreferences.getTokenForRemoteNotification(context) && System.currentTimeMillis() - TextSecurePreferences.getLastTimeForTokenUploading(context) < tokenExpirationInterval) {
return
}
val parameters = mapOf("token" to token, "pubKey" to hexEncodedPublicKey)
val url = "${server}register"
val oldToken = TextSecurePreferences.getFCMToken(context)
val lastUploadDate = TextSecurePreferences.getLastFCMUploadTime(context)
if (token == oldToken && System.currentTimeMillis() - lastUploadDate < tokenExpirationInterval) { return }
val parameters = mapOf( "token" to token, "pubKey" to hexEncodedPublicKey )
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 {
@@ -60,21 +63,19 @@ object LokiPushNotificationManager {
val json = JsonUtil.fromJson(bodyAsString, Map::class.java)
val code = json?.get("code") as? Int
if (code != null && code != 0) {
TextSecurePreferences.setIsUsingRemoteNotification(context, true)
TextSecurePreferences.setTokenForRemoteNotification(context, token)
TextSecurePreferences.setLastTimeForTokenUploading(context, System.currentTimeMillis())
TextSecurePreferences.setIsUsingFCM(context, true)
TextSecurePreferences.setFCMToken(context, token)
TextSecurePreferences.setLastFCMUploadTime(context, System.currentTimeMillis())
} else {
Log.d("Loki", "Couldn't register device token due to error: ${json?.get("message") as? String}.")
Log.d("Loki", "Couldn't register for FCM due to error: ${json?.get("message") as? String ?: "null"}.")
}
}
}
}
override fun onFailure(call: Call, exception: IOException) {
Log.d("Loki", "Couldn't register device token.")
Log.d("Loki", "Couldn't register for FCM.")
}
})
}
}