Make v6 backcompatible with v5

Author: marcuswestin

WebViewJavascriptBridge/WebViewJavascriptBridgeBase.h

@@ -7,9 +7,10 @@
 
 #import <Foundation/Foundation.h>
 
-#define kCustomProtocolScheme @"https"
-#define kQueueHasMessage      @"__wvjb_queue_message__"
-#define kBridgeLoaded         @"__bridge_loaded__"
+#define kOldProtocolScheme @"wvjbscheme"
+#define kNewProtocolScheme @"https"
+#define kQueueHasMessage   @"__wvjb_queue_message__"
+#define kBridgeLoaded      @"__bridge_loaded__"
 
 typedef void (^WVJBResponseCallback)(id responseData);
 typedef void (^WVJBHandler)(id data, WVJBResponseCallback responseCallback);

WebViewJavascriptBridge/WebViewJavascriptBridgeBase.m

@@ -123,22 +123,25 @@ - (void)injectJavascriptFile {
 }
 
 - (BOOL)isWebViewJavascriptBridgeURL:(NSURL*)url {
-    if (![[url scheme] isEqualToString:kCustomProtocolScheme]){
+    if (![self isSchemeMatch:url]) {
         return NO;
     }
-    return ([self isBridgeLoadedURL:url] || [self isQueueMessageURL:url]);
+    return [self isBridgeLoadedURL:url] || [self isQueueMessageURL:url];
+}
+
+- (BOOL)isSchemeMatch:(NSURL*)url {
+    NSString* scheme = url.scheme.lowercaseString;
+    return [scheme isEqualToString:kNewProtocolScheme] || [scheme isEqualToString:kOldProtocolScheme];
 }
 
 - (BOOL)isQueueMessageURL:(NSURL*)url {
-    if([[url host] isEqualToString:kQueueHasMessage]){
-        return YES;
-    } else {
-        return NO;
-    }
+    NSString* host = url.host.lowercaseString;
+    return [self isSchemeMatch:url] && [host isEqualToString:kQueueHasMessage];
 }
 
 - (BOOL)isBridgeLoadedURL:(NSURL*)url {
-    return ([[url scheme] isEqualToString:kCustomProtocolScheme] && [[url host] isEqualToString:kBridgeLoaded]);
+    NSString* host = url.host.lowercaseString;
+    return [self isSchemeMatch:url] && [host isEqualToString:kBridgeLoaded];
 }
 
 - (void)logUnkownMessage:(NSURL*)url {