pakstr 0.8.6 → 0.8.7

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

@@ -209,6 +209,7 @@ class MainActivity : AppCompatActivity(), PermissionHandler {
     private fun setupSupportUnlockGesture() {
         supportUnlockGestureLayout.onUnlock = {
             SupportUnlock.unlock(this)
+            WebViewDebugManager.enable(this)
             Toast.makeText(
                 this,
                 R.string.diagnostics_mode_enabled,
@@ -289,6 +290,7 @@ class MainActivity : AppCompatActivity(), PermissionHandler {
     override fun onResume() {
         super.onResume()
 
+        WebViewDebugManager.enable(this)
         if (::fab.isInitialized) {
             showDebugFab()
         }

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

@@ -106,7 +106,7 @@ object DebugReportExporter {
         ${RuntimeConfig.apiEnabled(context)}
 
         WebView Debug:
-        ${BuildConfig.DEBUG || SupportUnlock.isActive(context)}
+        ${WebViewDebugManager.isInspectionAllowed(context)}
 
         Logs:
         -------------------

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

@@ -129,7 +129,7 @@ class DeveloperToolsActivity : AppCompatActivity() {
     }
 
     private fun isWebViewDebugEnabled(): Boolean {
-        return BuildConfig.DEBUG || SupportUnlock.isActive(this)
+        return WebViewDebugManager.isInspectionAllowed(this)
     }
 
     private fun setupLogActions() {

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

@@ -0,0 +1,23 @@
+package com.pakstr.app.debug
+
+import android.content.Context
+import android.provider.Settings
+
+object DeviceDeveloperState {
+
+    fun isAdbEnabled(context: Context): Boolean {
+        return isAdbEnabled {
+            Settings.Global.getInt(
+                context.contentResolver,
+                Settings.Global.ADB_ENABLED,
+                0
+            )
+        }
+    }
+
+    internal fun isAdbEnabled(
+        readSetting: () -> Int
+    ): Boolean {
+        return readSetting() == 1
+    }
+}

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

@@ -6,15 +6,36 @@ import com.pakstr.app.BuildConfig
 
 object WebViewDebugManager {
 
+    internal var debuggingStateApplier: (Boolean) -> Unit =
+        WebView::setWebContentsDebuggingEnabled
+
+
+    fun isInspectionAllowed(
+        context: Context
+    ): Boolean {
+        return isInspectionAllowed(
+            isDebugBuild = BuildConfig.DEBUG,
+            isSupportUnlocked = SupportUnlock.isActive(context),
+            isAdbEnabled = DeviceDeveloperState.isAdbEnabled(context)
+        )
+    }
+
+    internal fun isInspectionAllowed(
+        isDebugBuild: Boolean,
+        isSupportUnlocked: Boolean,
+        isAdbEnabled: Boolean
+    ): Boolean {
+        return isDebugBuild ||
+                (isSupportUnlocked && isAdbEnabled)
+    }
 
     fun enable(
         context: Context
     ) {
 
-        val enabled = BuildConfig.DEBUG ||
-                SupportUnlock.isActive(context)
+        val enabled = isInspectionAllowed(context)
 
-        WebView.setWebContentsDebuggingEnabled(enabled)
+        setWebContentsDebuggingEnabled(enabled)
 
         AppDebugLogger.log(
             context,
@@ -22,4 +43,10 @@ object WebViewDebugManager {
             "WebView debugging enabled: $enabled"
         )
     }
-}
+
+    internal fun setWebContentsDebuggingEnabled(
+        enabled: Boolean
+    ) {
+        debuggingStateApplier(enabled)
+    }
+}

package/android-template/app/src/test/java/com/pakstr/app/debug/DeviceDeveloperStateTest.kt

@@ -0,0 +1,21 @@
+package com.pakstr.app.debug
+
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class DeviceDeveloperStateTest {
+
+    @Test
+    fun adb_is_enabled_only_for_setting_value_one() {
+        assertTrue(
+            DeviceDeveloperState.isAdbEnabled { 1 }
+        )
+        assertFalse(
+            DeviceDeveloperState.isAdbEnabled { 0 }
+        )
+        assertFalse(
+            DeviceDeveloperState.isAdbEnabled { 2 }
+        )
+    }
+}

package/android-template/app/src/test/java/com/pakstr/app/debug/WebViewDebugManagerTest.kt

@@ -0,0 +1,84 @@
+package com.pakstr.app.debug
+
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class WebViewDebugManagerTest {
+
+    @Test
+    fun debug_build_allows_inspection_without_release_prerequisites() {
+        assertTrue(
+            WebViewDebugManager.isInspectionAllowed(
+                isDebugBuild = true,
+                isSupportUnlocked = false,
+                isAdbEnabled = false
+            )
+        )
+    }
+
+    @Test
+    fun release_allows_inspection_with_support_unlock_and_adb() {
+        assertTrue(
+            WebViewDebugManager.isInspectionAllowed(
+                isDebugBuild = false,
+                isSupportUnlocked = true,
+                isAdbEnabled = true
+            )
+        )
+    }
+
+    @Test
+    fun release_rejects_support_unlock_without_adb() {
+        assertFalse(
+            WebViewDebugManager.isInspectionAllowed(
+                isDebugBuild = false,
+                isSupportUnlocked = true,
+                isAdbEnabled = false
+            )
+        )
+    }
+
+    @Test
+    fun release_rejects_adb_without_support_unlock() {
+        assertFalse(
+            WebViewDebugManager.isInspectionAllowed(
+                isDebugBuild = false,
+                isSupportUnlocked = false,
+                isAdbEnabled = true
+            )
+        )
+    }
+
+    @Test
+    fun release_rejects_inspection_without_either_prerequisite() {
+        assertFalse(
+            WebViewDebugManager.isInspectionAllowed(
+                isDebugBuild = false,
+                isSupportUnlocked = false,
+                isAdbEnabled = false
+            )
+        )
+    }
+
+    @Test
+    fun allowed_release_state_is_applied_to_webview_debugging() {
+        val appliedStates = mutableListOf<Boolean>()
+        val previous = WebViewDebugManager.debuggingStateApplier
+        WebViewDebugManager.debuggingStateApplier = appliedStates::add
+
+        try {
+            val allowed =
+                WebViewDebugManager.isInspectionAllowed(
+                    isDebugBuild = false,
+                    isSupportUnlocked = true,
+                    isAdbEnabled = true
+                )
+            WebViewDebugManager.setWebContentsDebuggingEnabled(allowed)
+        } finally {
+            WebViewDebugManager.debuggingStateApplier = previous
+        }
+
+        assertTrue(appliedStates.single())
+    }
+}

package/package.json

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