fix(ios): handle when throwing new obj-c proxy error without subreason

tidev · Dec 4, 2019 · 3e2934b · 3e2934b
1 parent e56abfc
commit 3e2934b
Showing 1 changed file with 22 additions and 8 deletions.
diff --git a/iphone/TitaniumKit/TitaniumKit/Sources/API/ObjcProxy.m b/iphone/TitaniumKit/TitaniumKit/Sources/API/ObjcProxy.m
@@ -16,10 +16,17 @@ @implementation ObjcProxy
 + (JSValue *)createError:(NSString *)reason subreason:(NSString *)subreason location:(NSString *)location inContext:(JSContext *)context
 {
   NSString *exceptionName = @"org.appcelerator";
-  NSDictionary *details = @{
-    kTiExceptionSubreason : subreason,
-    kTiExceptionLocation : location
-  };
+  NSDictionary *details;
+  if (subreason != nil) {
+    details = @{
+      kTiExceptionSubreason : subreason,
+      kTiExceptionLocation : location
+    };
+  } else {
+    details = @{
+      kTiExceptionLocation : location
+    };
+  }
   NSException *exc = [NSException exceptionWithName:exceptionName reason:reason userInfo:details];
   JSGlobalContextRef jsContext = [context JSGlobalContextRef];
   JSValueRef jsValueRef = TiBindingTiValueFromNSObject(jsContext, exc);
@@ -29,10 +36,17 @@ + (JSValue *)createError:(NSString *)reason subreason:(NSString *)subreason loca
 - (JSValue *)createError:(NSString *)reason subreason:(NSString *)subreason location:(NSString *)location inContext:(JSContext *)context
 {
   NSString *exceptionName = [@"org.appcelerator." stringByAppendingString:NSStringFromClass([self class])];
-  NSDictionary *details = @{
-    kTiExceptionSubreason : subreason,
-    kTiExceptionLocation : location
-  };
+  NSDictionary *details;
+  if (subreason != nil) {
+    details = @{
+      kTiExceptionSubreason : subreason,
+      kTiExceptionLocation : location
+    };
+  } else {
+    details = @{
+      kTiExceptionLocation : location
+    };
+  }
   NSException *exc = [NSException exceptionWithName:exceptionName reason:reason userInfo:details];
   JSGlobalContextRef jsContext = [context JSGlobalContextRef];
   JSValueRef jsValueRef = TiBindingTiValueFromNSObject(jsContext, exc);