detectErrorType

Author: mfazekas

android/src/main/java/com/margelo/nitro/rive/HybridRiveView.kt

@@ -10,6 +10,7 @@ import com.rive.RiveReactNativeView
 import com.rive.ViewConfiguration
 import app.rive.runtime.kotlin.core.Fit as RiveFit
 import app.rive.runtime.kotlin.core.Alignment as RiveAlignment
+import app.rive.runtime.kotlin.core.errors.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
@@ -225,16 +226,14 @@ class HybridRiveView(val context: ThemedReactContext) : HybridRiveViewSpec() {
   }
 
   private fun detectErrorType(exception: Exception): RiveErrorType {
-    val errorMessage = exception.message?.lowercase() ?: ""
-
-    return when {
-      errorMessage.contains("artboard") -> RiveErrorType.INCORRECTARTBOARDNAME
-      errorMessage.contains("state machine") -> RiveErrorType.INCORRECTSTATEMACHINENAME
-      errorMessage.contains("animation") -> RiveErrorType.INCORRECTANIMATIONNAME
-      errorMessage.contains("data binding") || errorMessage.contains("databinding") -> RiveErrorType.DATABINDINGERROR
-      errorMessage.contains("text run") -> RiveErrorType.TEXTRUNNOTFOUNDERROR
-      errorMessage.contains("file") || errorMessage.contains("not found") -> RiveErrorType.FILENOTFOUND
-      errorMessage.contains("malformed") || errorMessage.contains("corrupt") -> RiveErrorType.MALFORMEDFILE
+    return when (exception) {
+      is ArtboardException -> RiveErrorType.INCORRECTARTBOARDNAME
+      is StateMachineException -> RiveErrorType.INCORRECTSTATEMACHINENAME
+      is AnimationException -> RiveErrorType.INCORRECTANIMATIONNAME
+      is MalformedFileException -> RiveErrorType.MALFORMEDFILE
+      is StateMachineInputException -> RiveErrorType.INCORRECTANIMATIONNAME
+      is TextValueRunException -> RiveErrorType.TEXTRUNNOTFOUNDERROR
+      is ViewModelException -> RiveErrorType.DATABINDINGERROR
       else -> RiveErrorType.UNKNOWN
     }
   }

ios/HybridRiveView.swift

@@ -199,30 +199,36 @@ extension HybridRiveView {
 
       let riveError = RiveError(
         message: errorMessage,
-        type: errorType,
+        type: errorType
       )
       onError(riveError)
     }
   }
 
   private func detectErrorType(_ error: Error) -> RiveErrorType {
-    let errorDescription = String(describing: error).lowercased()
+    let nsError = error as NSError
+    guard let errorName = nsError.userInfo["name"] as? String else {
+      return .unknown
+    }
 
-    if errorDescription.contains("artboard") {
+    switch errorName {
+    case "NoArtboardFound":
       return .incorrectartboardname
-    } else if errorDescription.contains("state machine") {
+    case "NoStateMachineFound":
       return .incorrectstatemachinename
-    } else if errorDescription.contains("animation") {
+    case "NoAnimationFound":
       return .incorrectanimationname
-    } else if errorDescription.contains("data binding") || errorDescription.contains("databinding") {
-      return .databindingerror
-    } else if errorDescription.contains("text run") {
-      return .textrunnotfounderror
-    } else if errorDescription.contains("file") || errorDescription.contains("not found") {
-      return .filenotfound
-    } else if errorDescription.contains("malformed") || errorDescription.contains("corrupt") {
+    case "Malformed":
       return .malformedfile
-    } else {
+    case "FileNotFound":
+      return .filenotfound
+    case "NoStateMachineInputFound":
+      return .incorrectanimationname
+    case "TextRunNotFoundError":
+      return .textrunnotfounderror
+    case "DataBindingError":
+      return .databindingerror
+    default:
       return .unknown
     }
   }