rpc fix and api 34 fix

app/src/main/java/ani/dantotsu/connections/discord/Discord.kt

@@ -103,7 +103,7 @@ object Discord {
                 applicationId = "1163925779692912771"
                 smallImage = RPC.Link(
                     "Dantotsu",
-                    "mp:attachments/1163940221063278672/1163940262423298141/bitmap1024.png"
+                    "mp:attachments/1167176318266380288/1176997397797277856/logo-best_of_both.png"
                 )
                 buttons.add(RPC.Link("Stream on Dantotsu", "https://github.com/rebelonion/Dantotsu/"))
             }

app/src/main/java/ani/dantotsu/connections/discord/Login.kt

@@ -4,15 +4,18 @@ import android.annotation.SuppressLint
 import android.app.Application.getProcessName
 import android.os.Build
 import android.os.Bundle
+import android.webkit.WebResourceRequest
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import ani.dantotsu.R
 import ani.dantotsu.connections.discord.Discord.saveToken
+import ani.dantotsu.logger
 import ani.dantotsu.startMainActivity
 import ani.dantotsu.themes.ThemeManager
 import ani.dantotsu.others.LangSet
+import ani.dantotsu.snackString
 
 class Login : AppCompatActivity() {
 
@@ -20,7 +23,7 @@ class Login : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         LangSet.setLocale(this)
-ThemeManager(this).applyTheme()
+        ThemeManager(this).applyTheme()
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             val process = getProcessName()
             if (packageName != process) WebView.setDataDirectorySuffix(process)
@@ -34,28 +37,41 @@ ThemeManager(this).applyTheme()
             settings.databaseEnabled = true
             settings.domStorageEnabled = true
         }
-
+        WebView.setWebContentsDebuggingEnabled(true)
         webView.webViewClient = object : WebViewClient() {
-            override fun onPageFinished(view: WebView?, url: String?) {
-                if (url != null && url.endsWith("/app")) {
-                    webView.stopLoading()
-                    webView.evaluateJavascript("""
-                        (function() {
-                            const wreq = webpackChunkdiscord_app.push([[Symbol()], {}, w => w])
-                            webpackChunkdiscord_app.pop()
-                            const token = Object.values(wreq.c).find(m => m.exports?.Z?.getToken).exports.Z.getToken();
-                            return token;
-                        })()
-                    """.trimIndent()){
-                        login(it.trim('"'))
-                    }
+            override fun shouldOverrideUrlLoading(view: WebView?, request: WebResourceRequest?): Boolean {
+                // Check if the URL is the one expected after a successful login
+                if (request?.url.toString() != "https://discord.com/login") {
+                    // Delay the script execution to ensure the page is fully loaded
+                    view?.postDelayed({
+                        view.evaluateJavascript("""
+                    (function() {
+                        const wreq = (webpackChunkdiscord_app.push([[''],{},e=>{m=[];for(let c in e.c)m.push(e.c[c])}]),m).find(m=>m?.exports?.default?.getToken!==void 0).exports.default.getToken();
+                        return wreq;
+                    })()
+                """.trimIndent()) { result ->
+                            login(result.trim('"'))
+                        }
+                    }, 2000)
                 }
+                return super.shouldOverrideUrlLoading(view, request)
+            }
+
+            override fun onPageFinished(view: WebView?, url: String?) {
+                super.onPageFinished(view, url)
             }
         }
+
         webView.loadUrl("https://discord.com/login")
     }
 
     private fun login(token: String) {
+        if (token.isEmpty() || token == "null"){
+            snackString("Failed to retrieve token")
+            finish()
+            return
+        }
+        snackString("Logged in successfully")
         finish()
         saveToken(this, token)
         startMainActivity(this@Login)

app/src/main/java/ani/dantotsu/connections/discord/RPC.kt

@@ -3,10 +3,12 @@ package ani.dantotsu.connections.discord
 import ani.dantotsu.connections.discord.serializers.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -154,17 +156,15 @@ open class RPC(val token: String, val coroutineContext: CoroutineContext) {
         webSocket.close(4000, "Interrupt")
     }
 
-    //I hate this, but couldn't find any better way to solve it
-    suspend fun getUserData(): User {
-        var user : User? = null
+    //I kinda hate this
+    suspend fun getUserData(): User = suspendCancellableCoroutine { continuation ->
         whenStarted = {
-            user = it
+            continuation.resume(it, onCancellation = null)
             whenStarted = null
         }
-        while (user == null) {
-            delay(100)
+        continuation.invokeOnCancellation {
+            whenStarted = null
         }
-        return user!!
     }
 
     var onReceiveUserData: ((User) -> Deferred<Unit>)? = null
@@ -185,7 +185,7 @@ open class RPC(val token: String, val coroutineContext: CoroutineContext) {
         }
 
         override fun onMessage(webSocket: WebSocket, text: String) {
-            println("Message : $text")
+            println("Discord Message : $text")
 
             val map = json.decodeFromString<Res>(text)
             seq = map.s