Update Android/iOS dependencies and refactor security code

Upgraded Android and iOS build tools, Gradle, and React Native dependencies to latest versions. Refactored Android SensitiveInfo implementation for improved documentation and clarity, and updated example app to use new React Native entry points. Removed deprecated biometric and storage demo components, added new SecurityDemo, and updated project configuration for edge-to-edge support and immersive UI.

Author: mCodex

README.md

@@ -622,7 +622,7 @@ struct SecurityStatusScreen: View {
                 // Your custom UI
                 Button("Test Secure Storage") {
                     Task {
-                        let sensitiveInfo = SensitiveInfo()
+                        let sensitiveInfo = RNSensitiveInfo()
                         try await sensitiveInfo.setItem(
                             key: "test", 
                             value: "secure-data",
@@ -642,13 +642,12 @@ struct SecurityStatusScreen: View {
 
 ### Custom Integration
 
-Use the SensitiveInfo Swift class directly in your SwiftUI views:
-
+Use the RNSensitiveInfo Swift class directly in your SwiftUI views:
 ```swift
 struct CustomSecureView: View {
-    @State private var sensitiveInfo = SensitiveInfo()
+  @State private var sensitiveInfo = RNSensitiveInfo()
     @State private var secureData: String = ""
-    @State private var isLoading = false
+            let sensitiveInfo = RNSensitiveInfo()
 
     var body: some View {
         VStack {

android/gradle.properties

@@ -1,5 +1,5 @@
 SensitiveInfo_kotlinVersion=2.1.20
 SensitiveInfo_minSdkVersion=24
-SensitiveInfo_targetSdkVersion=35
-SensitiveInfo_compileSdkVersion=35
+SensitiveInfo_targetSdkVersion=36
+SensitiveInfo_compileSdkVersion=36
 SensitiveInfo_ndkVersion=27.1.12297006

android/src/main/java/com/margelo/nitro/sensitiveinfo/SensitiveInfo.kt

@@ -15,8 +15,13 @@ import javax.crypto.KeyGenerator
 
 /**
  * Secure storage implementation with multiple security levels.
- * Uses AndroidX EncryptedSharedPreferences with StrongBox when available.
- * Note: Biometric authentication must be handled at the JavaScript layer.
+ *
+ * - Standard: AES-256-GCM via EncryptedSharedPreferences
+ * - Biometric: Same storage, but guarded by a JS-level biometric check
+ * - StrongBox: Hardware-backed keys on supported devices (API 28+)
+ *
+ * Note: Biometric authentication is handled at the JS layer to allow
+ * unified prompts and fallback behavior across platforms.
  */
 @DoNotStrip
 class SensitiveInfo : HybridSensitiveInfoSpec() {
@@ -29,7 +34,7 @@ class SensitiveInfo : HybridSensitiveInfoSpec() {
     private const val STRONGBOX_KEYSTORE_ALIAS = "SensitiveInfoStrongBoxKey"
   }
 
-  // Standard EncryptedSharedPreferences
+  // --- Standard EncryptedSharedPreferences ---
   private val standardPrefs by lazy {
     val masterKeyAlias = MasterKeys.getOrCreate(MasterKeys.AES256_GCM_SPEC)
 
@@ -42,7 +47,7 @@ class SensitiveInfo : HybridSensitiveInfoSpec() {
     )
   }
 
-  // StrongBox EncryptedSharedPreferences (API 28+)
+  // --- StrongBox EncryptedSharedPreferences (API 28+) ---
   private val strongBoxPrefs by lazy {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && isStrongBoxAvailableInternal()) {
       try {
@@ -74,7 +79,8 @@ class SensitiveInfo : HybridSensitiveInfoSpec() {
     }
   }
 
-  // Biometric storage uses standard encryption but requires JS-level authentication
+  // --- Biometric ---
+  // Uses standard encryption but requires JS-level biometric authentication
   private val biometricPrefs by lazy {
     val masterKeyAlias = MasterKeys.getOrCreate(MasterKeys.AES256_GCM_SPEC)
 
@@ -87,6 +93,10 @@ class SensitiveInfo : HybridSensitiveInfoSpec() {
     )
   }
 
+  /**
+   * Map a requested security level to the appropriate SharedPreferences.
+   * Applies graceful fallbacks (biometric -> strongbox -> standard).
+   */
   private fun getPreferencesForSecurityLevel(securityLevel: SecurityLevel?): android.content.SharedPreferences {
     return when (securityLevel) {
       SecurityLevel.BIOMETRIC -> {
@@ -115,51 +125,69 @@ class SensitiveInfo : HybridSensitiveInfoSpec() {
     }
   }
 
+  /**
+   * Get an item by key at the requested security level.
+   */
   @DoNotStrip
   override fun getItem(key: String, options: StorageOptions?): Promise<String?> = Promise.async {
     val securityLevel = options?.securityLevel
     val prefs = getPreferencesForSecurityLevel(securityLevel)
     prefs.getString(key, null)
   }
 
+  /**
+   * Store a key/value pair at the requested security level.
+   */
   @DoNotStrip
   override fun setItem(key: String, value: String, options: StorageOptions?): Promise<Unit> = Promise.async {
     val securityLevel = options?.securityLevel
     val prefs = getPreferencesForSecurityLevel(securityLevel)
     prefs.edit().putString(key, value).apply()
   }
 
+  /**
+   * Remove a single item.
+   */
   @DoNotStrip
   override fun removeItem(key: String, options: StorageOptions?): Promise<Unit> = Promise.async {
     val securityLevel = options?.securityLevel
     val prefs = getPreferencesForSecurityLevel(securityLevel)
     prefs.edit().remove(key).apply()
   }
 
+  /**
+   * Return all items for the selected backing store.
+   */
   @DoNotStrip
   override fun getAllItems(options: StorageOptions?): Promise<Map<String, String>> = Promise.async {
     val securityLevel = options?.securityLevel
     val prefs = getPreferencesForSecurityLevel(securityLevel)
     prefs.all.mapValues { it.value as? String ?: "" }
   }
 
+  /**
+   * Clear all items for the selected backing store.
+   */
   @DoNotStrip
   override fun clear(options: StorageOptions?): Promise<Unit> = Promise.async {
     val securityLevel = options?.securityLevel
     val prefs = getPreferencesForSecurityLevel(securityLevel)
     prefs.edit().clear().apply()
   }
 
+  /** Check if biometric authentication is available on this device. */
   @DoNotStrip
   override fun isBiometricAvailable(): Promise<Boolean> = Promise.async {
     isBiometricAvailableInternal()
   }
 
+  /** Check if StrongBox hardware security is available. */
   @DoNotStrip
   override fun isStrongBoxAvailable(): Promise<Boolean> = Promise.async {
     isStrongBoxAvailableInternal()
   }
 
+  /** Internal: Detect biometric availability via BiometricManager. */
   private fun isBiometricAvailableInternal(): Boolean {
     val biometricManager = BiometricManager.from(context)
     return when (biometricManager.canAuthenticate(BiometricManager.Authenticators.BIOMETRIC_STRONG)) {
@@ -168,6 +196,7 @@ class SensitiveInfo : HybridSensitiveInfoSpec() {
     }
   }
 
+  /** Internal: Probe StrongBox by generating a temporary key. */
   private fun isStrongBoxAvailableInternal(): Boolean {
     return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
       try {

example/android/app/build.gradle

@@ -7,49 +7,6 @@ apply plugin: "com.facebook.react"
  * By default you don't need to apply any configuration, just uncomment the lines you need.
  */
 react {
-    /* Folders */
-    //   The root of your project, i.e. where "package.json" lives. Default is '../..'
-    // root = file("../../")
-    //   The folder where the react-native NPM package is. Default is ../../node_modules/react-native
-    // reactNativeDir = file("../../node_modules/react-native")
-    //   The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
-    // codegenDir = file("../../node_modules/@react-native/codegen")
-    //   The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
-    // cliFile = file("../../node_modules/react-native/cli.js")
-
-    /* Variants */
-    //   The list of variants to that are debuggable. For those we're going to
-    //   skip the bundling of the JS bundle and the assets. By default is just 'debug'.
-    //   If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants.
-    // debuggableVariants = ["liteDebug", "prodDebug"]
-
-    /* Bundling */
-    //   A list containing the node command and its flags. Default is just 'node'.
-    // nodeExecutableAndArgs = ["node"]
-    //
-    //   The command to run when bundling. By default is 'bundle'
-    // bundleCommand = "ram-bundle"
-    //
-    //   The path to the CLI configuration file. Default is empty.
-    // bundleConfig = file(../rn-cli.config.js)
-    //
-    //   The name of the generated asset file containing your JS bundle
-    // bundleAssetName = "MyApplication.android.bundle"
-    //
-    //   The entry file for bundle generation. Default is 'index.android.js' or 'index.js'
-    // entryFile = file("../js/MyApplication.android.js")
-    //
-    //   A list of extra flags to pass to the 'bundle' commands.
-    //   See https://github.com/react-native-community/cli/blob/main/docs/commands.md#bundle
-    // extraPackagerArgs = []
-
-    /* Hermes Commands */
-    //   The hermes compiler command to run. By default it is 'hermesc'
-    // hermesCommand = "$rootDir/my-custom-hermesc/bin/hermesc"
-    //
-    //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
-    // hermesFlags = ["-O", "-output-source-map"]
-
     /* Autolinking */
     autolinkLibrariesWithApp()
 }

example/android/app/src/main/java/sensitiveinfo/example/MainApplication.kt

@@ -6,11 +6,9 @@ import com.facebook.react.ReactApplication
 import com.facebook.react.ReactHost
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactPackage
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
+import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
 import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.defaults.DefaultReactNativeHost
-import com.facebook.react.soloader.OpenSourceMergedSoMapping
-import com.facebook.soloader.SoLoader
 
 class MainApplication : Application(), ReactApplication {
 
@@ -35,10 +33,7 @@ class MainApplication : Application(), ReactApplication {
 
   override fun onCreate() {
     super.onCreate()
-    SoLoader.init(this, OpenSourceMergedSoMapping)
-    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-      // If you opted-in for the New Architecture, we load the native entry point for this app.
-      load()
-    }
+
+    loadReactNative(this)
   }
 }

example/android/build.gradle

@@ -1,11 +1,11 @@
 buildscript {
     ext {
-        buildToolsVersion = "35.0.0"
+        buildToolsVersion = "36.0.0"
         minSdkVersion = 24
-        compileSdkVersion = 35
-        targetSdkVersion = 35
+        compileSdkVersion = 36
+        targetSdkVersion = 36
         ndkVersion = "27.1.12297006"
-        kotlinVersion = "2.0.21"
+        kotlinVersion = "2.1.20"
     }
     repositories {
         google()

example/android/gradle.properties

@@ -37,3 +37,8 @@ newArchEnabled=true
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.
 hermesEnabled=true
+
+# Use this property to enable edge-to-edge display support.
+# This allows your app to draw behind system bars for an immersive UI.
+# Note: Only works with ReactActivity and should not be used with custom Activity.
+edgeToEdgeEnabled=true

example/android/gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME