23fd5bd · jsaddle · git.iko.soy

git.iko.soy/jsaddle

on master help sign in

Change order of remote notification callback args

23fd5bdAli Abrar9 years ago

jsaddle-wkwebview/cbits-uikit/AppDelegate.m+2−2

@@ -2,7 +2,7 @@

2#import "ViewController.h"

3#import <UserNotifications/UserNotifications.h>

5−extern void didRegisterForRemoteNotificationsWithDeviceTokenCallback(HsStablePtr, const char * _Nonnull);

5+extern void didRegisterForRemoteNotificationsWithDeviceTokenCallback(const char * _Nonnull, HsStablePtr);

7@interface AppDelegate ()

@@ -57,7 +57,7 @@ HsStablePtr globalDeviceTokenHook = 0;

58- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {

59 NSString *deviceTokenString = [deviceToken base64EncodedStringWithOptions: 0];

60− didRegisterForRemoteNotificationsWithDeviceTokenCallback(globalDeviceTokenHook, [deviceTokenString UTF8String]);

60+ didRegisterForRemoteNotificationsWithDeviceTokenCallback([deviceTokenString UTF8String], globalDeviceTokenHook);

61}

63- (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error {

jsaddle-wkwebview/src/Language/Javascript/JSaddle/WKWebView/Internal.hs+3−3

@@ -29,7 +29,7 @@ newtype WKWebView = WKWebView (Ptr WKWebView)

29foreign export ccall jsaddleStart :: StablePtr (IO ()) -> IO ()

30foreign export ccall jsaddleResult :: StablePtr (Results -> IO ()) -> CString -> IO ()

31foreign export ccall withWebView :: WKWebView -> StablePtr (WKWebView -> IO ()) -> IO ()

32−foreign export ccall didRegisterForRemoteNotificationsWithDeviceTokenCallback :: StablePtr (CString -> IO ()) -> CString -> IO ()

32+foreign export ccall didRegisterForRemoteNotificationsWithDeviceTokenCallback :: CString -> StablePtr (CString -> IO ()) -> IO ()

33foreign import ccall addJSaddleHandler :: WKWebView -> StablePtr (IO ()) -> StablePtr (Results -> IO ()) -> IO ()

34foreign import ccall loadHTMLString :: WKWebView -> CString -> IO ()

35foreign import ccall loadBundleFile :: WKWebView -> CString -> CString -> IO ()

@@ -87,8 +87,8 @@ withWebView webView ptrF = do

87 f webView

89-- | A base64 encoded device token

90−didRegisterForRemoteNotificationsWithDeviceTokenCallback :: StablePtr (CString -> IO ()) -> CString -> IO ()

90+didRegisterForRemoteNotificationsWithDeviceTokenCallback :: CString -> StablePtr (CString -> IO ()) -> IO ()

91−didRegisterForRemoteNotificationsWithDeviceTokenCallback f token = do

91+didRegisterForRemoteNotificationsWithDeviceTokenCallback token f = do

92 f' <- deRefStablePtr f

93 f' token