Mastodon
/
nextpush-android
mirror of https://codeberg.org/NextPush/nextpush-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix deleteApp loop

This commit is contained in:
sim 2023-02-24 16:41:14 +01:00
parent 342f701afd
commit 857444415e
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/unifiedpush/distributor/nextpush/distributor/Distributor.kt
View File

@ -139,9 +139,11 @@ object Distributor {
} }
} }
fun deleteAppFromAppToken(context: Context, appToken: String) { fun deleteAppFromSSE(context: Context, appToken: String) {
getDb(context).getConnectorToken(appToken)?.let { val db = getDb(context)
deleteApp(context, it) {} db.getConnectorToken(appToken)?.let { connectorToken ->
sendUnregistered(context, connectorToken)
db.unregisterApp(connectorToken)
} }
} }
} }

4
app/src/main/java/org/unifiedpush/distributor/nextpush/services/SSEListener.kt
View File

@ -8,7 +8,7 @@ import okhttp3.Response
import okhttp3.sse.EventSource import okhttp3.sse.EventSource
import okhttp3.sse.EventSourceListener import okhttp3.sse.EventSourceListener
import org.unifiedpush.distributor.nextpush.api.response.SSEResponse import org.unifiedpush.distributor.nextpush.api.response.SSEResponse
import org.unifiedpush.distributor.nextpush.distributor.Distributor.deleteAppFromAppToken import org.unifiedpush.distributor.nextpush.distributor.Distributor.deleteAppFromSSE
import org.unifiedpush.distributor.nextpush.distributor.Distributor.sendMessage import org.unifiedpush.distributor.nextpush.distributor.Distributor.sendMessage
import org.unifiedpush.distributor.nextpush.utils.TAG import org.unifiedpush.distributor.nextpush.utils.TAG
import java.lang.Exception import java.lang.Exception
@ -56,7 +56,7 @@ class SSEListener(val context: Context) : EventSourceListener() {
} }
"deleteApp" -> { "deleteApp" -> {
val message = Gson().fromJson(data, SSEResponse::class.java) val message = Gson().fromJson(data, SSEResponse::class.java)
deleteAppFromAppToken(context, message.token) deleteAppFromSSE(context, message.token)
} }
} }
StartService.wakeLock?.let { StartService.wakeLock?.let {