oxen-io
/
session-android
mirror of https://github.com/oxen-io/session-android.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Move files

This commit is contained in:
andrew 2023-08-06 22:39:49 +09:30
parent bcf925c132
commit 24f7bb2b45
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/kotlin/org/thoughtcrime/securesms/notifications/PushRegistry.kt → app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistry.kt
View File

@ -16,7 +16,7 @@ import org.thoughtcrime.securesms.crypto.KeyPairUtilities
import javax.inject.Inject
import javax.inject.Singleton
private const val TAG = "GenericPushManager"
private val TAG = PushRegistry::class.java.name
@Singleton
class PushRegistry @Inject constructor(
@ -26,16 +26,16 @@ class PushRegistry @Inject constructor(
private val pushRegistryV2: PushRegistryV2,
) {
private var firebaseInstanceIdJob: Job? = null
private var pushRegistrationJob: Job? = null
fun refresh(force: Boolean) {
Log.d(TAG, "refresh() called with: force = $force")
firebaseInstanceIdJob?.apply {
pushRegistrationJob?.apply {
if (force) cancel() else if (isActive) return
}
firebaseInstanceIdJob = tokenManager.fetchToken()
pushRegistrationJob = tokenManager.fetchToken()
}
fun refresh(token: String?, force: Boolean): Promise<*, Exception> {
@ -113,4 +113,4 @@ class PushRegistry @Inject constructor(
} success {
tokenManager.fcmToken = null
}
}
}

11
app/src/main/kotlin/org/thoughtcrime/securesms/notifications/PushRegistryV2.kt → app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistryV2.kt
View File

@ -12,7 +12,12 @@ import nl.komponents.kovenant.functional.map
import okhttp3.MediaType
import okhttp3.Request
import okhttp3.RequestBody
import org.session.libsession.messaging.sending_receiving.notifications.*
import org.session.libsession.messaging.sending_receiving.notifications.Response
import org.session.libsession.messaging.sending_receiving.notifications.Server
import org.session.libsession.messaging.sending_receiving.notifications.SubscriptionRequest
import org.session.libsession.messaging.sending_receiving.notifications.SubscriptionResponse
import org.session.libsession.messaging.sending_receiving.notifications.UnsubscribeResponse
import org.session.libsession.messaging.sending_receiving.notifications.UnsubscriptionRequest
import org.session.libsession.snode.OnionRequestAPI
import org.session.libsession.snode.SnodeAPI
import org.session.libsession.snode.Version
@ -24,7 +29,7 @@ import org.session.libsignal.utilities.retryIfNeeded
import javax.inject.Inject
import javax.inject.Singleton
private const val TAG = "PushManagerV2"
private val TAG = PushRegistryV2::class.java.name
private const val maxRetryCount = 4
@Singleton
@ -108,4 +113,4 @@ class PushRegistryV2 @Inject constructor(private val pushReceiver: PushReceiver)
.also { if (it.isFailure()) throw Exception("error: ${it.message}.") }
}
}
}
}

16
app/src/play/kotlin/org/thoughtcrime/securesms/notifications/FirebaseTokenFetcher.kt
View File

@ -27,17 +27,15 @@ class FirebaseTokenFetcher @Inject constructor(
.process()
}
private fun Task<InstanceIdResult>.process() {
when {
isSuccessful -> try {
result?.token?.let {
pushRegistry.get().refresh(it, force = true).get()
}
} catch (e: Exception) {
onFail(e)
private fun Task<InstanceIdResult>.process() = when {
isSuccessful -> try {
result?.token?.let {
pushRegistry.get().refresh(it, force = true).get()
}
else -> exception?.let(::onFail)
} catch (e: Exception) {
onFail(e)
}
else -> exception?.let(::onFail)
}
private fun onFail(e: Exception) = Log.e(TAG, "fetch failed", e)