23fd5bd · jsaddle · git.iko.soy

git.iko.soy/jsaddle

Change order of remote notification callback args

commit23fd5bdb204f9c3d7e6308b2e6b3460715aaf65a authorAli Abrar <aliabrar@gmail.com> dateSun 7 May 2017, 23:04 (9 years ago) parent978645f

2 files changed+5−5

unifiedsplit

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

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

22#import "ViewController.h"

33#import <UserNotifications/UserNotifications.h>

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

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

77@interface AppDelegate ()

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

5757

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

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

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

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

6161}

6262

6363- (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)

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

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

3131foreign 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 ()

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

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

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

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

8787 f webView

8888

8989-- | A base64 encoded device token

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

91−didRegisterForRemoteNotificationsWithDeviceTokenCallback f token = do

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

91+didRegisterForRemoteNotificationsWithDeviceTokenCallback token f = do

9292 f' <- deRefStablePtr f

9393 f' token

9494