pakstr 0.0.4 → 0.2.0

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

@@ -1,153 +1,153 @@
 package com.pakstr.app
 
 import android.Manifest
+import android.content.Intent
 import android.os.Bundle
 import android.util.Log
+
 import android.view.View
 import android.webkit.PermissionRequest
 import android.webkit.WebView
 import android.widget.FrameLayout
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
+import androidx.lifecycle.lifecycleScope
 import com.pakstr.app.permissions.PermissionManager
 import com.pakstr.app.permissions.interfaces.PermissionHandler
+import com.pakstr.app.crypto.CryptoInitializer
+import com.pakstr.app.debug.AppDebugLogger
+
 import com.pakstr.app.signer.SignerManager
-import com.pakstr.app.signer.interfaces.NostrSigner
+import com.pakstr.app.signer.SignerType
 import com.pakstr.app.utils.AppPreferences
 import com.pakstr.app.utils.SignerPickerBottomSheet
+import kotlinx.coroutines.launch
 
 class MainActivity : AppCompatActivity(), PermissionHandler {
 
     private lateinit var runtime: ShellRuntime
     private lateinit var container: FrameLayout
     private lateinit var webView: WebView
-
     private lateinit var loader: View
-
     private lateinit var signerManager: SignerManager
-
-    private var activeSigner: NostrSigner? = null
-
-    private var pendingPermissionRequest: PermissionRequest? = null
-
     private lateinit var permissionManager: PermissionManager
+    private lateinit var amberLauncher:
+            ActivityResultLauncher<Intent>
 
-    private val amberLauncher =
-
-        registerForActivityResult(
-
-            ActivityResultContracts.StartActivityForResult()
-
-        ) { result ->
-
-            signerManager.handleAmberResult(result)
-
-        }
+    override fun onCreate(
+        savedInstanceState: Bundle?
+    ) {
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        val splashScreen = installSplashScreen()
+        installSplashScreen()
         enableEdgeToEdge()
 
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_layout)
 
-        permissionManager = PermissionManager(this)
+        if (BuildConfig.DEBUG) {
 
-        signerManager = SignerManager(
+            WebView.setWebContentsDebuggingEnabled(true)
 
-            this
-
-        ) { intent ->
+        }
 
-            amberLauncher.launch(intent)
+        setContentView(
+            R.layout.activity_layout
+        )
 
-        }
+        initViews()
 
-        val isFirstRun = AppPreferences.getBoolean("isFirstRun", true)
+        amberLauncher =
+            registerForActivityResult(
+                ActivityResultContracts.StartActivityForResult()
+            ) { result ->
+                signerManager.handleAmberResult(result)
+            }
 
-         if (isFirstRun) {
-        //showTwoOptionsPicker(prefs)
-        showSignerPicker()
-        //testPush()
-         }
+        initSigner()
+        signerManager.setActiveType(
+            SignerType.AMBER
+        )
+        //if (AppPreferences.getBoolean("isFirstRun", true)) {
+            //showSignerPicker()
+        //}
 
-        initViews()
+        ViewCompat.setOnApplyWindowInsetsListener(
+            container
+        ) { view, insets ->
 
-        ViewCompat.setOnApplyWindowInsetsListener(container) { view, insets ->
-            val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            val bars =
+                insets.getInsets(
+                    WindowInsetsCompat.Type.systemBars()
+                )
 
             view.updatePadding(
-                top = bars.top, bottom = bars.bottom
+                top = bars.top,
+                bottom = bars.bottom
             )
-
             insets
         }
 
-        runtime = ShellRuntime(
-
-            this,
-            webView,
-            signerManager,
-            permissionHandler = this
+        setupRuntime()
+        setupBackNavigation()
+        showLoader(true)
+        runtime.start()
 
-        )
+    }
 
-        onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
+    private fun setupBackNavigation() {
+        onBackPressedDispatcher.addCallback(
+            this,
+            object : OnBackPressedCallback(true) {
 
-            override fun handleOnBackPressed() {
+                override fun handleOnBackPressed() {
 
-                val webView = runtime.getWebview()
+                    val currentWebView = runtime.getWebview()
 
-                if (webView.canGoBack()) {
-                    webView.goBack()
-                } else {
-                    finish()
+                    if (currentWebView.canGoBack()) {
+                        currentWebView.goBack()
+                    } else {
+                        finish()
+                    }
                 }
             }
-
-        })
-        loader.visibility = View.VISIBLE
-        runtime.start()
+        )
     }
 
-    private fun initViews() {
-        container = findViewById(R.id.mainContainer)
-        webView = findViewById(R.id.webView)
-        loader = findViewById(R.id.loader)
+    private fun setupRuntime() {
+        runtime =
+            ShellRuntime(
+                this,
+                webView,
+                signerManager,
+                permissionHandler = this
+            )
     }
 
-    override fun onDestroy() {
-        runtime.stop()
-        super.onDestroy()
+    private fun initSigner() {
+        signerManager =
+            SignerManager(
+                this,
+                amberLauncher
+            )
     }
 
+    private fun initViews() {
 
-    private fun showSignerPicker() {
-
-        val picker = SignerPickerBottomSheet { selectedType ->
-
-            signerManager.setActiveType(selectedType)
-
-            activeSigner = signerManager.getSigner()
-
-            handleSignerSetup()
-
-        }
-
-        picker.show(
-
-            supportFragmentManager,
-
-            "SignerPicker"
-
-        )
+        container =
+            findViewById(R.id.mainContainer)
+        webView =
+            findViewById(R.id.webView)
+        loader =
+            findViewById(R.id.loader)
 
+        permissionManager =
+            PermissionManager(this)
     }
 
     private fun handleSignerSetup() {
@@ -157,11 +157,24 @@ class MainActivity : AppCompatActivity(), PermissionHandler {
         )
     }
 
+    override fun onDestroy() {
+
+        if (::runtime.isInitialized) {
+
+            runtime.stop()
+
+        }
+
+        super.onDestroy()
+
+    }
+
     override fun onRequestPermissionsResult(
         requestCode: Int,
         permissions: Array<out String>,
         grantResults: IntArray
     ) {
+
         super.onRequestPermissionsResult(
             requestCode,
             permissions,
@@ -176,33 +189,40 @@ class MainActivity : AppCompatActivity(), PermissionHandler {
     override fun onPermissionRequest(
         request: PermissionRequest
     ) {
+
         permissionManager.request(
+
             Manifest.permission.CAMERA
+
         ) { granted ->
+
             if (granted) {
-                request.grant(request.resources)
+
+                request.grant(
+                    request.resources
+                )
             } else {
                 request.deny()
             }
         }
     }
 
-    private fun testPush() {
-        permissionManager.requestNotificationPermission { granted ->
-
-            if (granted) {
-                Log.d(
-                    "PERMISSION",
-                    "Notifications granted"
-                )
-            } else {
-                Log.d(
-                    "PERMISSION",
-                    "Notifications denied"
-                )
-            }
+    private fun showSignerPicker() {
 
-        }
+        SignerPickerBottomSheet { selectedType ->
+            signerManager.setActiveType(selectedType)
+            handleSignerSetup()
+        }.show(
+            supportFragmentManager,
+            "SignerPicker"
+        )
+    }
 
+    private fun showLoader(
+        show: Boolean
+    ) {
+        loader.visibility =
+            if (show) View.VISIBLE
+            else View.GONE
     }
-}
+}

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

@@ -1,7 +1,7 @@
 package com.pakstr.app
 
 import android.content.Context
-import android.util.Log
+import com.pakstr.app.debug.AppDebugLogger
 import android.webkit.WebView
 import com.pakstr.app.permissions.interfaces.PermissionHandler
 import com.pakstr.app.signer.SignerManager
@@ -43,7 +43,7 @@ class ShellRuntime(
 
             if (!ok) {
 
-                Log.e(
+                AppDebugLogger.log(
                     "RUNTIME",
                     "Server failed"
                 )
@@ -84,7 +84,7 @@ class ShellRuntime(
             )
 
 
-            Log.d(
+            AppDebugLogger.log(
                 "SERVER",
                 "Started OK"
             )
@@ -96,10 +96,9 @@ class ShellRuntime(
         } catch (e: Exception) {
 
 
-            Log.e(
+            AppDebugLogger.log(
                 "SERVER",
-                "FAILED TO START",
-                e
+                "Failed to start: ${e.message}"
             )
 
 

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

@@ -2,7 +2,6 @@ package com.pakstr.app
 
 import android.app.Activity
 import android.content.Context
-import android.util.Log
 import android.view.View
 import android.webkit.CookieManager
 import android.webkit.PermissionRequest
@@ -11,11 +10,22 @@ import android.webkit.WebResourceRequest
 import android.webkit.WebResourceResponse
 import android.webkit.WebView
 import android.webkit.WebViewClient
-import com.pakstr.app.R
+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
 
+/**
+ * Controls WebView configuration and lifecycle.
+ *
+ * Responsibilities:
+ * - Configure secure WebView settings
+ * - Load local web application from NanoHTTPD server
+ * - Inject NIP-07 JavaScript provider
+ * - Expose Android signer bridge to JavaScript
+ * - Handle Web permissions
+ * - Cleanup WebView resources
+ */
 class WebViewController(
 
     private val context: Context,
@@ -35,6 +45,8 @@ class WebViewController(
         //webView.loadUrl("https://sigit.io")
     }
 
+    private var nip07Injected = false
+
     fun setup() {
         showLoader()
         setupWebView()
@@ -54,21 +66,30 @@ class WebViewController(
 
                 allowFileAccess = false
                 allowContentAccess = false
+
+                mediaPlaybackRequiresUserGesture = false
+                builtInZoomControls = false
+                displayZoomControls = false
+
+                mixedContentMode = android.webkit.WebSettings.MIXED_CONTENT_NEVER_ALLOW
             }
 
             // Standard clients are enough since overriding URL loading isn't required
             webViewClient = object : WebViewClient() {
 
-                override fun onPageFinished(view: WebView?, url: String?) {
+                override fun onPageFinished(
+                    view: WebView?,
+                    url: String?
+                ) {
                     super.onPageFinished(view, url)
-                    hideLoader()
-                    val js = context.assets.open("nip07.js")
 
-                        .bufferedReader()
+                    hideLoader()
 
-                        .readText()
+                    if (!nip07Injected) {
+                        nip07Injected =
+                            injectNip07()
 
-                    webView.evaluateJavascript(js, null)
+                    }
                 }
 
                 override fun shouldInterceptRequest(
@@ -79,12 +100,18 @@ class WebViewController(
 
                 ): WebResourceResponse? {
 
-                    val url = request?.url.toString()
-
-                    Log.d("WEB_ASSET", "REQUEST: $url")
-
                     return super.shouldInterceptRequest(view, request)
                 }
+
+                override fun shouldOverrideUrlLoading(
+                    view: WebView?,
+                    request: WebResourceRequest?
+                ): Boolean {
+                    val url = request?.url ?: return true
+                    return url.host != "127.0.0.1"
+                }
+
+
             }
             webChromeClient = object : WebChromeClient() {
 
@@ -96,13 +123,15 @@ class WebViewController(
             }
         }
 
+        // Exposes native Nostr signer APIs to the WebView.
+        // Available in JavaScript as window.AndroidBridge.
         webView.addJavascriptInterface(
 
             NostrBridge(
 
                 signerManager = signerManager,
 
-                webView = webView
+                webView = webView,
 
             ),
 
@@ -130,13 +159,10 @@ class WebViewController(
     fun destroy() {
         webView.stopLoading()
 
-        webView.clearCache(true)
-
         webView.clearHistory()
-
-        CookieManager.getInstance().removeAllCookies(null)
-
-        CookieManager.getInstance().flush()
+        webView.clearCache(false)
+        CookieManager.getInstance()
+            .flush()
 
         webView.loadUrl("about:blank")
         webView.removeCallbacks(loadRunnable)
@@ -145,4 +171,27 @@ class WebViewController(
 
         webView.destroy()
     }
-}
+
+    private fun injectNip07(): Boolean {
+
+        return try {
+            val js =
+                context.assets
+                    .open("nip07.js")
+                    .bufferedReader()
+                    .readText()
+
+            webView.evaluateJavascript(
+                js,
+                null
+            )
+            true
+        } catch (e: Exception) {
+            AppDebugLogger.log(
+                "WEBVIEW",
+                "Failed loading nip07.js: ${e.message}"
+            )
+            false
+        }
+    }
+}