Merge pull request #2 from joinflux/android-fix

Multiple fixes and improvements

Author: gugahoi

.github/workflows/pr-build.yml

@@ -0,0 +1,26 @@
+name: PR Build
+
+on:
+  pull_request:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: pr-build-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 24
+          cache: npm
+
+      - run: npm ci
+      - run: npm run lint
+      - run: npm run build

.github/workflows/publish.yml

@@ -15,7 +15,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 24
           registry-url: https://registry.npmjs.org
           cache: npm
 

README.md

@@ -31,7 +31,7 @@ Requirements:
 ## Usage
 
 ```ts
-import { SensitiveScreen } from 'capacitor-sensitive-screen';
+import { SensitiveScreen } from '@joinflux/capacitor-sensitive-screen';
 import { useEffect } from 'react';
 
 export function AccountStatementRoute() {
@@ -228,9 +228,7 @@ with the version as the message, and creates a matching `vX.Y.Z` tag.
 1.  Verifies the tag (e.g. `v0.2.0`) matches `package.json.version`. If not,
     it fails fast — this catches tags created by hand without a version bump.
 2.  Runs `npm ci` and `npm run build`.
-3.  Runs `npm publish --access public --provenance` using `NPM_TOKEN`. The
-    `--provenance` flag attaches a signed attestation linking the published
-    tarball back to this repo and this commit.
+3.  Runs `npm publish --access public` using `Trusted Publisher`.
 4.  Creates a GitHub Release for the tag with auto-generated release notes
     from the commits since the previous tag.
 

android/src/main/java/finance/flux/sensitivescreen/SensitiveScreenPlugin.java

@@ -1,5 +1,7 @@
 package com.joinflux.sensitivescreen;
 
+import android.app.Activity;
+import android.view.Window;
 import android.view.WindowManager;
 
 import com.getcapacitor.Plugin;
@@ -12,16 +14,36 @@ public class SensitiveScreenPlugin extends Plugin {
 
     @PluginMethod
     public void enable(final PluginCall call) {
-        getActivity().runOnUiThread(() -> {
-            getActivity().getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+        final Activity activity = getActivity();
+        if (activity == null) {
+            call.reject("Activity unavailable");
+            return;
+        }
+        activity.runOnUiThread(() -> {
+            final Window window = activity.getWindow();
+            if (window == null) {
+                call.reject("Window unavailable");
+                return;
+            }
+            window.addFlags(WindowManager.LayoutParams.FLAG_SECURE);
             call.resolve();
         });
     }
 
     @PluginMethod
     public void disable(final PluginCall call) {
-        getActivity().runOnUiThread(() -> {
-            getActivity().getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
+        final Activity activity = getActivity();
+        if (activity == null) {
+            call.reject("Activity unavailable");
+            return;
+        }
+        activity.runOnUiThread(() -> {
+            final Window window = activity.getWindow();
+            if (window == null) {
+                call.reject("Window unavailable");
+                return;
+            }
+            window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
             call.resolve();
         });
     }

biome.json

@@ -1,9 +1,13 @@
 {
-  "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
-  "organizeImports": { "enabled": true },
+  "$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
+  "organizeImports": {
+    "enabled": true
+  },
   "linter": {
     "enabled": true,
-    "rules": { "recommended": true }
+    "rules": {
+      "recommended": true
+    }
   },
   "formatter": {
     "enabled": false

ios/Plugin/SensitiveScreenPlugin.swift

@@ -67,13 +67,28 @@ public class SensitiveScreenPlugin: CAPPlugin {
 
     private func handleWillResignActive() {
         guard isEnabled, overlayView == nil else { return }
-        guard let window = UIApplication.shared.windows.first else { return }
+        guard let window = activeKeyWindow() else { return }
 
         let overlay = buildOverlay(frame: window.bounds)
         window.addSubview(overlay)
         overlayView = overlay
     }
 
+    private func activeKeyWindow() -> UIWindow? {
+        let scenes = UIApplication.shared.connectedScenes
+            .compactMap { $0 as? UIWindowScene }
+
+        if let active = scenes.first(where: { $0.activationState == .foregroundActive }) {
+            return active.keyWindow ?? active.windows.first { $0.isKeyWindow } ?? active.windows.first
+        }
+
+        if let inactive = scenes.first(where: { $0.activationState == .foregroundInactive }) {
+            return inactive.keyWindow ?? inactive.windows.first { $0.isKeyWindow } ?? inactive.windows.first
+        }
+
+        return nil
+    }
+
     private func handleDidBecomeActive() {
         overlayView?.removeFromSuperview()
         overlayView = nil
@@ -133,7 +148,7 @@ public class SensitiveScreenPlugin: CAPPlugin {
             host.addSubview(imageView)
             NSLayoutConstraint.activate([
                 imageView.centerXAnchor.constraint(equalTo: host.centerXAnchor),
-                imageView.centerYAnchor.constraint(equalTo: host.centerYAnchor),
+                imageView.centerYAnchor.constraint(equalTo: host.centerYAnchor)
             ])
         }
 

package-lock.json

@@ -37,7 +37,7 @@
     "fmt": "npm run biome:fix && npm run prettier -- --write && npm run swiftlint -- --fix --format",
     "biome": "biome check src",
     "biome:fix": "biome check --write src",
-    "prettier": "prettier \"**/*.{css,html,ts,js,java}\"",
+    "prettier": "prettier \"**/*.{css,html,ts,js}\"",
     "swiftlint": "node-swiftlint",
     "docgen": "docgen --api SensitiveScreenPlugin --output-readme README.md --output-json dist/docs.json",
     "build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.mjs",
@@ -65,6 +65,9 @@
   },
   "prettier": "@ionic/prettier-config",
   "swiftlint": "@ionic/swiftlint-config",
+  "engines": {
+    "node": ">=18.0.0"
+  },
   "capacitor": {
     "ios": {
       "src": "ios"

package.json

@@ -1,11 +1,6 @@
 export type SensitiveScreenOverlayStyle = 'solid' | 'blur';
 
-export type SensitiveScreenBlurStyle =
-  | 'light'
-  | 'dark'
-  | 'regular'
-  | 'prominent'
-  | 'extraLight';
+export type SensitiveScreenBlurStyle = 'light' | 'dark' | 'regular' | 'prominent' | 'extraLight';
 
 export interface SensitiveScreenEnableOptions {
   /**