@onekeyfe/react-native-device-utils 1.1.17 → 1.1.19

package/android/src/main/java/com/margelo/nitro/reactnativedeviceutils/ReactNativeDeviceUtils.kt

@@ -6,6 +6,7 @@ import android.content.pm.PackageManager
 import android.graphics.Color
 import android.graphics.Rect
 import android.os.Build
+import android.util.Log
 import androidx.preference.PreferenceManager
 import androidx.core.content.ContextCompat
 import androidx.core.util.Consumer
@@ -220,7 +221,7 @@ class ReactNativeDeviceUtils : HybridReactNativeDeviceUtilsSpec(), LifecycleEven
   private var layoutInfoConsumer: Consumer<WindowLayoutInfo>? = null
   private var windowInfoTracker: WindowInfoTracker? = null
   private var callbackAdapter: WindowInfoTrackerCallbackAdapter? = null
-  private var spanningChangedListeners: MutableList<Listener> = CopyOnWriteArrayList()
+  private val spanningChangedListeners: CopyOnWriteArrayList<Listener> = CopyOnWriteArrayList()
   private var isObservingLayoutChanges = false
   private var nextListenerId = 0.0
   private var isDualScreenDeviceDetected: Boolean? = null
@@ -697,9 +698,15 @@ class ReactNativeDeviceUtils : HybridReactNativeDeviceUtilsSpec(), LifecycleEven
   }
 
   fun callSpanningChangedListeners(isSpanning: Boolean) {
-    // Create a snapshot to avoid ConcurrentModificationException when listeners modify the list during callbacks
-    for (listener in spanningChangedListeners.toList()) {
-      listener.callback(isSpanning)
+    // CopyOnWriteArrayList provides snapshot-based iteration that never throws
+    // ConcurrentModificationException, even if listeners are added/removed during iteration.
+    // Do NOT call .toList() here as it creates a regular ArrayList that is not thread-safe.
+    for (listener in spanningChangedListeners) {
+      try {
+        listener.callback(isSpanning)
+      } catch (e: Exception) {
+        Log.e("OneKey", "Error in spanning listener callback", e)
+      }
     }
   }
 
@@ -786,17 +793,22 @@ class ReactNativeDeviceUtils : HybridReactNativeDeviceUtilsSpec(), LifecycleEven
   
   // MARK: - User Interface Style
 
-  override fun setUserInterfaceStyle(style: String) {
+  override fun setUserInterfaceStyle(style: UserInterfaceStyle) {
+    val styleString = when (style) {
+      UserInterfaceStyle.LIGHT -> "light"
+      UserInterfaceStyle.DARK -> "dark"
+      UserInterfaceStyle.UNSPECIFIED -> "unspecified"
+    }
     try {
       val context = NitroModules.applicationContext
       if (context != null) {
         val prefs = PreferenceManager.getDefaultSharedPreferences(context)
-        prefs.edit().putString(PREF_KEY_UI_STYLE, style).apply()
+        prefs.edit().putString(PREF_KEY_UI_STYLE, styleString).apply()
       }
     } catch (e: Exception) {
       // Ignore save errors
     }
-    applyUserInterfaceStyle(style)
+    applyUserInterfaceStyle(styleString)
   }
 
   // MARK: - Background Color

package/ios/ReactNativeDeviceUtils.swift

@@ -69,9 +69,9 @@ class ReactNativeDeviceUtils: HybridReactNativeDeviceUtilsSpec {
     }
     
     
-    public func setUserInterfaceStyle(style: String) throws -> Void {
-        UserDefaults.standard.set(style, forKey: ReactNativeDeviceUtils.userInterfaceStyleKey)
-        applyUserInterfaceStyle(style)
+    public func setUserInterfaceStyle(style: UserInterfaceStyle) throws -> Void {
+        UserDefaults.standard.set(style.stringValue, forKey: ReactNativeDeviceUtils.userInterfaceStyleKey)
+        applyUserInterfaceStyle(style.stringValue)
     }
 
     public func changeBackgroundColor(r: Double, g: Double, b: Double, a: Double) throws -> Void {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-device-utils",
-  "version": "1.1.17",
+  "version": "1.1.19",
   "description": "react-native-device-utils",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",