Fixed crashes on callbacks from JS

xzeror · xzeror · commit 3b57d6ca60f8 · 2013-04-03T23:41:08.000+04:00
Blocks not copied when saved in lists inside bridge. That leads to
crash on callback from JS because callback block doesn't exist at that
moment.
diff --git a/WebViewJavascriptBridge.podspec b/WebViewJavascriptBridge.podspec
@@ -0,0 +1,14 @@
+Pod::Spec.new do |s|
+  s.name         = "WebViewJavascriptBridge"
+  s.version      = "2.1.1"
+  s.summary      = "A standalone iOS class for sending messages to and from javascript in a UIWebView."
+  s.homepage     = "http://github.com/marcuswestin/WebViewJavascriptBridge"
+  s.license      = { :type => "MIT", :file => "LICENSE" }
+  s.author       = { "marcuswestin" => "marcus.westin@gmail.com" }
+  s.source       = { :git => "https://github.com/marcuswestin/WebViewJavascriptBridge.git", :tag => "2.1.1" }
+  s.platform     = :ios, "4.2"
+  s.source_files = "WebViewJavascriptBridge/WebViewJavascriptBridge.{h,m}"
+  s.resource     = "WebViewJavascriptBridge/WebViewJavascriptBridge.js.txt"
+  s.framework    = "UIKit"
+  s.dependency     "JSONKit"
+end
diff --git a/WebViewJavascriptBridge/WebViewJavascriptBridge.m b/WebViewJavascriptBridge/WebViewJavascriptBridge.m
@@ -69,7 +69,7 @@ - (void)callHandler:(NSString *)handlerName data:(id)data responseCallback:(WVJB
 }
 
 - (void)registerHandler:(NSString *)handlerName handler:(WVJBHandler)handler {
-    [self.messageHandlers setObject:handler forKey:handlerName];
+    [self.messageHandlers setObject:[handler copy] forKey:handlerName];
 }
 
 - (void)reset {
@@ -83,7 +83,7 @@ - (void)_sendData:(NSDictionary *)data responseCallback:(WVJBResponseCallback)re
     
     if (responseCallback) {
         NSString* callbackId = [NSString stringWithFormat:@"objc_cb_%d", ++_uniqueId];
-        [self.responseCallbacks setObject:responseCallback forKey:callbackId];
+        [self.responseCallbacks setObject:[responseCallback copy] forKey:callbackId];
         [message setObject:callbackId forKey:@"callbackId"];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ - (void)callHandler:(NSString *)handlerName data:(id)data responseCallback:(WVJB`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`- (void)registerHandler:(NSString *)handlerName handler:(WVJBHandler)handler {`
`72`		`- [self.messageHandlers setObject:handler forKey:handlerName];`
	`72`	`+ [self.messageHandlers setObject:[handler copy] forKey:handlerName];`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`- (void)reset {`
`@@ -83,7 +83,7 @@ - (void)_sendData:(NSDictionary *)data responseCallback:(WVJBResponseCallback)re`
`83`	`83`
`84`	`84`	`if (responseCallback) {`
`85`	`85`	`NSString* callbackId = [NSString stringWithFormat:@"objc_cb_%d", ++_uniqueId];`
`86`		`- [self.responseCallbacks setObject:responseCallback forKey:callbackId];`
	`86`	`+ [self.responseCallbacks setObject:[responseCallback copy] forKey:callbackId];`
`87`	`87`	`[message setObject:callbackId forKey:@"callbackId"];`
`88`	`88`	`}`
`89`	`89`