Implement Discord Rich Presence and enhance playback integration

.github/workflows/build.yml

@@ -2,7 +2,7 @@ name: Android CI/CD
 
 on:
   push:
-    branches: [ main, master, develop ]
+    branches: [ main, master, develop, agent/discord-rich-presence ]
     tags:
       - 'v*'
   pull_request:
@@ -19,6 +19,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4
@@ -49,6 +51,16 @@ jobs:
             echo "Release keystore secret is not available. Skipping decoding."
           fi
 
+      - name: Run unit tests
+        run: >
+          ./gradlew :app:testGithubNightlyUnitTest :app:testFossReleaseUnitTest
+          --parallel --build-cache --no-daemon --stacktrace
+
+      - name: Lint GitHub nightly
+        run: >
+          ./gradlew :app:lintGithubNightly
+          --build-cache --no-daemon --stacktrace
+
       # Build all variants in a single Gradle invocation so tasks share the
       # configuration phase, classpath resolution and incremental build cache.
       # --parallel  — lets Gradle run independent subproject tasks concurrently.
@@ -63,25 +75,35 @@ jobs:
           KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
           KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
 
+      - name: Verify Discord nightly APK
+        run: |
+          test -f app/build/outputs/apk/github/nightly/app-github-nightly.apk
+          sha256sum app/build/outputs/apk/github/nightly/app-github-nightly.apk | tee app/build/outputs/apk/github/nightly/app-github-nightly.apk.sha256
+
       - name: Upload Release APK
         uses: actions/upload-artifact@v4
         with:
           name: flow-release-apk
-          path: app/build/outputs/apk/github/release/app-github-release.apk
+          path: app/build/outputs/apk/github/release/*.apk
+          if-no-files-found: error
           retention-days: 14
 
       - name: Upload Nightly APK
         uses: actions/upload-artifact@v4
         with:
           name: flow-nightly-apk
-          path: app/build/outputs/apk/github/nightly/app-github-nightly.apk
+          path: |
+            app/build/outputs/apk/github/nightly/app-github-nightly.apk
+            app/build/outputs/apk/github/nightly/app-github-nightly.apk.sha256
+          if-no-files-found: error
           retention-days: 14
 
       - name: Upload FOSS Release APK
         uses: actions/upload-artifact@v4
         with:
           name: flow-foss-release-apk
-          path: app/build/outputs/apk/foss/release/app-foss-release.apk
+          path: app/build/outputs/apk/foss/release/*.apk
+          if-no-files-found: error
           retention-days: 14
 
   release:
@@ -104,7 +126,7 @@ jobs:
       - name: Download Nightly APK
         uses: actions/download-artifact@v4
         with:
-          name: flow-nightly-apk
+          name: flow-discord-rpc-nightly-apk
           path: dist/
 
       - name: Download FOSS Release APK
@@ -124,7 +146,7 @@ jobs:
         run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
 
       - name: Create Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ steps.get_version.outputs.VERSION }}
           name: Flow ${{ steps.get_version.outputs.VERSION }}
@@ -265,4 +287,4 @@ jobs:
           draft: false
           prerelease: false
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

app/build.gradle.kts

@@ -47,6 +47,7 @@ android {
             dimension = "version"
             isDefault = true
             buildConfigField("Boolean", "UPDATER_ENABLED", "true")
+            buildConfigField("String", "DISCORD_APPLICATION_ID", "\"1526515771021328514\"")
         }
         create("foss") {
             dimension = "version"

app/src/foss/java/io/github/aedev/flow/discord/DiscordPlatformTransportFactory.kt

@@ -0,0 +1,12 @@
+package io.github.aedev.flow.discord
+
+import android.content.Context
+import okhttp3.OkHttpClient
+
+class DiscordPlatformTransportFactory : DiscordPresenceTransportFactory {
+    override fun create(
+        context: Context,
+        okHttpClient: OkHttpClient,
+        tokenStore: DiscordTokenStore,
+    ): DiscordPresenceTransport = NoOpDiscordPresenceTransport()
+}

app/src/github/AndroidManifest.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application>
+        <activity
+            android:name="io.github.aedev.flow.discord.DiscordLoginActivity"
+            android:exported="false"
+            android:theme="@style/Theme.Flow" />
+    </application>
+</manifest>

app/src/github/java/io/github/aedev/flow/discord/DiscordLoginActivity.kt

@@ -0,0 +1,83 @@
+package io.github.aedev.flow.discord
+
+import android.annotation.SuppressLint
+import android.graphics.Color
+import android.os.Bundle
+import android.view.WindowManager
+import android.webkit.CookieManager
+import android.webkit.WebStorage
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import androidx.activity.ComponentActivity
+
+class DiscordLoginActivity : ComponentActivity() {
+    private var completed = false
+
+    @SuppressLint("SetJavaScriptEnabled")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        window.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
+
+        val webView = WebView(this).apply {
+            setBackgroundColor(Color.TRANSPARENT)
+            settings.javaScriptEnabled = true
+            settings.domStorageEnabled = true
+            settings.userAgentString = settings.userAgentString.replace("; wv", "")
+            webViewClient = object : WebViewClient() {
+                @Deprecated("Deprecated in Java")
+                override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean {
+                    requestTokenWhenAuthenticated(view, url)
+                    return false
+                }
+
+                override fun onPageFinished(view: WebView, url: String) {
+                    super.onPageFinished(view, url)
+                    requestTokenWhenAuthenticated(view, url)
+                }
+            }
+            loadUrl(DISCORD_LOGIN_URL)
+        }
+        setContentView(webView)
+    }
+
+    override fun onDestroy() {
+        if (!completed && isFinishing) {
+            DiscordLoginBroker.fail("Discord connection was cancelled.")
+        }
+        super.onDestroy()
+    }
+
+    private fun requestTokenWhenAuthenticated(webView: WebView, url: String) {
+        if (!completed && DiscordLoginTokenExtractor.isAuthenticatedAppUrl(url)) {
+            readToken(webView)
+        }
+    }
+
+    private fun readToken(webView: WebView) {
+        webView.evaluateJavascript(TOKEN_SCRIPT) { encodedResult ->
+            val token = DiscordLoginTokenExtractor.decodeJavascriptValue(encodedResult)
+
+            if (token != null && !completed) {
+                completed = true
+                DiscordLoginBroker.complete(token)
+                webView.clearHistory()
+                webView.clearCache(true)
+                WebStorage.getInstance().deleteAllData()
+                CookieManager.getInstance().removeAllCookies(null)
+                finish()
+            }
+        }
+    }
+
+    private companion object {
+        const val DISCORD_LOGIN_URL = "https://discord.com/login"
+        const val TOKEN_SCRIPT = "(function(){" +
+            "var frame=document.createElement('iframe');" +
+            "frame.style.display='none';" +
+            "document.body.appendChild(frame);" +
+            "var token=frame.contentWindow.localStorage.getItem('token');" +
+            "frame.remove();" +
+            "return token;" +
+            "})()"
+    }
+}

app/src/github/java/io/github/aedev/flow/discord/DiscordLoginBroker.kt

@@ -0,0 +1,25 @@
+package io.github.aedev.flow.discord
+
+import kotlinx.coroutines.CompletableDeferred
+
+internal object DiscordLoginBroker {
+    private var pending: CompletableDeferred<Result<String>>? = null
+
+    @Synchronized
+    fun begin(): CompletableDeferred<Result<String>>? {
+        if (pending?.isActive == true) return null
+        return CompletableDeferred<Result<String>>().also { pending = it }
+    }
+
+    @Synchronized
+    fun complete(token: String) {
+        pending?.complete(Result.success(token))
+        pending = null
+    }
+
+    @Synchronized
+    fun fail(message: String) {
+        pending?.complete(Result.failure(IllegalStateException(message)))
+        pending = null
+    }
+}

app/src/github/java/io/github/aedev/flow/discord/DiscordLoginTokenExtractor.kt

@@ -0,0 +1,23 @@
+package io.github.aedev.flow.discord
+
+import java.net.URI
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonNull
+import kotlinx.serialization.json.jsonPrimitive
+
+internal object DiscordLoginTokenExtractor {
+    fun isAuthenticatedAppUrl(url: String): Boolean = runCatching {
+        val uri = URI(url)
+        uri.scheme.equals("https", ignoreCase = true) &&
+            uri.host.equals("discord.com", ignoreCase = true) &&
+            uri.path.trimEnd('/') == "/app"
+    }.getOrDefault(false)
+
+    fun decodeJavascriptValue(value: String): String? = runCatching {
+        val element = Json.parseToJsonElement(value)
+        if (element is JsonNull) null else element.jsonPrimitive.content
+    }.getOrNull()
+        ?.trim()
+        ?.removeSurrounding("\"")
+        ?.takeIf { it.isNotEmpty() && it != "null" }
+}

app/src/github/java/io/github/aedev/flow/discord/DiscordPlatformTransportFactory.kt

@@ -0,0 +1,17 @@
+package io.github.aedev.flow.discord
+
+import android.content.Context
+import io.github.aedev.flow.BuildConfig
+import okhttp3.OkHttpClient
+
+class DiscordPlatformTransportFactory : DiscordPresenceTransportFactory {
+    override fun create(
+        context: Context,
+        okHttpClient: OkHttpClient,
+        tokenStore: DiscordTokenStore,
+    ): DiscordPresenceTransport = KizzyDiscordPresenceTransport(
+        client = okHttpClient,
+        tokenStore = tokenStore,
+        applicationId = BuildConfig.DISCORD_APPLICATION_ID,
+    )
+}