pakstr 0.3.4 → 0.5.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/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/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/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,12 @@ 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.CrashHandler
+
+import com.pakstr.app.debug.DebugReportShare
+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
@@ -38,64 +43,102 @@ class MainActivity : AppCompatActivity(), PermissionHandler {
     private lateinit var amberLauncher:
             ActivityResultLauncher<Intent>
 
-
-    private val TAG = "ShellRuntime"
-
     override fun onCreate(
+
         savedInstanceState: Bundle?
+
     ) {
 
         installSplashScreen()
+
         enableEdgeToEdge()
 
         super.onCreate(savedInstanceState)
-
         if (BuildConfig.DEBUG) {
 
-            WebView.setWebContentsDebuggingEnabled(true)
+            DeveloperToolsManager.enableDebug(this)
 
         }
 
+        WebViewDebugManager.enable(this)
+
+        AppDebugLogger.log(
+
+            this,
+
+            "TEST",
+
+            "Developer debug enabled"
+
+        )
+        AppDebugLogger.log(
+
+            this,
+
+            "SESSION",
+
+            "========== APP START =========="
+
+        )
+
         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 +186,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 +274,10 @@ class MainActivity : AppCompatActivity(), PermissionHandler {
             if (show) View.VISIBLE
             else View.GONE
     }
+
+    private fun exportDebugReport() {
+
+        DebugReportShare.share(this)
+
+    }
 }