fixed notification issue
This commit is contained in:
+204
@@ -270,5 +270,209 @@
|
|||||||
landmarkType = "7">
|
landmarkType = "7">
|
||||||
</BreakpointContent>
|
</BreakpointContent>
|
||||||
</BreakpointProxy>
|
</BreakpointProxy>
|
||||||
|
<BreakpointProxy
|
||||||
|
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||||
|
<BreakpointContent
|
||||||
|
uuid = "CE91BFE7-EE99-4F09-951F-2D100D8F1086"
|
||||||
|
shouldBeEnabled = "No"
|
||||||
|
ignoreCount = "0"
|
||||||
|
continueAfterRunningActions = "No"
|
||||||
|
filePath = "Club Portal/UI/Main/Club_PortalApp.swift"
|
||||||
|
startingColumnNumber = "9223372036854775807"
|
||||||
|
endingColumnNumber = "9223372036854775807"
|
||||||
|
startingLineNumber = "45"
|
||||||
|
endingLineNumber = "45"
|
||||||
|
landmarkName = "application(_:didFinishLaunchingWithOptions:)"
|
||||||
|
landmarkType = "7">
|
||||||
|
</BreakpointContent>
|
||||||
|
</BreakpointProxy>
|
||||||
|
<BreakpointProxy
|
||||||
|
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||||
|
<BreakpointContent
|
||||||
|
uuid = "5A08F8CD-EEB8-47BD-82AA-B6034DB8D369"
|
||||||
|
shouldBeEnabled = "Yes"
|
||||||
|
ignoreCount = "0"
|
||||||
|
continueAfterRunningActions = "No"
|
||||||
|
filePath = "Club Portal/UI/Main/Club_PortalApp.swift"
|
||||||
|
startingColumnNumber = "9223372036854775807"
|
||||||
|
endingColumnNumber = "9223372036854775807"
|
||||||
|
startingLineNumber = "57"
|
||||||
|
endingLineNumber = "57"
|
||||||
|
landmarkName = "application(_:didRegisterForRemoteNotificationsWithDeviceToken:)"
|
||||||
|
landmarkType = "7">
|
||||||
|
</BreakpointContent>
|
||||||
|
</BreakpointProxy>
|
||||||
|
<BreakpointProxy
|
||||||
|
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||||
|
<BreakpointContent
|
||||||
|
uuid = "A0F45478-2525-4AF7-A775-A9B939D0E4DC"
|
||||||
|
shouldBeEnabled = "No"
|
||||||
|
ignoreCount = "0"
|
||||||
|
continueAfterRunningActions = "No"
|
||||||
|
filePath = "Club Portal/UI/Main/Club_PortalApp.swift"
|
||||||
|
startingColumnNumber = "9223372036854775807"
|
||||||
|
endingColumnNumber = "9223372036854775807"
|
||||||
|
startingLineNumber = "38"
|
||||||
|
endingLineNumber = "38"
|
||||||
|
landmarkName = "application(_:didFinishLaunchingWithOptions:)"
|
||||||
|
landmarkType = "7">
|
||||||
|
</BreakpointContent>
|
||||||
|
</BreakpointProxy>
|
||||||
|
<BreakpointProxy
|
||||||
|
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||||
|
<BreakpointContent
|
||||||
|
uuid = "F2231FF1-BD48-4F72-84AE-CCD474211A6D"
|
||||||
|
shouldBeEnabled = "Yes"
|
||||||
|
ignoreCount = "0"
|
||||||
|
continueAfterRunningActions = "No"
|
||||||
|
filePath = "Club Portal/Services/NotificationService.swift"
|
||||||
|
startingColumnNumber = "9223372036854775807"
|
||||||
|
endingColumnNumber = "9223372036854775807"
|
||||||
|
startingLineNumber = "48"
|
||||||
|
endingLineNumber = "48"
|
||||||
|
landmarkName = "updateFCMToken()"
|
||||||
|
landmarkType = "7">
|
||||||
|
<Locations>
|
||||||
|
<Location
|
||||||
|
uuid = "F2231FF1-BD48-4F72-84AE-CCD474211A6D - 3e7f512971cb26e6"
|
||||||
|
shouldBeEnabled = "Yes"
|
||||||
|
ignoreCount = "0"
|
||||||
|
continueAfterRunningActions = "No"
|
||||||
|
symbolName = "Club_Portal.NotificationService.updateFCMToken() -> ()"
|
||||||
|
moduleName = "Club Portal.debug.dylib"
|
||||||
|
usesParentBreakpointCondition = "Yes"
|
||||||
|
urlString = "file:///Users/umertahir/Projects/MKD/club_portal_ios/Club_portal/Club%20Portal/Club%20Portal/Services/NotificationService.swift"
|
||||||
|
startingColumnNumber = "9223372036854775807"
|
||||||
|
endingColumnNumber = "9223372036854775807"
|
||||||
|
startingLineNumber = "48"
|
||||||
|
endingLineNumber = "48">
|
||||||
|
</Location>
|
||||||
|
<Location
|
||||||
|
uuid = "F2231FF1-BD48-4F72-84AE-CCD474211A6D - 65b044c37d27a5d8"
|
||||||
|
shouldBeEnabled = "Yes"
|
||||||
|
ignoreCount = "0"
|
||||||
|
continueAfterRunningActions = "No"
|
||||||
|
symbolName = "closure #1 @Sendable (Swift.Optional<Swift.String>, Swift.Optional<Swift.Error>) -> () in Club_Portal.NotificationService.updateFCMToken() -> ()"
|
||||||
|
moduleName = "Club Portal.debug.dylib"
|
||||||
|
usesParentBreakpointCondition = "Yes"
|
||||||
|
urlString = "file:///Users/umertahir/Projects/MKD/club_portal_ios/Club_portal/Club%20Portal/Club%20Portal/Services/NotificationService.swift"
|
||||||
|
startingColumnNumber = "9223372036854775807"
|
||||||
|
endingColumnNumber = "9223372036854775807"
|
||||||
|
startingLineNumber = "48"
|
||||||
|
endingLineNumber = "48">
|
||||||
|
</Location>
|
||||||
|
</Locations>
|
||||||
|
</BreakpointContent>
|
||||||
|
</BreakpointProxy>
|
||||||
|
<BreakpointProxy
|
||||||
|
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||||
|
<BreakpointContent
|
||||||
|
uuid = "EDFB851E-2957-4308-B797-2176E0B94AF2"
|
||||||
|
shouldBeEnabled = "Yes"
|
||||||
|
ignoreCount = "0"
|
||||||
|
continueAfterRunningActions = "No"
|
||||||
|
filePath = "Club Portal/Services/NotificationService.swift"
|
||||||
|
startingColumnNumber = "9223372036854775807"
|
||||||
|
endingColumnNumber = "9223372036854775807"
|
||||||
|
startingLineNumber = "69"
|
||||||
|
endingLineNumber = "69"
|
||||||
|
landmarkName = "sendTokenToServer(token:)"
|
||||||
|
landmarkType = "7">
|
||||||
|
</BreakpointContent>
|
||||||
|
</BreakpointProxy>
|
||||||
|
<BreakpointProxy
|
||||||
|
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||||
|
<BreakpointContent
|
||||||
|
uuid = "0AF2C18E-6CC6-4D25-ACEF-774F729E47DB"
|
||||||
|
shouldBeEnabled = "Yes"
|
||||||
|
ignoreCount = "0"
|
||||||
|
continueAfterRunningActions = "No"
|
||||||
|
filePath = "Club Portal/UI/Main/Club_PortalApp.swift"
|
||||||
|
startingColumnNumber = "9223372036854775807"
|
||||||
|
endingColumnNumber = "9223372036854775807"
|
||||||
|
startingLineNumber = "64"
|
||||||
|
endingLineNumber = "64"
|
||||||
|
landmarkName = "application(_:didFailToRegisterForRemoteNotificationsWithError:)"
|
||||||
|
landmarkType = "7">
|
||||||
|
</BreakpointContent>
|
||||||
|
</BreakpointProxy>
|
||||||
|
<BreakpointProxy
|
||||||
|
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||||
|
<BreakpointContent
|
||||||
|
uuid = "F1392675-D61A-4377-8699-6AFFB91B8BF5"
|
||||||
|
shouldBeEnabled = "Yes"
|
||||||
|
ignoreCount = "0"
|
||||||
|
continueAfterRunningActions = "No"
|
||||||
|
filePath = "Club Portal/UI/Main/Club_PortalApp.swift"
|
||||||
|
startingColumnNumber = "9223372036854775807"
|
||||||
|
endingColumnNumber = "9223372036854775807"
|
||||||
|
startingLineNumber = "56"
|
||||||
|
endingLineNumber = "56"
|
||||||
|
landmarkName = "application(_:didRegisterForRemoteNotificationsWithDeviceToken:)"
|
||||||
|
landmarkType = "7">
|
||||||
|
<Locations>
|
||||||
|
<Location
|
||||||
|
uuid = "F1392675-D61A-4377-8699-6AFFB91B8BF5 - 8ea27d02c1b527a1"
|
||||||
|
shouldBeEnabled = "Yes"
|
||||||
|
ignoreCount = "0"
|
||||||
|
continueAfterRunningActions = "No"
|
||||||
|
symbolName = "Club_Portal.AppDelegate.application(_: __C.UIApplication, didRegisterForRemoteNotificationsWithDeviceToken: Foundation.Data) -> ()"
|
||||||
|
moduleName = "Club Portal.debug.dylib"
|
||||||
|
usesParentBreakpointCondition = "Yes"
|
||||||
|
urlString = "file:///Users/umertahir/Projects/MKD/club_portal_ios/Club_portal/Club%20Portal/Club%20Portal/UI/Main/Club_PortalApp.swift"
|
||||||
|
startingColumnNumber = "9223372036854775807"
|
||||||
|
endingColumnNumber = "9223372036854775807"
|
||||||
|
startingLineNumber = "56"
|
||||||
|
endingLineNumber = "56">
|
||||||
|
</Location>
|
||||||
|
<Location
|
||||||
|
uuid = "F1392675-D61A-4377-8699-6AFFB91B8BF5 - fc5b1c4dab9ba9f1"
|
||||||
|
shouldBeEnabled = "Yes"
|
||||||
|
ignoreCount = "0"
|
||||||
|
continueAfterRunningActions = "No"
|
||||||
|
symbolName = "closure #1 (Swift.UInt8) -> Swift.String in Club_Portal.AppDelegate.application(_: __C.UIApplication, didRegisterForRemoteNotificationsWithDeviceToken: Foundation.Data) -> ()"
|
||||||
|
moduleName = "Club Portal.debug.dylib"
|
||||||
|
usesParentBreakpointCondition = "Yes"
|
||||||
|
urlString = "file:///Users/umertahir/Projects/MKD/club_portal_ios/Club_portal/Club%20Portal/Club%20Portal/UI/Main/Club_PortalApp.swift"
|
||||||
|
startingColumnNumber = "9223372036854775807"
|
||||||
|
endingColumnNumber = "9223372036854775807"
|
||||||
|
startingLineNumber = "56"
|
||||||
|
endingLineNumber = "56">
|
||||||
|
</Location>
|
||||||
|
</Locations>
|
||||||
|
</BreakpointContent>
|
||||||
|
</BreakpointProxy>
|
||||||
|
<BreakpointProxy
|
||||||
|
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||||
|
<BreakpointContent
|
||||||
|
uuid = "910DAA47-68F4-4501-B411-C2913C61889A"
|
||||||
|
shouldBeEnabled = "Yes"
|
||||||
|
ignoreCount = "0"
|
||||||
|
continueAfterRunningActions = "No"
|
||||||
|
filePath = "Club Portal/Services/NotificationService.swift"
|
||||||
|
startingColumnNumber = "9223372036854775807"
|
||||||
|
endingColumnNumber = "9223372036854775807"
|
||||||
|
startingLineNumber = "49"
|
||||||
|
endingLineNumber = "49"
|
||||||
|
landmarkName = "updateFCMToken()"
|
||||||
|
landmarkType = "7">
|
||||||
|
</BreakpointContent>
|
||||||
|
</BreakpointProxy>
|
||||||
|
<BreakpointProxy
|
||||||
|
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||||
|
<BreakpointContent
|
||||||
|
uuid = "12FFB533-4887-49FE-842D-0E5CC165CD30"
|
||||||
|
shouldBeEnabled = "Yes"
|
||||||
|
ignoreCount = "0"
|
||||||
|
continueAfterRunningActions = "No"
|
||||||
|
filePath = "Club Portal/Services/NotificationService.swift"
|
||||||
|
startingColumnNumber = "9223372036854775807"
|
||||||
|
endingColumnNumber = "9223372036854775807"
|
||||||
|
startingLineNumber = "54"
|
||||||
|
endingLineNumber = "54"
|
||||||
|
landmarkName = "updateFCMToken()"
|
||||||
|
landmarkType = "7">
|
||||||
|
</BreakpointContent>
|
||||||
|
</BreakpointProxy>
|
||||||
</Breakpoints>
|
</Breakpoints>
|
||||||
</Bucket>
|
</Bucket>
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ struct Club_PortalApp: App {
|
|||||||
@UIApplicationDelegateAdaptor(AppDelegate.self) var delegate
|
@UIApplicationDelegateAdaptor(AppDelegate.self) var delegate
|
||||||
|
|
||||||
// Initialize notification service
|
// Initialize notification service
|
||||||
@StateObject var notificationService = NotificationService()
|
@ObservedObject var notificationService = NotificationService.shared
|
||||||
var body: some Scene {
|
var body: some Scene {
|
||||||
WindowGroup {
|
WindowGroup {
|
||||||
WelcomeView()
|
WelcomeView()
|
||||||
@@ -53,10 +53,16 @@ class AppDelegate: NSObject, UIApplicationDelegate {
|
|||||||
// Handle remote notification registration
|
// Handle remote notification registration
|
||||||
func application(_ application: UIApplication,
|
func application(_ application: UIApplication,
|
||||||
didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
|
didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
|
||||||
|
print("Successfully registered for remote notifications with token: \(deviceToken.map { String(format: "%02.2hhx", $0) }.joined())")
|
||||||
Messaging.messaging().apnsToken = deviceToken
|
Messaging.messaging().apnsToken = deviceToken
|
||||||
NotificationService.shared.updateFCMToken()
|
NotificationService.shared.updateFCMToken()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func application(_ application: UIApplication,
|
||||||
|
didFailToRegisterForRemoteNotificationsWithError error: Error) {
|
||||||
|
print("Failed to register for remote notifications: \(error.localizedDescription)")
|
||||||
|
}
|
||||||
|
|
||||||
// Handle notification tap when app is in background or terminated
|
// Handle notification tap when app is in background or terminated
|
||||||
func application(_ application: UIApplication,
|
func application(_ application: UIApplication,
|
||||||
didReceiveRemoteNotification userInfo: [AnyHashable: Any],
|
didReceiveRemoteNotification userInfo: [AnyHashable: Any],
|
||||||
|
|||||||
Reference in New Issue
Block a user