diff options
| author |  Paul Beusterien <paulbeusterien@google.com> | 2018-04-26 12:59:12 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-04-26 12:59:12 -0700 |
| commit | bd7d3b2a169c0c510cff8fccd00e75e8d86f4157 (patch) | |
| tree | a09f4a98057e7f7349469f94dfdbcf6007dc7842 | |
| parent | 326b770c7033b851c609b6e3c4a9db71e05b1d86 (diff) | |
| parent | d016d152f7560ce89fbaab3fc33b0425de4325d4 (diff) | |
Merge pull request #1191 from firebase/pb-cp-1190
shouldEstablishDirectChannel cannot be replaced by isDirectChannelEst…
| -rw-r--r-- | Firebase/Messaging/FIRMessaging.m | 4 | ||||
| -rw-r--r-- | Firebase/Messaging/Public/FIRMessaging.h | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/Firebase/Messaging/FIRMessaging.m b/Firebase/Messaging/FIRMessaging.m index 8fafab8..339bd7d 100644 --- a/Firebase/Messaging/FIRMessaging.m +++ b/Firebase/Messaging/FIRMessaging.m @@ -124,9 +124,7 @@ static NSString *const kFIRMessagingPlistAutoInitEnabled = @end @interface FIRMessaging ()<FIRMessagingClientDelegate, FIRMessagingReceiverDelegate, - FIRReachabilityDelegate> { - BOOL _shouldEstablishDirectChannel; -} + FIRReachabilityDelegate> // FIRApp properties @property(nonatomic, readwrite, copy) NSString *fcmSenderID; diff --git a/Firebase/Messaging/Public/FIRMessaging.h b/Firebase/Messaging/Public/FIRMessaging.h index 3ad15da..e58a216 100644 --- a/Firebase/Messaging/Public/FIRMessaging.h +++ b/Firebase/Messaging/Public/FIRMessaging.h @@ -291,7 +291,12 @@ NS_SWIFT_NAME(Messaging) * receiving non-APNS, data-only messages in foregrounded apps. * Default is `NO`. */ -@property(nonatomic, assign, getter=isDirectChannelEstablished) BOOL shouldEstablishDirectChannel; +@property(nonatomic) BOOL shouldEstablishDirectChannel; + +/** + * Returns `YES` if the direct channel to the FCM server is active, and `NO` otherwise. + */ +@property(nonatomic, readonly) BOOL isDirectChannelEstablished; /** * FIRMessaging |