diff options
Diffstat (limited to 'Firebase/Messaging')
-rw-r--r-- | Firebase/Messaging/FIRMessaging.m | 12 | ||||
-rw-r--r-- | Firebase/Messaging/Public/FIRMessaging.h | 13 |
2 files changed, 4 insertions, 21 deletions
diff --git a/Firebase/Messaging/FIRMessaging.m b/Firebase/Messaging/FIRMessaging.m index e02a125..15561d5 100644 --- a/Firebase/Messaging/FIRMessaging.m +++ b/Firebase/Messaging/FIRMessaging.m @@ -142,7 +142,9 @@ FIRInstanceIDAPNSTokenType FIRIIDAPNSTokenTypeFromAPNSTokenType(FIRMessagingAPNS @end @interface FIRMessaging ()<FIRMessagingClientDelegate, FIRMessagingReceiverDelegate, - FIRReachabilityDelegate> + FIRReachabilityDelegate> { + BOOL _shouldEstablishDirectChannel; +} // FIRApp properties @property(nonatomic, readwrite, copy) NSString *fcmSenderID; @@ -206,14 +208,6 @@ FIRInstanceIDAPNSTokenType FIRIIDAPNSTokenTypeFromAPNSTokenType(FIRMessagingAPNS [self teardown]; } -- (void)setRemoteMessageDelegate:(id<FIRMessagingDelegate>)delegate { - _delegate = delegate; -} - -- (id<FIRMessagingDelegate>)remoteMessageDelegate { - return self.delegate; -} - #pragma mark - Config - (void)start { diff --git a/Firebase/Messaging/Public/FIRMessaging.h b/Firebase/Messaging/Public/FIRMessaging.h index 160ada6..f545147 100644 --- a/Firebase/Messaging/Public/FIRMessaging.h +++ b/Firebase/Messaging/Public/FIRMessaging.h @@ -302,23 +302,12 @@ NS_SWIFT_NAME(Messaging) @property(nonatomic, weak, nullable) id<FIRMessagingDelegate> delegate; /** - * Delegate to handle remote data messages received via FCM for devices running iOS 10 or above. - */ -@property(nonatomic, weak, nullable) id<FIRMessagingDelegate> remoteMessageDelegate - __deprecated_msg("Use 'delegate' property"); - -/** * When set to `YES`, Firebase Messaging will automatically establish a socket-based, direct * channel to the FCM server. Enable this only if you are sending upstream messages or * receiving non-APNS, data-only messages in foregrounded apps. * Default is `NO`. */ -@property(nonatomic) BOOL shouldEstablishDirectChannel; - -/** - * Returns `YES` if the direct channel to the FCM server is active, and `NO` otherwise. - */ -@property(nonatomic, readonly) BOOL isDirectChannelEstablished; +@property(nonatomic, assign, getter=isDirectChannelEstablished) BOOL shouldEstablishDirectChannel; /** * FIRMessaging |