pakstr 0.3.3 → 0.4.0

package/android-template/app/src/main/AndroidManifest.xml

@@ -40,6 +40,23 @@
 
         </activity>
 
+        <provider
+
+            android:name="androidx.core.content.FileProvider"
+
+            android:authorities="${applicationId}.fileprovider"
+
+            android:exported="false"
+
+            android:grantUriPermissions="true">
+
+            <meta-data
+
+                android:name="android.support.FILE_PROVIDER_PATHS"
+
+                android:resource="@xml/file_paths" />
+
+        </provider>
     </application>
 
 </manifest>

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

@@ -1,9 +1,9 @@
 package com.pakstr.app
 
 import android.content.Context
-import android.util.Log
 
 import android.webkit.MimeTypeMap
+import com.pakstr.app.debug.AppDebugLogger
 
 import fi.iki.elonen.NanoHTTPD
 import java.io.IOException
@@ -19,17 +19,29 @@ class LocalServer(
 
 ) : NanoHTTPD(port) {
 
-    private val TAG = "LocalServer"
 
     override fun serve(session: IHTTPSession?): Response {
 
         val uri = (session?.uri ?: "/").replace("..", "")
 
+        AppDebugLogger.network(
 
+            context,
+            "Request: $uri"
+
+        )
         if (uri.startsWith("/api/")) {
 
             if (!RuntimeConfig.apiEnabled(context)) {
 
+                AppDebugLogger.network(
+
+                    context,
+
+                    "API request blocked: $uri"
+
+                )
+
                 return newFixedLengthResponse(
 
                     Response.Status.NOT_FOUND,
@@ -62,8 +74,10 @@ class LocalServer(
 
         return try {
 
-            Log.d(
-                TAG, "Serving asset: $filePath"
+            AppDebugLogger.network(
+                context,
+                "Serving asset: $filePath"
+
             )
 
             val inputStream = context.assets.open(filePath)
@@ -74,8 +88,16 @@ class LocalServer(
 
         } catch (e: IOException) {
 
-            Log.e(
-                TAG, "Failed loading asset: $filePath", e
+            AppDebugLogger.error(
+
+                context,
+
+                "SERVER",
+
+                "Failed loading asset: $filePath",
+
+                e
+
             )
 
             newFixedLengthResponse(
@@ -113,8 +135,11 @@ class LocalServer(
 
         super.start()
 
-        Log.d(
-            TAG, "🚀 LocalServer started on port $listeningPort"
+        AppDebugLogger.network(
+
+            context,
+            "LocalServer started on port $listeningPort"
+
         )
     }
 
@@ -122,6 +147,17 @@ class LocalServer(
         session: IHTTPSession?, uri: String
     ): Response {
 
+        if (AppDebugLogger.isNetworkLoggingEnabled(context)) {
+
+            AppDebugLogger.network(
+
+                context,
+                "Proxy request: $uri"
+
+            )
+
+        }
+
         return try {
 
             val config = RuntimeConfig.load(context)
@@ -129,6 +165,15 @@ class LocalServer(
             val apiBase = config.optString("apiBase")
 
             if (apiBase.isBlank()) {
+                AppDebugLogger.error(
+
+                    context,
+
+                    "API",
+
+                    "apiBase missing"
+
+                )
                 return newFixedLengthResponse(
                     Response.Status.INTERNAL_ERROR,
                     "application/json",
@@ -170,8 +215,7 @@ class LocalServer(
             session?.headers?.get("authorization")
                 ?.let { auth ->
                     connection.setRequestProperty(
-                        "Authorization",
-                        auth
+                        "Authorization", auth
                     )
                 }
 
@@ -187,12 +231,12 @@ class LocalServer(
                 val bytes = body.toByteArray(Charsets.UTF_8)
 
                 connection.doOutput = true
-                session?.headers?.get("content-type")?.let {
-                    connection.setRequestProperty(
-                        "Content-Type",
-                        it
-                    )
-                }
+                session?.headers?.get("content-type")
+                    ?.let {
+                        connection.setRequestProperty(
+                            "Content-Type", it
+                        )
+                    }
 
                 connection.outputStream.use { output ->
 
@@ -202,7 +246,16 @@ class LocalServer(
             }
 
             val code = connection.responseCode
+            if (AppDebugLogger.isNetworkLoggingEnabled(context)) {
 
+                AppDebugLogger.network(
+
+                    context,
+                    "Response: $code $finalUrl"
+
+                )
+
+            }
             val stream = if (code >= 400) connection.errorStream
             else connection.inputStream
 
@@ -211,8 +264,7 @@ class LocalServer(
                     it.readText()
                 } ?: ""
 
-            val responseContentType =
-                connection.contentType ?: "application/json"
+            val responseContentType = connection.contentType ?: "application/json"
 
 
             connection.disconnect()
@@ -229,9 +281,16 @@ class LocalServer(
             )
 
         } catch (e: Exception) {
-            Log.e(
-                TAG,
-                "Proxy failed: ${e.javaClass.simpleName}"
+            AppDebugLogger.error(
+
+                context,
+
+                "API",
+
+                "Proxy failed",
+
+                e
+
             )
             return newFixedLengthResponse(
 

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

@@ -3,7 +3,6 @@ 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
@@ -18,6 +17,10 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
+import com.pakstr.app.debug.AppDebugLogger
+
+import com.pakstr.app.debug.DebugReportShare
+import com.pakstr.app.debug.DeveloperToolsManager
 
 import com.pakstr.app.permissions.PermissionManager
 import com.pakstr.app.permissions.interfaces.PermissionHandler
@@ -38,17 +41,26 @@ class MainActivity : AppCompatActivity(), PermissionHandler {
     private lateinit var amberLauncher:
             ActivityResultLauncher<Intent>
 
-
-    private val TAG = "ShellRuntime"
-
     override fun onCreate(
+
         savedInstanceState: Bundle?
+
     ) {
 
         installSplashScreen()
+
         enableEdgeToEdge()
 
         super.onCreate(savedInstanceState)
+        AppDebugLogger.log(
+
+            this,
+
+            "SESSION",
+
+            "========== APP START =========="
+
+        )
 
         if (BuildConfig.DEBUG) {
 
@@ -57,45 +69,63 @@ class MainActivity : AppCompatActivity(), PermissionHandler {
         }
 
         setContentView(
+
             R.layout.activity_layout
+
         )
 
         initViews()
 
         amberLauncher =
+
             registerForActivityResult(
+
                 ActivityResultContracts.StartActivityForResult()
+
             ) { result ->
+
                 signerManager.handleAmberResult(result)
+
             }
 
         initSigner()
+
         signerManager.setActiveType(
+
             SignerType.AMBER
+
         )
-        //if (AppPreferences.getBoolean("isFirstRun", true)) {
-            //showSignerPicker()
-        //}
 
         ViewCompat.setOnApplyWindowInsetsListener(
+
             container
+
         ) { view, insets ->
 
             val bars =
+
                 insets.getInsets(
+
                     WindowInsetsCompat.Type.systemBars()
+
                 )
 
             view.updatePadding(
+
                 top = bars.top,
+
                 bottom = bars.bottom
+
             )
+
             insets
-        }
 
+        }
 
         setupRuntime()
+
         setupBackNavigation()
+
         showLoader(true)
 
         runtime.start()
@@ -143,16 +173,17 @@ class MainActivity : AppCompatActivity(), PermissionHandler {
 
         container =
             findViewById(R.id.mainContainer)
+
         webView =
             findViewById(R.id.webView)
 
         loader =
             findViewById(R.id.loader)
 
+
         permissionManager =
             PermissionManager(this)
 
-        WebView.setWebContentsDebuggingEnabled(true)
     }
 
     private fun handleSignerSetup() {
@@ -230,4 +261,10 @@ class MainActivity : AppCompatActivity(), PermissionHandler {
             if (show) View.VISIBLE
             else View.GONE
     }
+
+    private fun exportDebugReport() {
+
+        DebugReportShare.share(this)
+
+    }
 }

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

@@ -3,6 +3,7 @@ package com.pakstr.app
 import android.content.Context
 import android.util.Log
 import org.json.JSONObject
+import com.pakstr.app.debug.DebugConfig
 
 object RuntimeConfig {
 
@@ -10,7 +11,6 @@ object RuntimeConfig {
 
     private var config: JSONObject? = null
 
-
     fun load(context: Context): JSONObject {
 
         config?.let {
@@ -21,14 +21,12 @@ object RuntimeConfig {
 
         config = try {
 
-            val input =
-                context.assets.open(
-                    "www/pakstr-runtime.json"
-                )
+            val input = context.assets.open(
+                "www/pakstr-runtime.json"
+            )
 
-            val json =
-                input.bufferedReader()
-                    .use { it.readText() }
+            val json = input.bufferedReader()
+                .use { it.readText() }
 
 
             JSONObject(json)
@@ -36,9 +34,7 @@ object RuntimeConfig {
         } catch (e: Exception) {
 
             Log.e(
-                TAG,
-                "Failed loading runtime config",
-                e
+                TAG, "Failed loading runtime config", e
             )
 
             JSONObject()
@@ -47,15 +43,13 @@ object RuntimeConfig {
 
 
         Log.d(
-            TAG,
-            "FINAL CONFIG: $config"
+            TAG, "FINAL CONFIG: $config"
         )
 
 
         return config!!
     }
 
-
     /**
      * Returns backend API URL.
      *
@@ -67,17 +61,13 @@ object RuntimeConfig {
         context: Context
     ): String? {
 
-        val value =
-            load(context)
-                .optString(
-                    "apiBase",
-                    ""
-                )
+        val value = load(context).optString(
+                "apiBase", ""
+            )
 
 
         Log.d(
-            TAG,
-            "apiBase=$value"
+            TAG, "apiBase=$value"
         )
 
 
@@ -86,7 +76,6 @@ object RuntimeConfig {
         }
     }
 
-
     /**
      * Determines if REST API proxy should be enabled.
      */
@@ -94,20 +83,17 @@ object RuntimeConfig {
         context: Context
     ): Boolean {
 
-        val enabled =
-            !apiBase(context).isNullOrBlank()
+        val enabled = !apiBase(context).isNullOrBlank()
 
 
         Log.d(
-            TAG,
-            "apiEnabled=$enabled"
+            TAG, "apiEnabled=$enabled"
         )
 
 
         return enabled
     }
 
-
     /**
      * Nostr relay URL.
      */
@@ -115,24 +101,59 @@ object RuntimeConfig {
         context: Context
     ): String {
 
-        val relay =
+        val relay = load(context).optString(
+                "relayUrl", ""
+            )
+
+
+        Log.d(
+            TAG, "relayUrl=$relay"
+        )
+
+
+        return relay
+    }
+
+    /**
+
+     * Determines if developer debug tools are enabled.
+
+     */
+
+    fun debugEnabled(
+
+        context: Context
+
+    ): Boolean {
+
+        val enabled =
+
             load(context)
-                .optString(
-                    "relayUrl",
-                    ""
+
+                .optJSONObject("debug")
+
+                ?.optBoolean(
+
+                    "enabled",
+
+                    false
+
                 )
 
+                ?: false
 
         Log.d(
+
             TAG,
-            "relayUrl=$relay"
+
+            "debugEnabled=$enabled"
+
         )
 
+        return enabled
 
-        return relay
     }
 
-
     /**
      * Clears cached config.
      * Useful for testing after changing pakstr-runtime.json.
@@ -142,8 +163,31 @@ object RuntimeConfig {
         config = null
 
         Log.d(
-            TAG,
-            "Config cache cleared"
+            TAG, "Config cache cleared"
+        )
+    }
+
+    fun debugConfig(
+        context: Context
+    ): DebugConfig {
+
+        val debug = load(context).optJSONObject("debug") ?: return DebugConfig()
+
+
+        return DebugConfig(
+
+            enabled = debug.optBoolean(
+                "enabled", false
+            ),
+
+            networkLogs = debug.optBoolean(
+                "networkLogs", false
+            ),
+
+            webViewLogs = debug.optBoolean(
+                "webViewLogs", false
+            ),
+
         )
     }
 }