pakstr 0.4.0 → 0.6.0

package/android-template/app/build.gradle.kts

@@ -1,12 +1,59 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import java.util.Properties
+import java.io.File
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.compose)
 }
 
+val keystoreProperties =
+
+    Properties()
+
+val keystorePath =
+    providers.gradleProperty(
+        "releaseKeystoreConfig"
+    ).orNull
+
+val keystorePropertiesFile =
+    keystorePath?.let { rootProject.file(it) }
+if (keystorePropertiesFile?.exists() == true) {
+
+    keystorePropertiesFile.inputStream()
+        .use {
+            keystoreProperties.load(it)
+        }
+}
+
 android {
     namespace = "com.pakstr.app"
     compileSdk = 36
 
+    signingConfigs {
+
+        create("release") {
+
+            if (keystorePropertiesFile?.exists() == true) {
+
+                storeFile =
+                    File(
+                        keystorePropertiesFile.parentFile,
+                        keystoreProperties["storeFile"] as String
+                    )
+
+                storePassword =
+                    keystoreProperties["storePassword"] as String
+
+                keyAlias =
+                    keystoreProperties["keyAlias"] as String
+
+                keyPassword =
+                    keystoreProperties["keyPassword"] as String
+            }
+        }
+    }
+
     defaultConfig {
         applicationId = "com.pakstr.app"
         minSdk = 28
@@ -18,23 +65,43 @@ android {
     }
 
     buildTypes {
+
+        debug {
+            applicationIdSuffix = ".debug"
+            versionNameSuffix = "-debug"
+        }
+
         release {
-            isMinifyEnabled = false
+            signingConfig =
+                signingConfigs.getByName("release")
+            isMinifyEnabled = true
+            isShrinkResources = true
             proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
+                getDefaultProguardFile(
+                    "proguard-android-optimize.txt"
+                ),
                 "proguard-rules.pro"
             )
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
+
     buildFeatures {
         compose = true
         buildConfig = true
     }
 }
+tasks.withType<KotlinCompile>()
+    .configureEach {
+        compilerOptions {
+            jvmTarget.set(
+                org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
+            )
+        }
+    }
 
 dependencies {
     implementation(libs.androidx.core.ktx)

package/android-template/app/proguard-rules.pro

@@ -1,21 +1,24 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
+# JavaScript bridge
+-keepclassmembers class * {
+    @android.webkit.JavascriptInterface <methods>;
+}
 
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
+# Nostr signer
+-keep class com.pakstr.app.signer.** { *; }
 
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
+# Crypto
+-keep class com.pakstr.app.crypto.** { *; }
 
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
+# BouncyCastle
+-keep class org.bouncycastle.crypto.** { *; }
+-keep class org.bouncycastle.math.** { *; }
+-keep class org.bouncycastle.asn1.** { *; }
+
+# Ignore unavailable Java SE classes
+-dontwarn javax.naming.**
+
+# Keep Application class
+-keep class com.pakstr.app.ApplicationClass { *; }
+
+# Keep model classes used through JSON
+-keep class com.pakstr.app.signer.** { *; }

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application>
+        <activity-alias
+            android:name=".debug.DeveloperToolsDebugLauncher"
+            android:enabled="true"
+            android:exported="true"
+            android:label="@string/developer_tools_title"
+            android:targetActivity=".debug.DeveloperToolsActivity" />
+    </application>
+</manifest>

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

@@ -28,6 +28,12 @@
         android:supportsRtl="true"
         android:usesCleartextTraffic="true">
 
+        <activity
+            android:name=".debug.DeveloperToolsActivity"
+            android:exported="false"
+            android:label="@string/developer_tools_title"
+            android:theme="@style/Theme.NostrAppShell" />
+
         <activity
             android:name=".MainActivity"
             android:exported="true"

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

@@ -2,6 +2,9 @@ package com.pakstr.app
 
 import android.app.Application
 import com.pakstr.app.crypto.CryptoInitializer
+import com.pakstr.app.debug.AppDebugLogger
+import com.pakstr.app.debug.CrashHandler
+import com.pakstr.app.debug.DebugSession
 import com.pakstr.app.utils.AppPreferences
 
 class ApplicationClass : Application() {
@@ -9,5 +12,16 @@ class ApplicationClass : Application() {
         super.onCreate()
         AppPreferences.init(this)
         CryptoInitializer.init()
+        CrashHandler.install(this)
+
+        AppDebugLogger.log(
+
+            this,
+
+            "SESSION",
+
+            "Session started: ${DebugSession.sessionId}"
+
+        )
     }
 }

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

@@ -17,10 +17,14 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
+import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.pakstr.app.debug.AppDebugLogger
+import com.pakstr.app.debug.CrashHandler
 
 import com.pakstr.app.debug.DebugReportShare
+import com.pakstr.app.debug.DeveloperToolsActivity
 import com.pakstr.app.debug.DeveloperToolsManager
+import com.pakstr.app.debug.WebViewDebugManager
 
 import com.pakstr.app.permissions.PermissionManager
 import com.pakstr.app.permissions.interfaces.PermissionHandler
@@ -41,6 +45,8 @@ class MainActivity : AppCompatActivity(), PermissionHandler {
     private lateinit var amberLauncher:
             ActivityResultLauncher<Intent>
 
+    private lateinit var fab: FloatingActionButton
+
     override fun onCreate(
 
         savedInstanceState: Bundle?
@@ -52,21 +58,32 @@ class MainActivity : AppCompatActivity(), PermissionHandler {
         enableEdgeToEdge()
 
         super.onCreate(savedInstanceState)
+        if (BuildConfig.DEBUG) {
+
+            DeveloperToolsManager.enableDebug(this)
+
+        }
+
+        WebViewDebugManager.enable(this)
+
         AppDebugLogger.log(
 
             this,
 
-            "SESSION",
+            "TEST",
 
-            "========== APP START =========="
+            "Developer debug enabled"
 
         )
+        AppDebugLogger.log(
 
-        if (BuildConfig.DEBUG) {
+            this,
 
-            WebView.setWebContentsDebuggingEnabled(true)
+            "SESSION",
 
-        }
+            "========== APP START =========="
+
+        )
 
         setContentView(
 
@@ -75,6 +92,7 @@ class MainActivity : AppCompatActivity(), PermissionHandler {
         )
 
         initViews()
+        showDebugFab()
 
         amberLauncher =
 
@@ -132,6 +150,34 @@ class MainActivity : AppCompatActivity(), PermissionHandler {
 
     }
 
+    private fun showDebugFab() {
+        if (BuildConfig.DEBUG || RuntimeConfig.debugEnabled(this)) {
+
+            fab.visibility = View.VISIBLE
+
+            fab.setOnClickListener {
+
+                startActivity(
+
+                    Intent(
+
+                        this,
+
+                        DeveloperToolsActivity::class.java
+
+                    )
+
+                )
+
+            }
+
+        } else {
+
+            fab.visibility = View.GONE
+
+        }
+    }
+
     private fun setupBackNavigation() {
         onBackPressedDispatcher.addCallback(
             this,
@@ -184,6 +230,10 @@ class MainActivity : AppCompatActivity(), PermissionHandler {
         permissionManager =
             PermissionManager(this)
 
+        fab = findViewById(
+
+            R.id.developerToolsFab)
+
     }
 
     private fun handleSignerSetup() {

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

@@ -97,7 +97,7 @@ class ShellRuntime(
             }
 
         }
-
+        AppDebugLogger.load(context)
     }
 
     private fun startServer(): Boolean {

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

@@ -95,6 +95,7 @@ class WebViewController(
                         nip07Injected = injectNip07()
 
                     }
+                    injectDebugLogger()
                 }
 
                 override fun onReceivedHttpError(
@@ -343,4 +344,138 @@ class WebViewController(
             false
         }
     }
+
+    private fun injectDebugLogger() {
+
+        val js = """
+        (function(){
+
+            if (!window.AndroidBridge) {
+                return;
+            }
+
+
+            const oldLog = console.log;
+            const oldWarn = console.warn;
+            const oldError = console.error;
+
+
+            function send(level, args){
+
+                try {
+
+                    const message =
+                        Array.from(args)
+                        .map(item => {
+
+                            if(typeof item === 'object'){
+                                return JSON.stringify(item);
+                            }
+
+                            return String(item);
+
+                        })
+                        .join(" ");
+
+                    window.AndroidBridge.debugLog(
+                        level,
+                        message
+                    );
+
+                } catch(e){
+
+                }
+            }
+
+
+            console.log = function(){
+
+                send(
+                    "LOG",
+                    arguments
+                );
+
+                oldLog.apply(
+                    console,
+                    arguments
+                );
+            };
+
+
+            console.warn = function(){
+
+                send(
+                    "WARN",
+                    arguments
+                );
+
+                oldWarn.apply(
+                    console,
+                    arguments
+                );
+            };
+
+
+            console.error = function(){
+
+                send(
+                    "ERROR",
+                    arguments
+                );
+
+                oldError.apply(
+                    console,
+                    arguments
+                );
+            };
+
+
+            window.onerror =
+                function(
+                    message,
+                    source,
+                    line,
+                    column,
+                    error
+                ){
+
+                    send(
+                        "ERROR",
+                        [
+                            "JS ERROR:",
+                            message,
+                            source,
+                            line,
+                            column,
+                            error?.stack
+                        ]
+                    );
+
+                    return false;
+                };
+
+
+            window.onunhandledrejection =
+                function(event){
+
+                    send(
+                        "ERROR",
+                        [
+                            "PROMISE ERROR:",
+                            event.reason
+                        ]
+                    );
+
+                };
+
+
+        })();
+    """.trimIndent()
+
+
+        webView.evaluateJavascript(
+            js,
+            null
+        )
+    }
 }

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

@@ -5,6 +5,7 @@ import android.util.Log
 import com.pakstr.app.BuildConfig
 import com.pakstr.app.RuntimeConfig
 import java.text.SimpleDateFormat
+import java.util.Collections
 import java.util.Date
 import java.util.Locale
 
@@ -15,7 +16,12 @@ object AppDebugLogger {
     private const val MAX_LOGS = 500
 
     private val logs =
-        mutableListOf<String>()
+
+        Collections.synchronizedList(
+
+            mutableListOf<String>()
+
+        )
 
     fun log(
         context: Context,
@@ -108,10 +114,14 @@ object AppDebugLogger {
 
     }
 
-    fun clear() {
+    fun clear(
+        context: Context
+    ) {
 
         logs.clear()
 
+        DebugLogStorage.clear(context)
+
     }
 
     private fun isDebugEnabled(
@@ -280,14 +290,77 @@ object AppDebugLogger {
     }
 
     private fun config(
+        context: Context
+    ): DebugConfig {
+
+
+        val runtime =
+            DebugRuntimeOverride.get(context)
+
+
+        if (runtime != null) {
+            return runtime
+        }
+
+
+        val stored =
+            DebugPreferences.load(
+                context
+            )
+
+
+        if (stored.enabled) {
+            return stored
+        }
+
+
+        return RuntimeConfig.debugConfig(
+            context
+        )
+
+    }
 
+    fun exportLogs(
         context: Context
+    ): String {
 
-    ): DebugConfig {
+        return buildString {
+
+            appendLine(
+                "===== PAKSTR DEBUG LOG ====="
+            )
+
+            appendLine(
+                "Version: ${BuildConfig.VERSION_NAME}"
+            )
+
+            appendLine(
+                "Debug: ${isDebugEnabled(context)}"
+            )
+
+            appendLine()
+
+
+            getLogs().forEach {
+                appendLine(it)
+            }
 
-        return DebugRuntimeOverride.get()
+        }
+    }
+
+    fun load(
+
+        context: Context
+
+    ) {
+
+        logs.clear()
 
-            ?: RuntimeConfig.debugConfig(context)
+        logs.addAll(
+
+            DebugLogStorage.read(context)
+
+        )
 
     }
 }

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

@@ -0,0 +1,32 @@
+package com.pakstr.app.debug
+
+import android.content.Context
+
+object CrashHandler {
+
+    fun install(
+        context: Context
+    ) {
+
+        val defaultHandler =
+            Thread.getDefaultUncaughtExceptionHandler()
+
+
+        Thread.setDefaultUncaughtExceptionHandler { thread, throwable ->
+
+
+            AppDebugLogger.error(
+                context,
+                "CRASH",
+                "Unhandled exception in ${thread.name}",
+                throwable
+            )
+
+
+            defaultHandler?.uncaughtException(
+                thread,
+                throwable
+            )
+        }
+    }
+}

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

@@ -1,10 +1,13 @@
 package com.pakstr.app.debug
 
+import android.content.Context
+
 object DebugConfigProvider {
 
     private var manifestConfig =
         DebugConfig()
 
+
     fun initialize(
         config: DebugConfig
     ) {
@@ -13,10 +16,12 @@ object DebugConfigProvider {
 
     }
 
-    fun current():
-            DebugConfig {
 
-        return DebugRuntimeOverride.get()
+    fun current(
+        context: Context
+    ): DebugConfig {
+
+        return DebugRuntimeOverride.get(context)
             ?: manifestConfig
 
     }