Skip to content

Commit b1a5444

Browse files
authored
tvOS Reference Docs Changes (#1175)
Update the reference docs to refer to tvOS when discussing particular methods and classes.
1 parent 5c0eebe commit b1a5444

File tree

10 files changed

+54
-55
lines changed

10 files changed

+54
-55
lines changed

analytics/src/include/firebase/analytics.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -479,9 +479,9 @@ void LogEvent(const char* name, const Parameter* parameters,
479479
size_t number_of_parameters);
480480

481481
/// Initiates on-device conversion measurement given a user email address on iOS
482-
/// (no-op on Android). On iOS, requires dependency
483-
/// GoogleAppMeasurementOnDeviceConversion to be linked in, otherwise it is a
484-
/// no-op.
482+
/// and tvOS (no-op on Android). On iOS and tvOS, this method requires the
483+
/// dependency GoogleAppMeasurementOnDeviceConversion to be linked in,
484+
/// otherwise the invocation results in a no-op.
485485
/// @param[in] email_address User email address. Include a domain name for all
486486
/// email addresses (e.g. gmail.com or hotmail.co.jp).
487487
void InitiateOnDeviceConversionMeasurementWithEmailAddress(

auth/src/include/firebase/auth.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ class Auth {
174174
void set_language_code(const char* language_code);
175175

176176
/// Sets the user-facing language code to be the default app language. This
177-
/// uses a languge associated with the phone's locale data. On desktop
177+
/// uses a language associated with the device's locale data. On desktop
178178
/// this will set the language code to the Firebase service's default. You
179179
/// may subsequently customize the language code again by invoking
180180
/// set_language_code().
@@ -262,9 +262,9 @@ class Auth {
262262
///
263263
/// @return A Future with the result of the sign-in request.
264264
///
265-
/// @note: This operation is supported only on iOS and Android platforms. On
266-
/// non-mobile platforms this method will return a Future with a preset error
267-
/// code: kAuthErrorUnimplemented.
265+
/// @note: This operation is supported only on iOS, tvOS and Android
266+
/// platforms. On other platforms this method will return a Future with a
267+
/// preset error code: kAuthErrorUnimplemented.
268268
Future<SignInResult> SignInWithProvider(FederatedAuthProvider* provider);
269269

270270
/// Asynchronously logs into Firebase with the given credentials.
@@ -883,8 +883,8 @@ class FederatedOAuthProvider : public FederatedAuthProvider {
883883
///
884884
/// An AuthHandler is required on desktop platforms to facilitate custom
885885
/// implementations of OAuth authentication. The AuthHandler must outlive the
886-
/// instance of this OAuthProvider on desktop systems and is ignored on iOS
887-
/// and Android platforms.
886+
/// instance of this OAuthProvider on desktop systems and is ignored on iOS,
887+
/// tvOS, and Android platforms.
888888
///
889889
/// @param[in] provider_data Contains information on the provider to
890890
/// authenticate with.
@@ -910,7 +910,7 @@ class FederatedOAuthProvider : public FederatedAuthProvider {
910910
/// @brief Configures the use of an AuthHandler for non-mobile systems.
911911
///
912912
/// The existence of a handler is required for non-mobile systems, and is
913-
/// ignored on iOS and Android platforms.
913+
/// ignored on iOS, tvOS and Android platforms.
914914
///
915915
/// @param[in] handler An FederatedOAuthProviderData typed
916916
/// FederatedAuthProvider::Handler which be invoked on non-mobile systems

auth/src/include/firebase/auth/credential.h

+4-2
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ class FacebookAuthProvider {
155155
static const char* const kProviderId;
156156
};
157157

158-
/// @brief GameCenter (iOS) auth provider
158+
/// @brief GameCenter (Apple) auth provider
159159
class GameCenterAuthProvider {
160160
public:
161161
/// Generate a credential from GameCenter for the current user.
@@ -243,7 +243,9 @@ class OAuthProvider {
243243
/// @brief Use phone number text messages to authenticate.
244244
///
245245
/// Allows developers to use the phone number and SMS verification codes
246-
/// to authenticate a user.
246+
/// to authenticate a user on a mobile device.
247+
///
248+
/// This class is not supported on tvOS and Desktop platforms.
247249
///
248250
/// The verification flow results in a Credential that can be used to,
249251
/// * Sign in to an existing phone number account/sign up with a new

auth/src/include/firebase/auth/types.h

+10-10
Original file line numberDiff line numberDiff line change
@@ -238,29 +238,29 @@ enum AuthError {
238238

239239
/// Indicates that the reCAPTCHA token is not valid.
240240
///
241-
/// @note This error is iOS-specific.
241+
/// @note This error is iOS and tvOS-specific.
242242
kAuthErrorCaptchaCheckFailed,
243243

244244
/// Indicates that an invalid APNS device token was used in the verifyClient
245245
/// request.
246246
///
247-
/// @note This error is iOS-specific.
247+
/// @note This error is iOS and tvOS-specific.
248248
kAuthErrorInvalidAppCredential,
249249

250250
/// Indicates that the APNS device token is missing in the verifyClient
251251
/// request.
252252
///
253-
/// @note This error is iOS-specific.
253+
/// @note This error is iOS and tvOS-specific.
254254
kAuthErrorMissingAppCredential,
255255

256256
/// Indicates that the clientID used to invoke a web flow is invalid.
257257
///
258-
/// @note This error is iOS-specific.
258+
/// @note This error is iOS and tvOS-specific.
259259
kAuthErrorInvalidClientId,
260260

261261
/// Indicates that the domain specified in the continue URI is not valid.
262262
///
263-
/// @note This error is iOS-specific.
263+
/// @note This error is iOS and tvOS-specific.
264264
kAuthErrorInvalidContinueUri,
265265

266266
/// Indicates that a continue URI was not provided in a request to the backend
@@ -270,32 +270,32 @@ enum AuthError {
270270
/// Indicates an error occurred while attempting to access the keychain.
271271
/// Common error code for all API Methods.
272272
///
273-
/// @note This error is iOS-specific.
273+
/// @note This error is iOS and tvOS-specific.
274274
kAuthErrorKeychainError,
275275

276276
/// Indicates that the APNs device token could not be obtained. The app may
277277
/// not have set up remote notification correctly, or may have failed to
278278
/// forward the APNs device token to FIRAuth if app delegate swizzling is
279279
/// disabled.
280280
///
281-
/// @note This error is iOS-specific.
281+
/// @note This error is iOS and tvOS-specific.
282282
kAuthErrorMissingAppToken,
283283

284284
/// Indicates that the iOS bundle ID is missing when an iOS App Store ID is
285285
/// provided.
286286
///
287-
/// @note This error is iOS-specific.
287+
/// @note This error is iOS and tvOS-specific.
288288
kAuthErrorMissingIosBundleId,
289289

290290
/// Indicates that the app fails to forward remote notification to FIRAuth.
291291
///
292-
/// @note This error is iOS-specific.
292+
/// @note This error is iOS and tvOS-specific.
293293
kAuthErrorNotificationNotForwarded,
294294

295295
/// Indicates that the domain specified in the continue URL is not white-
296296
/// listed in the Firebase console.
297297
///
298-
/// @note This error is iOS-specific.
298+
/// @note This error is iOS and tvOS-specific.
299299
kAuthErrorUnauthorizedDomain,
300300

301301
/// Indicates that an attempt was made to present a new web context while one

auth/src/include/firebase/auth/user.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -291,9 +291,9 @@ class User : public UserInfoInterface {
291291
/// authenticate with.
292292
/// @return A Future<SignInResult> with the result of the re-authentication
293293
/// request.
294-
/// @note: This operation is supported only on iOS and Android platforms. On
295-
/// non-mobile platforms this method will return a Future with a preset error
296-
/// code: kAuthErrorUnimplemented.
294+
/// @note: This operation is supported only on iOS, tvOS and Android
295+
/// platforms. On other platforms this method will return a Future with a
296+
/// preset error code: kAuthErrorUnimplemented.
297297
Future<SignInResult> ReauthenticateWithProvider(
298298
FederatedAuthProvider* provider) const;
299299

@@ -341,9 +341,9 @@ class User : public UserInfoInterface {
341341
/// @return A Future<SignInResult> with the user data result of the link
342342
/// request.
343343
///
344-
/// @note: This operation is supported only on iOS and Android platforms. On
345-
/// non-mobile platforms this method will return a Future with a preset error
346-
/// code: kAuthErrorUnimplemented.
344+
/// @note: This operation is supported only on iOS, tvOS and Android
345+
/// platforms. On other platforms this method will return a Future with a
346+
/// preset error code: kAuthErrorUnimplemented.
347347
Future<SignInResult> LinkWithProvider(FederatedAuthProvider* provider) const;
348348

349349
/// Unlinks the current user from the provider specified.

database/src/include/firebase/database/query.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ class Query {
266266
/// @returns A Query in this same location, filtering out child nodes that
267267
/// have a different sort value than the sort value specified.
268268
Query EqualTo(Variant order_value);
269+
269270
/// @brief Get a Query constrained to nodes with the exact given sort value,
270271
/// and the exact given key.
271272
///
@@ -274,7 +275,7 @@ class Query {
274275
/// as default), and the given key. Note that there is at most one such child
275276
/// as child key names are unique.
276277
///
277-
/// <b>Known issue</b> This currently does not work properly on iOS and
278+
/// <b>Known issue</b> This currently does not work properly on iOS, tvOS and
278279
/// desktop. Please use EqualTo(Variant order_value) instead.
279280
///
280281
/// @param[in] order_value The exact sort value the Query should include.

firestore/src/include/firebase/firestore/settings.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ class Settings final {
168168
* `set_dispatch_queue()`.
169169
*
170170
* @note This method is only available when `__OBJC__` is defined, such as
171-
* when compiling for iOS.
171+
* when compiling for iOS or tvOS.
172172
*
173173
* @see `set_dispatch_queue(dispatch_queue_t)` for information on how to
174174
* explicitly set the dispatch queue to use.
@@ -184,7 +184,7 @@ class Settings final {
184184
* @param queue The dispatch queue to use.
185185
*
186186
* @note This method is only available when `__OBJC__` is defined, such as
187-
* when compiling for iOS.
187+
* when compiling for iOS or tvOS.
188188
*
189189
* @see `dispatch_queue()` for the "get" counterpart to this method.
190190
*/

functions/src/include/firebase/functions/common.h

-4
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,6 @@ enum Error {
181181
// HTTP Mapping: 500 Internal Server Error
182182
kErrorDataLoss = 15,
183183

184-
#ifdef INTERNAL_EXPERIMENTAL
185-
// LINT.ThenChange(//depot_firebase_cpp/functions/client/cpp/src/ios/\
186-
// callable_reference_ios.mm)
187-
#endif // INTERNAL_EXPERIMENTAL
188184
};
189185

190186
#ifdef INTERNAL_EXPERIMENTAL

messaging/src/include/firebase/messaging.h

+18-18
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ struct MessagingOptions {
5757
/// If this prompt has already been accepted once in the past the prompt will
5858
/// not be displayed again.
5959
///
60-
/// This option currently only applies to iOS.
60+
/// This option currently only applies to iOS and tvOS.
6161
bool suppress_notification_permission_prompt;
6262
};
6363

@@ -107,8 +107,8 @@ struct Notification {
107107
/// Destructor.
108108
~Notification() { delete android; }
109109

110-
/// Indicates notification title. This field is not visible on iOS phones
111-
/// and tablets.
110+
/// Indicates notification title. This field is not visible on tvOS, iOS
111+
/// phones and tablets.
112112
std::string title;
113113

114114
/// Indicates notification body text.
@@ -122,12 +122,12 @@ struct Notification {
122122
/// Supports default, or the filename of a sound resource bundled in the
123123
/// app.
124124
///
125-
/// Android sound files must reside in /res/raw/, while iOS sound files
126-
/// can be in the main bundle of the client app or in the Library/Sounds
127-
/// folder of the app’s data container.
125+
/// Android sound files must reside in /res/raw/, while iOS and tvOS sound
126+
/// files can be in the main bundle of the client app or in the
127+
/// Library/Sounds folder of the app’s data container.
128128
std::string sound;
129129

130-
/// Indicates the badge on the client app home icon. iOS only.
130+
/// Indicates the badge on the client app home icon. iOS and tvOS only.
131131
std::string badge;
132132

133133
/// Indicates whether each notification results in a new entry in the
@@ -145,12 +145,12 @@ struct Notification {
145145
/// On Android, if this is set, an activity with a matching intent filter is
146146
/// launched when user clicks the notification.
147147
///
148-
/// If set on iOS, corresponds to category in APNS payload.
148+
/// If set on iOS or tvOS, corresponds to category in APNS payload.
149149
std::string click_action;
150150

151151
/// Indicates the key to the body string for localization.
152152
///
153-
/// On iOS, this corresponds to "loc-key" in APNS payload.
153+
/// On iOS and tvOS, this corresponds to "loc-key" in APNS payload.
154154
///
155155
/// On Android, use the key in the app's string resources when populating this
156156
/// value.
@@ -159,7 +159,7 @@ struct Notification {
159159
/// Indicates the string value to replace format specifiers in body string
160160
/// for localization.
161161
///
162-
/// On iOS, this corresponds to "loc-args" in APNS payload.
162+
/// On iOS and tvOS, this corresponds to "loc-args" in APNS payload.
163163
///
164164
/// On Android, these are the format arguments for the string resource. For
165165
/// more information, see [Formatting strings][1].
@@ -170,7 +170,7 @@ struct Notification {
170170

171171
/// Indicates the key to the title string for localization.
172172
///
173-
/// On iOS, this corresponds to "title-loc-key" in APNS payload.
173+
/// On iOS and tvOS, this corresponds to "title-loc-key" in APNS payload.
174174
///
175175
/// On Android, use the key in the app's string resources when populating this
176176
/// value.
@@ -179,7 +179,7 @@ struct Notification {
179179
/// Indicates the string value to replace format specifiers in title string
180180
/// for localization.
181181
///
182-
/// On iOS, this corresponds to "title-loc-args" in APNS payload.
182+
/// On iOS and tvOS, this corresponds to "title-loc-args" in APNS payload.
183183
///
184184
/// On Android, these are the format arguments for the string resource. For
185185
/// more information, see [Formatting strings][1].
@@ -306,7 +306,7 @@ struct Message {
306306
std::string message_type;
307307

308308
/// Sets the priority of the message. Valid values are "normal" and "high." On
309-
/// iOS, these correspond to APNs priority 5 and 10.
309+
/// iOS and tvOS, these correspond to APNs priority 5 and 10.
310310
///
311311
/// By default, messages are sent with normal priority. Normal priority
312312
/// optimizes the client app's battery consumption, and should be used unless
@@ -460,7 +460,7 @@ bool IsTokenRegistrationOnInitEnabled();
460460
/// If this setting is enabled, it triggers the token registration refresh
461461
/// immediately. This setting is persisted across app restarts and overrides the
462462
/// setting "firebase_messaging_auto_init_enabled" specified in your Android
463-
/// manifest (on Android) or Info.plist (on iOS).
463+
/// manifest (on Android) or Info.plist (on iOS and tvOS).
464464
///
465465
/// <p>By default, token registration during initialization is enabled.
466466
///
@@ -480,7 +480,7 @@ bool IsTokenRegistrationOnInitEnabled();
480480
/// @endcode
481481
/// @endif
482482
///
483-
/// or on iOS to your Info.plist:
483+
/// or on iOS or tvOS to your Info.plist:
484484
///
485485
/// @if NOT_DOXYGEN
486486
/// <key>FirebaseMessagingAutoInitEnabled</key>
@@ -528,9 +528,9 @@ enum Error {
528528
/// @brief Displays a prompt to the user requesting permission to display
529529
/// notifications.
530530
///
531-
/// The permission prompt only appears on iOS. If the user has already agreed to
532-
/// allow notifications, no prompt is displayed and the returned future is
533-
/// completed immediately.
531+
/// The permission prompt only appears on iOS and tvOS. If the user has
532+
/// already agreed to allow notifications, no prompt is displayed and the
533+
/// returned future is completed immediately.
534534
///
535535
/// @return A future that completes when the notification prompt has been
536536
/// dismissed.

performance/src/include/firebase/performance.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ bool GetPerformanceCollectionEnabled();
5252
/// This setting is persisted across app sessions. By default it is enabled.
5353
///
5454
/// This can be called before firebase::performance::Initialize(const App&
55-
/// app) on iOS, but that is not true on Android due to the way the SDK is
56-
/// initialized. If you need to disable firebase performance before that, see
55+
/// app) on iOS and tvOS, but that is not true on Android due to the way the SDK
56+
/// is initialized. If you need to disable firebase performance before that, see
5757
/// <a href="/docs/perf-mon/disable-sdk">the documentation</a>.
5858
///
5959
/// @param[in] enabled true to enable performance collection, false to disable.

0 commit comments

Comments
 (0)