Skip to content

Commit 1a7941b

Browse files
Improve error mapper
1 parent 950be4d commit 1a7941b

File tree

1 file changed

+2
-7
lines changed
  • android/src/main/java/com/ionic/plugin/android/capacitor/core/actions

1 file changed

+2
-7
lines changed

android/src/main/java/com/ionic/plugin/android/capacitor/core/actions/CallContext.kt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import com.ionic.plugin.android.capacitor.core.WrapperDelegate
55
import com.ionic.plugin.android.capacitor.core.toJSObject
66
import com.ionic.plugin.android.core.actions.CallContext
77
import com.ionic.plugin.core.PluginException
8-
import com.ionic.plugin.core.PluginExceptionBase
98
import com.ionic.plugin.core.actions.Mappers
109
import com.spryrocks.kson.JsonArray
1110
import com.spryrocks.kson.JsonObject
@@ -68,16 +67,12 @@ class CallContext(
6867
}
6968

7069
override fun error(error: Throwable?, finish: Boolean) {
71-
val exception: Exception? = when (error) {
72-
is Exception -> error
73-
is Throwable -> Exception(error)
74-
else -> null
75-
}
70+
val exception = error?.let(mappers.errorMapper::map)
7671

7772
val defaultMessage = "Unknown error"
7873

7974
val message = exception?.message ?: defaultMessage
80-
val data = (exception as? PluginExceptionBase)?.let(mappers.errorMapper::mapToJson)
75+
val data = exception?.let(mappers.errorMapper::mapToJson)
8176

8277
reject(finish, message, data)
8378
}

0 commit comments

Comments
 (0)