Merge pull request #1993 from jocmp/v2

Author: jocmp

.claude/commands/bench-profile.md .claude/skills/bench-profile.md.claude/commands/bench-profile.md renamed to .claude/skills/bench-profile.md

@@ -39,6 +39,7 @@ app/gplay/release/
 
 # Cruft
 technotes/.obsidian/
+**/.idea/
 .idea/runConfigurations.xml
 .idea/markdown.xml
 .kotlin/sessions/

.claude/commands/fix-weblate.md .claude/skills/fix-weblate.md.claude/commands/fix-weblate.md renamed to .claude/skills/fix-weblate.md

@@ -1,4 +1,5 @@
 import com.android.build.gradle.internal.tasks.factory.dependsOn
+import java.security.SecureRandom
 import java.util.Properties
 
 plugins {
@@ -193,4 +194,42 @@ tasks.register("useGMSDebugFile") {
     }
 }
 
+val generateSecretKey = tasks.register("generateSecretKey") {
+    val outputDir = layout.buildDirectory.dir("generated/source/secrets/com/capyreader/app")
+    outputs.dir(outputDir)
+
+    doLast {
+        val username = secrets.getProperty("extract_username", "")
+        val secret = secrets.getProperty("extract_secret", "")
+        val salt = ByteArray(64).also { SecureRandom().nextBytes(it) }
+
+        fun encode(value: String) = value.toByteArray()
+            .mapIndexed { i, b -> (b.toInt() xor salt[i % salt.size].toInt()).toByte() }
+            .toByteArray()
+
+        fun ByteArray.toHexLiteral() = joinToString { "0x%02x.toByte()".format(it) }
+
+        val file = outputDir.get().file("SecretKey.kt").asFile
+        file.parentFile.mkdirs()
+        file.writeText(
+            """
+            package com.capyreader.app
+
+            internal object SecretKey {
+                private val salt = byteArrayOf(${salt.toHexLiteral()})
+
+                private fun decode(encoded: ByteArray) =
+                    String(ByteArray(encoded.size) { i -> (encoded[i].toInt() xor salt[i % salt.size].toInt()).toByte() })
+
+                val extractUsername = decode(byteArrayOf(${encode(username).toHexLiteral()}))
+                val extractSecret = decode(byteArrayOf(${encode(secret).toHexLiteral()}))
+            }
+            """.trimIndent()
+        )
+    }
+}
+
 project.tasks.preBuild.dependsOn("useGMSDebugFile")
+project.tasks.preBuild.dependsOn("generateSecretKey")
+
+android.sourceSets["main"].kotlin.srcDir(layout.buildDirectory.dir("generated/source/secrets"))

.claude/commands/gh-issue.md .claude/skills/gh-issue.md.claude/commands/gh-issue.md renamed to .claude/skills/gh-issue.md

@@ -42,7 +42,7 @@ class AddLinkActivity : BaseActivity() {
                         AddLinkScreen(
                             defaultQueryURL = defaultQueryURL,
                             pageTitle = pageTitle,
-                            supportsPages = account.source.supportsPages,
+                            supportsReadLater = account.source.supportsReadLater,
                             onBack = {
                                 finish()
                             }

.claude/commands/profile-refresh.md .claude/skills/profile-refresh.md.claude/commands/profile-refresh.md renamed to .claude/skills/profile-refresh.md

@@ -28,6 +28,8 @@ internal val common = module {
             clientCertManager = get(),
             userAgent = WebSettings.getDefaultUserAgent(androidContext()),
             acceptLanguage = Locale.getDefault().toAcceptLanguageTag(),
+            extractUsername = SecretKey.extractUsername,
+            extractSecret = SecretKey.extractSecret,
         )
     }
     single { AppPreferences(get()) }

.claude/commands/profile-select.md .claude/skills/profile-select.md.claude/commands/profile-select.md renamed to .claude/skills/profile-select.md

@@ -3,6 +3,9 @@ package com.capyreader.app
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.compose.setContent
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
 import com.capyreader.app.notifications.NotificationHelper
 import com.capyreader.app.preferences.AppPreferences
 import com.capyreader.app.ui.App
@@ -13,21 +16,25 @@ import org.koin.android.ext.android.inject
 class MainActivity : BaseActivity() {
     val appPreferences by inject<AppPreferences>()
 
+    private var pendingArticleID by mutableStateOf<String?>(null)
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        NotificationHelper.openFromIntent(intent, appPreferences = appPreferences)
+        pendingArticleID = NotificationHelper.openFromIntent(intent, appPreferences = appPreferences)
 
         setContent {
             App(
                 startDestination = startDestination(),
                 appPreferences = appPreferences,
+                pendingArticleID = pendingArticleID,
+                onPendingArticleSelected = { pendingArticleID = null },
             )
         }
     }
 
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
-        NotificationHelper.openFromIntent(intent, appPreferences = appPreferences)
+        pendingArticleID = NotificationHelper.openFromIntent(intent, appPreferences = appPreferences)
     }
 
     private fun startDestination(): Route {