pakstr 0.21.1 → 0.23.0

package/android-template/app/src/main/java/com/pakstr/app/WebViewController.kt

@@ -17,6 +17,13 @@ import com.pakstr.app.debug.AppDebugLogger
 import com.pakstr.app.permissions.interfaces.PermissionHandler
 import com.pakstr.app.signer.NostrBridge
 import com.pakstr.app.signer.SignerManager
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 /**
  * Controls WebView configuration and lifecycle.
@@ -44,6 +51,7 @@ class WebViewController(
 ) {
     private var pendingNip55Result: String? = null
     private var isSetup = false
+    private val nip55Scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
 
     // Keeps a reference to the runnable to prevent memory leaks if destroyed early
     private val loadRunnable = Runnable {
@@ -228,22 +236,37 @@ class WebViewController(
                 ): Boolean {
                     val url = request?.url ?: return true
                     if (url.scheme.equals("nostrsigner", ignoreCase = true)) {
-                        try {
-                            val intent = Intent(Intent.ACTION_VIEW, url).apply {
-                                putExtra(
-                                    Browser.EXTRA_APPLICATION_ID,
-                                    context.packageName
-                                )
-                            }
-                            context.startActivity(intent)
-                        } catch (error: ActivityNotFoundException) {
-                            AppDebugLogger.error(
-                                context,
-                                "WEBVIEW",
-                                "No app can handle nostrsigner URL",
-                                error
-                            )
-                        }
+                        dispatchNip55SignEvent(
+                            rawUrl = url.toString(),
+                            activeSignerType = signerManager.getActiveType(),
+                            expectedCallbackUrl = Nip55Callback.callbackPrefix,
+                            forwardExternally = { launchExternalNip55(url) },
+                            launchSigning = { operation ->
+                                nip55Scope.launch {
+                                    try {
+                                        operation()
+                                    } catch (error: CancellationException) {
+                                        throw error
+                                    } catch (error: Exception) {
+                                        AppDebugLogger.log(
+                                            context,
+                                            "NIP55",
+                                            "Bunker flow failed: ${error::class.java.simpleName}"
+                                        )
+                                    }
+                                }
+                            },
+                            getActivePubkey = signerManager::getCurrentUserPubkey,
+                            signEvent = { event ->
+                                signerManager.getSigner().signEvent(event)
+                            },
+                            deliverSignedEvent = { signedEvent ->
+                                withContext(Dispatchers.Main) {
+                                    handleNip55Callback(signedEvent)
+                                }
+                            },
+                            logRejection = ::logNip55Rejection
+                        )
                         return true
                     }
                     return url.host != "127.0.0.1"
@@ -316,7 +339,7 @@ class WebViewController(
 
         )
         webView.addJavascriptInterface(
-            PakstrBridge(),
+            PakstrBridge(RuntimeApiBaseSettings.from(context)),
             "PakstrBridge"
         )
 
@@ -355,7 +378,34 @@ class WebViewController(
         (context as? Activity)?.findViewById<View>(R.id.loader)?.visibility = View.GONE
     }
 
+    private fun launchExternalNip55(url: android.net.Uri) {
+        try {
+            val intent = Intent(Intent.ACTION_VIEW, url).apply {
+                putExtra(
+                    Browser.EXTRA_APPLICATION_ID,
+                    context.packageName
+                )
+            }
+            context.startActivity(intent)
+        } catch (_: ActivityNotFoundException) {
+            AppDebugLogger.error(
+                context,
+                "WEBVIEW",
+                "No app can handle nostrsigner URL"
+            )
+        }
+    }
+
+    private fun logNip55Rejection(reason: String) {
+        AppDebugLogger.log(
+            context,
+            "NIP55",
+            "Request rejected: $reason"
+        )
+    }
+
     fun destroy() {
+        nip55Scope.cancel()
         webView.stopLoading()
 
         webView.clearHistory()

package/android-template/app/src/main/java/com/pakstr/app/debug/DeveloperToolsActivity.kt

@@ -15,13 +15,18 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import com.google.android.material.appbar.MaterialToolbar
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.switchmaterial.SwitchMaterial
+import com.google.android.material.textfield.TextInputEditText
+import com.google.android.material.textfield.TextInputLayout
 import com.pakstr.app.BuildConfig
 import com.pakstr.app.R
-import com.pakstr.app.RuntimeConfig
+import com.pakstr.app.RuntimeApiBaseSettings
 
 class DeveloperToolsActivity : AppCompatActivity() {
 
@@ -30,8 +35,12 @@ class DeveloperToolsActivity : AppCompatActivity() {
     private lateinit var uptimeValue: TextView
     private lateinit var debugModeSwitch: SwitchMaterial
     private lateinit var apiSwitch: SwitchMaterial
+    private lateinit var apiBaseInputLayout: TextInputLayout
+    private lateinit var apiBaseInput: TextInputEditText
+    private lateinit var apiBaseSource: TextView
     private lateinit var debugWebViewStatus: TextView
     private lateinit var webViewStatus: TextView
+    private lateinit var runtimeApiBaseSettings: RuntimeApiBaseSettings
 
     private val uptimeUpdater = object : Runnable {
         override fun run() {
@@ -50,11 +59,14 @@ class DeveloperToolsActivity : AppCompatActivity() {
         }
 
         setContentView(R.layout.activity_developer_tools)
+        runtimeApiBaseSettings = RuntimeApiBaseSettings.from(this)
 
+        setupWindowInsets()
         setupToolbar()
         bindViews()
         populateRuntimeDetails()
         setupDebugControls()
+        setupApiBaseControls()
         setupLogActions()
         setupCrashTesting()
         setupWebViewActions()
@@ -71,6 +83,18 @@ class DeveloperToolsActivity : AppCompatActivity() {
         super.onStop()
     }
 
+    private fun setupWindowInsets() {
+        ViewCompat.setOnApplyWindowInsetsListener(
+            findViewById(R.id.developerToolsRoot)
+        ) { view, insets ->
+            val bars = insets.getInsets(
+                WindowInsetsCompat.Type.systemBars()
+            )
+            view.updatePadding(top = bars.top)
+            insets
+        }
+    }
+
     private fun setupToolbar() {
         findViewById<MaterialToolbar>(R.id.developerToolsToolbar).setNavigationOnClickListener {
             finish()
@@ -81,6 +105,9 @@ class DeveloperToolsActivity : AppCompatActivity() {
         uptimeValue = findViewById(R.id.runtimeUptimeValue)
         debugModeSwitch = findViewById(R.id.debugModeSwitch)
         apiSwitch = findViewById(R.id.apiEnabledSwitch)
+        apiBaseInputLayout = findViewById(R.id.apiBaseInputLayout)
+        apiBaseInput = findViewById(R.id.apiBaseInput)
+        apiBaseSource = findViewById(R.id.apiBaseSource)
         debugWebViewStatus = findViewById(R.id.debugWebViewStatus)
         webViewStatus = findViewById(R.id.webViewStatus)
     }
@@ -101,8 +128,6 @@ class DeveloperToolsActivity : AppCompatActivity() {
     }
 
     private fun setupDebugControls() {
-        apiSwitch.isChecked = RuntimeConfig.apiEnabled(this)
-
         debugModeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 DeveloperToolsManager.enableDebug(this)
@@ -115,9 +140,50 @@ class DeveloperToolsActivity : AppCompatActivity() {
         }
     }
 
+    private fun setupApiBaseControls() {
+        findViewById<MaterialButton>(R.id.saveApiBaseButton).setOnClickListener {
+            val value = apiBaseInput.text?.toString().orEmpty()
+            if (runtimeApiBaseSettings.setOverride(value)) {
+                apiBaseInputLayout.error = null
+                refreshApiBase()
+                showMessage(R.string.developer_tools_api_base_saved)
+            } else {
+                apiBaseInputLayout.error = getString(
+                    R.string.developer_tools_api_base_invalid
+                )
+            }
+        }
+        findViewById<MaterialButton>(R.id.resetApiBaseButton).setOnClickListener {
+            if (runtimeApiBaseSettings.reset()) {
+                apiBaseInputLayout.error = null
+                refreshApiBase()
+                showMessage(R.string.developer_tools_api_base_reset)
+            } else {
+                showMessage(R.string.developer_tools_api_base_save_failed)
+            }
+        }
+        refreshApiBase()
+    }
+
+    private fun refreshApiBase() {
+        val current = runtimeApiBaseSettings.current()
+        apiSwitch.isChecked = current.url != null
+        apiBaseInput.setText(current.url.orEmpty())
+        apiBaseSource.setText(
+            when (current.source) {
+                RuntimeApiBaseSettings.Source.RUNTIME_OVERRIDE ->
+                    R.string.developer_tools_api_base_runtime_override
+                RuntimeApiBaseSettings.Source.PACKAGED_DEFAULT ->
+                    R.string.developer_tools_api_base_packaged_default
+                RuntimeApiBaseSettings.Source.DISABLED ->
+                    R.string.developer_tools_api_base_not_configured
+            }
+        )
+    }
+
     private fun refreshStatuses() {
         debugModeSwitch.isChecked = DeveloperToolsManager.isEnabled(this)
-        apiSwitch.isChecked = RuntimeConfig.apiEnabled(this)
+        refreshApiBase()
 
         val status = if (isWebViewDebugEnabled()) {
             R.string.developer_tools_enabled