Merge pull request #8 from logicwind/crash_hot_fix

Crash hot fix To Main

Author: bhavesh-lw

android/src/main/java/com/folddetection/FoldDetectionModule.kt

@@ -12,25 +12,52 @@ import androidx.window.java.layout.WindowInfoTrackerCallbackAdapter
 import androidx.window.layout.FoldingFeature
 import androidx.window.layout.WindowInfoTracker
 import androidx.window.layout.WindowLayoutInfo
-import com.facebook.react.bridge.Promise
 import java.util.concurrent.Executors
 
-class FoldDetectionModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
-  private var windowInfoTracker: WindowInfoTrackerCallbackAdapter = WindowInfoTrackerCallbackAdapter(WindowInfoTracker.getOrCreate(reactContext))
+class FoldDetectionModule(reactContext: ReactApplicationContext) :
+  ReactContextBaseJavaModule(reactContext) {
+  private var windowInfoTracker: WindowInfoTrackerCallbackAdapter? = null
   private val layoutStateChangeCallback = LayoutStateChangeCallback()
 
+  init {
+    val packageManager = reactContext.packageManager
+    if (packageManager.hasSystemFeature(PackageManager.FEATURE_SENSOR_HINGE_ANGLE)) {
+      windowInfoTracker =
+        WindowInfoTrackerCallbackAdapter(WindowInfoTracker.getOrCreate(reactContext))
+    }
+  }
+
   override fun getName(): String {
     return "FoldingFeature"
   }
 
   @ReactMethod
   fun startListening() {
-    windowInfoTracker.addWindowLayoutInfoListener(currentActivity!!, Executors.newSingleThreadExecutor(), layoutStateChangeCallback)
+    val activity = currentActivity
+    try {
+      if (activity != null && windowInfoTracker != null) {
+        windowInfoTracker!!.addWindowLayoutInfoListener(
+          activity,
+          Executors.newSingleThreadExecutor(),
+          layoutStateChangeCallback
+        )
+      } else {
+        sendErrorEvent("Activity is null or device does not support fold feature in startListening")
+      }
+    } catch (e: Exception) {
+      sendErrorEvent("Error On startListening")
+    }
   }
 
   @ReactMethod
   fun stopListening() {
-    windowInfoTracker.removeWindowLayoutInfoListener(layoutStateChangeCallback)
+    try {
+      if (windowInfoTracker != null) {
+        windowInfoTracker!!.removeWindowLayoutInfoListener(layoutStateChangeCallback)
+      }
+    } catch (e: Exception) {
+      sendErrorEvent("Error On stopListening")
+    }
   }
 
   inner class LayoutStateChangeCallback : Consumer<WindowLayoutInfo> {
@@ -40,7 +67,8 @@ class FoldDetectionModule(reactContext: ReactApplicationContext) : ReactContextB
       try {
         val displayFeaturesList = newLayoutInfo.displayFeatures
         val packageManager = reactApplicationContext.packageManager
-        val featureSupported = packageManager.hasSystemFeature(PackageManager.FEATURE_SENSOR_HINGE_ANGLE)
+        val featureSupported =
+          packageManager.hasSystemFeature(PackageManager.FEATURE_SENSOR_HINGE_ANGLE)
 
         if (displayFeaturesList.isNotEmpty()) {
           val feature = displayFeaturesList[0] // Assuming there's only one feature
@@ -53,7 +81,7 @@ class FoldDetectionModule(reactContext: ReactApplicationContext) : ReactContextB
             featureObject.putString("orientation", foldingFeature.orientation.toString())
             featureObject.putBoolean("isSeparating", foldingFeature.isSeparating)
             featureObject.putString("occlusionType", foldingFeature.occlusionType.toString())
-            featureObject.putBoolean("isFoldSupported",featureSupported)
+            featureObject.putBoolean("isFoldSupported", featureSupported)
 
             // Parse and include detailed bounds information
             val bounds = parseBoundsString(foldingFeature.bounds.toString())
@@ -89,9 +117,20 @@ class FoldDetectionModule(reactContext: ReactApplicationContext) : ReactContextB
       return bounds
     }
   }
-  private fun sendEvent(reactContext: ReactApplicationContext, eventName: String, params: WritableMap) {
+
+  private fun sendEvent(
+    reactContext: ReactApplicationContext,
+    eventName: String,
+    params: WritableMap
+  ) {
     reactContext
       .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
       .emit(eventName, params)
   }
+
+  private fun sendErrorEvent(errorMessage: String) {
+    val event: WritableMap = Arguments.createMap()
+    event.putString("error", errorMessage)
+    sendEvent(reactApplicationContext, "onError", event)
+  }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logicwind/react-native-fold-detection",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "The purpose of the package is to provide details regarding the Android folding capability.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

src/context/FoldingFeatureContext.tsx

@@ -117,8 +117,15 @@ const useProvideFunc = (): FoldingFeatureContextProps => {
       }
     );
 
+    const errorSubscription = eventEmitter.addListener('onError', (event) => {
+      if (event?.error) {
+        console.log('FoldingFeature', event.error);
+      }
+    });
+
     return () => {
       layoutSubscription.remove();
+      errorSubscription.remove();
     };
   }, []);