pakstr 0.0.3 → 0.1.0

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

@@ -1,148 +1,156 @@
 package com.pakstr.app.signer
 
 import android.content.Context
+import android.content.Intent
 import androidx.activity.result.ActivityResult
+import androidx.activity.result.ActivityResultLauncher
 import com.pakstr.app.signer.interfaces.NostrSigner
-
+import androidx.core.content.edit
+import com.pakstr.app.signer.exceptions.SignerUnavailableException
+
+/**
+ * Manages Nostr signer selection and lifecycle.
+ *
+ * Provides a single access point for obtaining the active NostrSigner
+ * implementation used by the application.
+ *
+ * Supported signer types:
+ *
+ * - Amber
+ *      External Android signer app using the nostrsigner URI scheme.
+ *
+ * - Fake
+ *      Test signer used for development and testing.
+ *
+ * - Bunker
+ *      Reserved for NIP-46 remote signer implementation.
+ *
+ * The selected signer type is persisted using SharedPreferences.
+ * The signer instance is cached and recreated only when the user
+ * changes the active signer.
+ */
 class SignerManager(
-    private val context: Context,
-    private val launchAmber: (android.content.Intent) -> Unit
+    context: Context,
+    private val amberLauncher: ActivityResultLauncher<Intent>
 ) {
+    private val context =
+        context.applicationContext
 
     private val prefs =
-        context.getSharedPreferences(
+        this.context.getSharedPreferences(
             "signer",
             Context.MODE_PRIVATE
         )
 
-
     private var activeSigner: NostrSigner? = null
 
-
     fun getActiveType(): SignerType? {
 
-        return prefs.getString(
-            "type",
-            null
-        )?.let {
+        val value =
+            prefs.getString(
+                "type",
+                SignerType.AMBER.name
+            )
 
-            SignerType.valueOf(it)
+        return try {
+            SignerType.valueOf(value.toString())
 
+        } catch (_: IllegalArgumentException) {
+            SignerType.AMBER
         }
-
     }
 
+    fun setActiveType(
+        type: SignerType
+    ) {
 
-    fun setActiveType(type: SignerType) {
-
-        prefs.edit()
-            .putString(
+        prefs.edit {
+            putString(
                 "type",
                 type.name
             )
-            .apply()
-
+        }
 
         activeSigner = null
-
     }
 
-
+    /**
+     * Returns the currently selected signer implementation.
+     *
+     * Creates the signer lazily on first request and reuses the same
+     * instance until the signer type changes.
+     */
     fun getSigner(): NostrSigner {
 
-
-        if (activeSigner != null) {
-            return activeSigner!!
+        activeSigner?.let {
+            return it
         }
 
-
-        activeSigner =
-
-            when(getActiveType()) {
+        val signer =
+            when (getActiveType()) {
 
                 SignerType.AMBER -> {
 
                     if (!isAmberInstalled()) {
-
+                        throw SignerUnavailableException(
+                            "Amber signer application is not installed"
+                        )
                     }
 
                     AmberSigner(
-
-                        context,
-
-                        launchAmber
-
+                        amberLauncher
                     )
-
                 }
 
                 SignerType.BUNKER -> {
+                    throw SignerUnavailableException(
+                        "Bunker signer is not implemented"
+                    )
+                }
 
+                SignerType.FAKE -> {
                     FakeSigner()
-
                 }
 
                 null -> {
 
                     throw IllegalStateException(
-
                         "No signer selected"
-
                     )
-
                 }
-
-                else -> {
-
-                    FakeSigner()
-
-                }
-
             }
 
+        activeSigner = signer
 
-        return activeSigner!!
-
-    }
-
-
-
-    fun handleAmberResult(
-        result: ActivityResult
-    ) {
-
-        val signer =
-            activeSigner
-
-
-        if (signer is AmberSigner) {
-
-            signer.handleResult(result)
-
-        }
-
+        return signer
     }
 
     private fun isAmberInstalled(): Boolean {
 
         return try {
 
-            context.packageManager.getPackageInfo(
-
-                "com.greenart7c3.nostrsigner",
-
-                0
-
-            )
+            context.packageManager
+                .getPackageInfo(
+                    "com.greenart7c3.nostrsigner",
+                    0
+                )
 
             true
 
-        } catch (e: Exception) {
+        } catch (_: Exception) {
 
             false
-
         }
-
     }
 
+    /**
+     * Forwards Android Activity results back to the active Amber signer.
+     *
+     * Required because Amber communication is based on the Android
+     * Activity Result API.
+     */
+    fun handleAmberResult(result: ActivityResult) {
+        (activeSigner as? AmberSigner)
+            ?.onResult(result)
+    }
 }

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

@@ -2,7 +2,6 @@ package com.pakstr.app.signer
 
 enum class SignerType {
     AMBER,
-
     BUNKER,
     FAKE
 

package/android-template/app/src/main/java/com/pakstr/app/signer/exceptions/SignerUnavailableException.kt

@@ -0,0 +1,5 @@
+package com.pakstr.app.signer.exceptions
+
+class SignerUnavailableException(
+    message: String
+) : Exception(message)

package/android-template/app/src/main/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">NostrAppShell</string>
+    <string name="app_name">Pakstr</string>
 </resources>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pakstr",
-  "version": "0.0.3",
+  "version": "0.1.0",
   "description": "CLI for packaging Nostr web apps into Android APKs",
   "type": "commonjs",
   "main": "dist/index.js",