Dev: fix error handling

Author: andriydruk

compiler/src/main/java/com/readdle/codegen/SwiftBlockDescriptor.java

@@ -207,10 +207,18 @@ File generateCode() throws IOException {
 
         swiftWriter.emitStatement("if let throwable = JNI.ExceptionCheck() {");
         if (isThrown) {
-            swiftWriter.emitStatement("throw Error.from(javaObject: throwable)");
+            swiftWriter.emitStatement("if let error = try? NSError.from(javaObject: throwable) {");
+            swiftWriter.emitStatement("throw error");
+            swiftWriter.emitStatement("} else {");
+            swiftWriter.emitStatement("fatalError(\"JavaException\")");
+            swiftWriter.emitStatement("}");
         }
         else {
+            swiftWriter.emitStatement("if let error = try? NSError.from(javaObject: throwable) {");
+            swiftWriter.emitStatement("fatalError(\"JavaException: \\(error) \")");
+            swiftWriter.emitStatement("} else {");
             swiftWriter.emitStatement("fatalError(\"JavaException\")");
+            swiftWriter.emitStatement("}");
         }
         swiftWriter.emitStatement("}");
 

compiler/src/main/java/com/readdle/codegen/SwiftCallbackFuncDescriptor.java

@@ -195,10 +195,18 @@ void generateCode(SwiftWriter swiftWriter, String javaFullName, String swiftType
             swiftWriter.emit(") else {");
             swiftWriter.emitStatement("if let throwable = JNI.ExceptionCheck() {");
             if (isThrown) {
-                swiftWriter.emitStatement("throw Error.from(javaObject: throwable)");
+                swiftWriter.emitStatement("if let error = try? NSError.from(javaObject: throwable) {");
+                swiftWriter.emitStatement("throw error");
+                swiftWriter.emitStatement("} else {");
+                swiftWriter.emitStatement("fatalError(\"JavaException\")");
+                swiftWriter.emitStatement("}");
             }
             else {
-                swiftWriter.emitStatement("fatalError(\"Don't support exception here!\")");
+                swiftWriter.emitStatement("if let error = try? NSError.from(javaObject: throwable) {");
+                swiftWriter.emitStatement("fatalError(\"JavaException: \\(error) \")");
+                swiftWriter.emitStatement("} else {");
+                swiftWriter.emitStatement("fatalError(\"JavaException\")");
+                swiftWriter.emitStatement("}");
             }
             swiftWriter.emitStatement("} else {");
             if (isReturnTypeOptional) {
@@ -215,10 +223,18 @@ void generateCode(SwiftWriter swiftWriter, String javaFullName, String swiftType
 
             swiftWriter.emitStatement("if let throwable = JNI.ExceptionCheck() {");
             if (isThrown) {
-                swiftWriter.emitStatement("throw Error.from(javaObject: throwable)");
+                swiftWriter.emitStatement("if let error = try? NSError.from(javaObject: throwable) {");
+                swiftWriter.emitStatement("throw error");
+                swiftWriter.emitStatement("} else {");
+                swiftWriter.emitStatement("fatalError(\"JavaException\")");
+                swiftWriter.emitStatement("}");
             }
             else {
+                swiftWriter.emitStatement("if let error = try? NSError.from(javaObject: throwable) {");
+                swiftWriter.emitStatement("fatalError(\"JavaException: \\(error) \")");
+                swiftWriter.emitStatement("} else {");
                 swiftWriter.emitStatement("fatalError(\"JavaException\")");
+                swiftWriter.emitStatement("}");
             }
             swiftWriter.emitStatement("}");
         }