Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 0 additions & 39 deletions java/systems/obsidian/LocalFirebaseMessagingService.java

This file was deleted.

12 changes: 0 additions & 12 deletions src/Android/HaskellActivity.hsc
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ data ActivityCallbacks = ActivityCallbacks
, _activityCallbacks_onRestart :: IO ()
, _activityCallbacks_onBackPressed :: IO ()
, _activityCallbacks_onNewIntent :: String -> String -> IO ()
, _activityCallbacks_firebaseInstanceIdServiceSendRegistrationToServer :: String -> IO ()
}

instance Default ActivityCallbacks where
Expand All @@ -107,7 +106,6 @@ instance Default ActivityCallbacks where
, _activityCallbacks_onRestart = return ()
, _activityCallbacks_onBackPressed = return ()
, _activityCallbacks_onNewIntent = \_ _ -> return ()
, _activityCallbacks_firebaseInstanceIdServiceSendRegistrationToServer = \_ -> return ()
}

traceBracket :: String -> IO a -> IO a
Expand All @@ -124,12 +122,9 @@ traceActivityCallbacks ac = ActivityCallbacks
, _activityCallbacks_onRestart = traceBracket "onRestart" $ _activityCallbacks_onRestart ac
, _activityCallbacks_onNewIntent = \x y -> traceBracket "onNewIntent" $ _activityCallbacks_onNewIntent ac x y
, _activityCallbacks_onBackPressed = traceBracket "onBackPressed" $ _activityCallbacks_onBackPressed ac
, _activityCallbacks_firebaseInstanceIdServiceSendRegistrationToServer = \x ->
traceBracket "firebaseInstanceIdServiceSendRegistrationToServer" $ _activityCallbacks_firebaseInstanceIdServiceSendRegistrationToServer ac x
}

foreign import ccall "wrapper" wrapIO :: IO () -> IO (FunPtr (IO ()))
foreign import ccall "wrapper" wrapCStringIO :: (CString -> IO ()) -> IO (FunPtr (CString -> IO ()))
foreign import ccall "wrapper" wrapCStringCStringIO :: (CString -> CString -> IO ()) -> IO (FunPtr (CString -> CString -> IO ()))

activityCallbacksToPtrs :: ActivityCallbacks -> IO ActivityCallbacksPtrs
Expand All @@ -147,10 +142,6 @@ activityCallbacksToPtrs ac = ActivityCallbacksPtrs
b' <- peekCString b
_activityCallbacks_onNewIntent ac a' b'
)
<*> wrapCStringIO (\token -> do
token' <- peekCString token
_activityCallbacks_firebaseInstanceIdServiceSendRegistrationToServer ac token'
)

data ActivityCallbacksPtrs = ActivityCallbacksPtrs
{ _activityCallbacksPtrs_onCreate :: FunPtr (IO ())
Expand All @@ -162,7 +153,6 @@ data ActivityCallbacksPtrs = ActivityCallbacksPtrs
, _activityCallbacksPtrs_onRestart :: FunPtr (IO ())
, _activityCallbacksPtrs_onBackPressed :: FunPtr (IO ())
, _activityCallbacksPtrs_onNewIntent :: FunPtr (CString -> CString -> IO ())
, _activityCallbacksPtrs_firebaseInstanceIdService_sendRegistrationToServer :: FunPtr (CString -> IO ())
}

instance Storable ActivityCallbacksPtrs where
Expand All @@ -178,7 +168,6 @@ instance Storable ActivityCallbacksPtrs where
#{poke ActivityCallbacks, onRestart} p $ _activityCallbacksPtrs_onRestart ac
#{poke ActivityCallbacks, onBackPressed} p $ _activityCallbacksPtrs_onBackPressed ac
#{poke ActivityCallbacks, onNewIntent} p $ _activityCallbacksPtrs_onNewIntent ac
#{poke ActivityCallbacks, firebaseInstanceIdService_sendRegistrationToServer} p $ _activityCallbacksPtrs_firebaseInstanceIdService_sendRegistrationToServer ac
peek p = ActivityCallbacksPtrs
<$> #{peek ActivityCallbacks, onCreate} p
<*> #{peek ActivityCallbacks, onStart} p
Expand All @@ -189,4 +178,3 @@ instance Storable ActivityCallbacksPtrs where
<*> #{peek ActivityCallbacks, onRestart} p
<*> #{peek ActivityCallbacks, onBackPressed} p
<*> #{peek ActivityCallbacks, onNewIntent} p
<*> #{peek ActivityCallbacks, firebaseInstanceIdService_sendRegistrationToServer} p