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
Binary file not shown.
Binary file added src/android/.gradle/5.0/fileHashes/fileHashes.bin
Binary file not shown.
Binary file added src/android/.gradle/5.0/fileHashes/fileHashes.lock
Binary file not shown.
Empty file.
Empty file.
17 changes: 17 additions & 0 deletions src/android/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>android</name>
<comment>Project android created by Buildship.</comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
</natures>
</projectDescription>
2 changes: 2 additions & 0 deletions src/android/.settings/org.eclipse.buildship.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
connection.project.dir=
eclipse.preferences.version=1
3 changes: 2 additions & 1 deletion src/android/FirebasePluginMessagingService.java
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ public void onMessageReceived(RemoteMessage remoteMessage) {

// TODO: Add option to developer to configure if show notification when app on foreground
if (!TextUtils.isEmpty(text) || !TextUtils.isEmpty(title) || (data != null && !data.isEmpty())) {
boolean showNotification = (FirebasePlugin.inBackground() || !FirebasePlugin.hasNotificationsCallback()) && (!TextUtils.isEmpty(text) || !TextUtils.isEmpty(title));
// boolean showNotification = (FirebasePlugin.inBackground() || !FirebasePlugin.hasNotificationsCallback()) && (!TextUtils.isEmpty(text) || !TextUtils.isEmpty(title));
boolean showNotification = (!TextUtils.isEmpty(text) || !TextUtils.isEmpty(title));
sendNotification(id, title, text, data, showNotification, sound, lights);
}
}
Expand Down
Binary file modified src/ios/Crashlytics/Crashlytics.framework/Crashlytics
Binary file not shown.
Binary file modified src/ios/Crashlytics/Crashlytics.framework/Info.plist
Binary file not shown.
Binary file modified src/ios/Crashlytics/Crashlytics.framework/submit
Binary file not shown.
Binary file modified src/ios/Crashlytics/Crashlytics.framework/uploadDSYM
Binary file not shown.
Binary file modified src/ios/Crashlytics/Fabric.framework/Fabric
Binary file not shown.
Binary file modified src/ios/Crashlytics/Fabric.framework/Info.plist
Binary file not shown.
Binary file modified src/ios/Crashlytics/Fabric.framework/uploadDSYM
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -392,9 +392,21 @@ static NSString *const kFIRParameterShipping NS_SWIFT_NAME(AnalyticsParameterShi
/// // ...
/// };
/// </pre>
///
/// <b>This constant has been deprecated. Use Method constant instead.</b>
static NSString *const kFIRParameterSignUpMethod NS_SWIFT_NAME(AnalyticsParameterSignUpMethod) =
@"sign_up_method";

/// A particular approach used in an operation; for example, "facebook" or "email" in the context
/// of a sign_up or login event. (NSString).
/// <pre>
/// NSDictionary *params = @{
/// kFIRParameterMethod : @"google",
/// // ...
/// };
/// </pre>
static NSString *const kFIRParameterMethod NS_SWIFT_NAME(AnalyticsParameterMethod) = @"method";

/// The origin of your traffic, such as an Ad network (for example, google) or partner (urban
/// airship). Identify the advertiser, site, publication, etc. that is sending traffic to your
/// property. Highly recommended (NSString).
Expand Down
Binary file modified src/ios/Firebase/Analytics/FirebaseCore.framework/FirebaseCore
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
12 changes: 11 additions & 1 deletion src/ios/Firebase/Analytics/nanopb.framework/Headers/pb.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

/* Version of the nanopb library. Just in case you want to check it in
* your own program. */
#define NANOPB_VERSION nanopb-0.3.8
#define NANOPB_VERSION nanopb-0.3.9.1

/* Include all the system headers needed by nanopb. You will need the
* definitions of the following:
Expand Down Expand Up @@ -251,8 +251,10 @@ PB_PACKED_STRUCT_END
* If you get errors here, it probably means that your stdint.h is not
* correct for your platform.
*/
#ifndef PB_WITHOUT_64BIT
PB_STATIC_ASSERT(sizeof(int64_t) == 2 * sizeof(int32_t), INT64_T_WRONG_SIZE)
PB_STATIC_ASSERT(sizeof(uint64_t) == 2 * sizeof(uint32_t), UINT64_T_WRONG_SIZE)
#endif

/* This structure is used for 'bytes' arrays.
* It has the number of bytes in the beginning, and after that an array.
Expand Down Expand Up @@ -525,6 +527,14 @@ struct pb_extension_s {
PB_DATAOFFSET_ ## placement(message, field, prevfield), \
PB_LTYPE_MAP_ ## type, ptr)

/* Field description for repeated static fixed count fields.*/
#define PB_REPEATED_FIXED_COUNT(tag, type, placement, message, field, prevfield, ptr) \
{tag, PB_ATYPE_STATIC | PB_HTYPE_REPEATED | PB_LTYPE_MAP_ ## type, \
PB_DATAOFFSET_ ## placement(message, field, prevfield), \
0, \
pb_membersize(message, field[0]), \
pb_arraysize(message, field), ptr}

/* Field description for oneof fields. This requires taking into account the
* union name also, that's why a separate set of macros is needed.
*/
Expand Down
22 changes: 22 additions & 0 deletions src/ios/Firebase/Analytics/nanopb.framework/Headers/pb_decode.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,18 @@ bool pb_decode_noinit(pb_istream_t *stream, const pb_field_t fields[], void *des
*/
bool pb_decode_delimited(pb_istream_t *stream, const pb_field_t fields[], void *dest_struct);

/* Same as pb_decode_delimited, except that it does not initialize the destination structure.
* See pb_decode_noinit
*/
bool pb_decode_delimited_noinit(pb_istream_t *stream, const pb_field_t fields[], void *dest_struct);

/* Same as pb_decode, except allows the message to be terminated with a null byte.
* NOTE: Until nanopb-0.4.0, pb_decode() also allows null-termination. This behaviour
* is not supported in most other protobuf implementations, so pb_decode_delimited()
* is a better option for compatibility.
*/
bool pb_decode_nullterminated(pb_istream_t *stream, const pb_field_t fields[], void *dest_struct);

#ifdef PB_ENABLE_MALLOC
/* Release any allocated pointer fields. If you use dynamic allocation, you should
* call this for any successfully decoded message when you are done with it. If
Expand Down Expand Up @@ -124,23 +136,33 @@ bool pb_skip_field(pb_istream_t *stream, pb_wire_type_t wire_type);

/* Decode an integer in the varint format. This works for bool, enum, int32,
* int64, uint32 and uint64 field types. */
#ifndef PB_WITHOUT_64BIT
bool pb_decode_varint(pb_istream_t *stream, uint64_t *dest);
#else
#define pb_decode_varint pb_decode_varint32
#endif

/* Decode an integer in the varint format. This works for bool, enum, int32,
* and uint32 field types. */
bool pb_decode_varint32(pb_istream_t *stream, uint32_t *dest);

/* Decode an integer in the zig-zagged svarint format. This works for sint32
* and sint64. */
#ifndef PB_WITHOUT_64BIT
bool pb_decode_svarint(pb_istream_t *stream, int64_t *dest);
#else
bool pb_decode_svarint(pb_istream_t *stream, int32_t *dest);
#endif

/* Decode a fixed32, sfixed32 or float value. You need to pass a pointer to
* a 4-byte wide C variable. */
bool pb_decode_fixed32(pb_istream_t *stream, void *dest);

#ifndef PB_WITHOUT_64BIT
/* Decode a fixed64, sfixed64 or double value. You need to pass a pointer to
* a 8-byte wide C variable. */
bool pb_decode_fixed64(pb_istream_t *stream, void *dest);
#endif

/* Make a limited-length substream for reading a PB_WT_STRING field. */
bool pb_make_string_substream(pb_istream_t *stream, pb_istream_t *substream);
Expand Down
16 changes: 16 additions & 0 deletions src/ios/Firebase/Analytics/nanopb.framework/Headers/pb_encode.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@ bool pb_encode(pb_ostream_t *stream, const pb_field_t fields[], const void *src_
*/
bool pb_encode_delimited(pb_ostream_t *stream, const pb_field_t fields[], const void *src_struct);

/* Same as pb_encode, but appends a null byte to the message for termination.
* NOTE: This behaviour is not supported in most other protobuf implementations, so pb_encode_delimited()
* is a better option for compatibility.
*/
bool pb_encode_nullterminated(pb_ostream_t *stream, const pb_field_t fields[], const void *src_struct);

/* Encode the message to get the size of the encoded data, but do not store
* the data. */
bool pb_get_encoded_size(size_t *size, const pb_field_t fields[], const void *src_struct);
Expand Down Expand Up @@ -123,11 +129,19 @@ bool pb_encode_tag(pb_ostream_t *stream, pb_wire_type_t wiretype, uint32_t field

/* Encode an integer in the varint format.
* This works for bool, enum, int32, int64, uint32 and uint64 field types. */
#ifndef PB_WITHOUT_64BIT
bool pb_encode_varint(pb_ostream_t *stream, uint64_t value);
#else
bool pb_encode_varint(pb_ostream_t *stream, uint32_t value);
#endif

/* Encode an integer in the zig-zagged svarint format.
* This works for sint32 and sint64. */
#ifndef PB_WITHOUT_64BIT
bool pb_encode_svarint(pb_ostream_t *stream, int64_t value);
#else
bool pb_encode_svarint(pb_ostream_t *stream, int32_t value);
#endif

/* Encode a string or bytes type field. For strings, pass strlen(s) as size. */
bool pb_encode_string(pb_ostream_t *stream, const pb_byte_t *buffer, size_t size);
Expand All @@ -136,9 +150,11 @@ bool pb_encode_string(pb_ostream_t *stream, const pb_byte_t *buffer, size_t size
* You need to pass a pointer to a 4-byte wide C variable. */
bool pb_encode_fixed32(pb_ostream_t *stream, const void *value);

#ifndef PB_WITHOUT_64BIT
/* Encode a fixed64, sfixed64 or double value.
* You need to pass a pointer to a 8-byte wide C variable. */
bool pb_encode_fixed64(pb_ostream_t *stream, const void *value);
#endif

/* Encode a submessage field.
* You need to pass the pb_field_t array and pointer to struct, just like
Expand Down
Binary file modified src/ios/Firebase/Analytics/nanopb.framework/nanopb
Binary file not shown.
Binary file modified src/ios/Firebase/Auth/FirebaseAuth.framework/FirebaseAuth
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@
*/
@property(nonatomic, assign, readonly) BOOL androidInstallIfNotAvailable;

/** @property dynamicLinkDomain
@brief The Firebase Dynamic Link domain used for out of band code flow.
*/
@property (copy, nonatomic, nullable) NSString *dynamicLinkDomain;

/** @fn setIOSBundleID
@brief Sets the iOS bundle Id.
@param iOSBundleID The iOS bundle ID.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -299,11 +299,20 @@ typedef NS_ENUM(NSInteger, FIRAuthErrorCode) {
*/
FIRAuthErrorCodeWebInternalError = 17062,

/** Indicates that the local player was not authenticated prior to attempting Game Center signin.
*/
FIRAuthErrorCodeLocalPlayerNotAuthenticated = 17066,

/** Indicates that a non-null user was expected as an argmument to the operation but a null
user was provided.
*/
FIRAuthErrorCodeNullUser = 17067,

/** Indicates that the Firebase Dynamic Link domain used is either not configured or is unauthorized
for the current project.
*/
FIRAuthErrorCodeInvalidDynamicLinkDomain = 17074,

/** Indicates an error occurred while attempting to access the keychain.
*/
FIRAuthErrorCodeKeychainError = 17995,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ NS_SWIFT_NAME(AuthTokenResult)

/** @property signInProvider
@brief Stores sign-in provider through which the token was obtained.
@remarks This does not necesssarily map to provider IDs.
@remarks This does not necessarily map to provider IDs.
*/
@property (nonatomic, readonly) NSString *signInProvider;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/*
* Copyright 2018 Google
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#import <Foundation/Foundation.h>

@class FIRAuthCredential;

NS_ASSUME_NONNULL_BEGIN

/**
@brief A string constant identifying the Game Center identity provider.
*/
extern NSString *const FIRGameCenterAuthProviderID NS_SWIFT_NAME(GameCenterAuthProviderID);

/**
@brief A string constant identifying the Game Center sign-in method.
*/
extern NSString *const _Nonnull FIRGameCenterAuthSignInMethod
NS_SWIFT_NAME(GameCenterAuthSignInMethod);

/** @typedef FIRGameCenterCredentialCallback
@brief The type of block invoked when the Game Center credential code has finished.
@param credential On success, the credential will be provided, nil otherwise.
@param error On error, the error that occured, nil otherwise.
*/
typedef void (^FIRGameCenterCredentialCallback)(FIRAuthCredential *_Nullable credential,
NSError *_Nullable error)
NS_SWIFT_NAME(GameCenterCredentialCallback);

/** @class FIRGameCenterAuthProvider
@brief A concrete implementation of @c FIRAuthProvider for Game Center Sign In.
*/
NS_SWIFT_NAME(GameCenterAuthProvider)
@interface FIRGameCenterAuthProvider : NSObject

/** @fn getCredentialWithCompletion:
@brief Creates a @c FIRAuthCredential for a Game Center sign in.
*/
+ (void)getCredentialWithCompletion:(FIRGameCenterCredentialCallback)completion
NS_SWIFT_NAME(getCredential(completion:));

/** @fn init
@brief This class is not meant to be initialized.
*/
- (instancetype)init NS_UNAVAILABLE;

@end

NS_ASSUME_NONNULL_END
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
@brief Implementation of FIRAuthCredential for Phone Auth credentials.
*/
NS_SWIFT_NAME(PhoneAuthCredential)
@interface FIRPhoneAuthCredential : FIRAuthCredential
@interface FIRPhoneAuthCredential : FIRAuthCredential <NSSecureCoding>

/** @fn init
@brief This class is not supposed to be instantiated directly.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,11 @@ extern NSString *const FIRPhoneAuthProviderID NS_SWIFT_NAME(PhoneAuthProviderID)
*/
extern NSString *const _Nonnull FIRPhoneAuthSignInMethod NS_SWIFT_NAME(PhoneAuthSignInMethod);


/** @typedef FIRVerificationResultCallback
@brief The type of block invoked when a request to send a verification code has finished.

@param verificationID On success, the verification ID provided, nil otherwise.
@param error On error, the error that occured, nil otherwise.
@param error On error, the error that occurred, nil otherwise.
*/
typedef void (^FIRVerificationResultCallback)(NSString *_Nullable verificationID,
NSError *_Nullable error)
Expand All @@ -62,7 +61,7 @@ NS_SWIFT_NAME(PhoneAuthProvider)
+ (instancetype)providerWithAuth:(FIRAuth *)auth NS_SWIFT_NAME(provider(auth:));

/** @fn verifyPhoneNumber:UIDelegate:completion:
@brief Starts the phone number authentication flow by sending a verifcation code to the
@brief Starts the phone number authentication flow by sending a verification code to the
specified phone number.
@param phoneNumber The phone number to be verified.
@param UIDelegate An object used to present the SFSafariViewController. The object is retained
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#import "FirebaseAuthVersion.h"
#import "FIREmailAuthProvider.h"
#import "FIRFacebookAuthProvider.h"
#import "FIRGameCenterAuthProvider.h"
#import "FIRGitHubAuthProvider.h"
#import "FIRGoogleAuthProvider.h"
#import "FIROAuthProvider.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ extern const double FirebaseAuthVersionNum;
/**
Version string for FirebaseAuth.
*/
extern const unsigned char *const FirebaseAuthVersionStr;
extern const char *const FirebaseAuthVersionStr;
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ framework module FirebaseAuth {
umbrella header "FirebaseAuth.h"
export *
module * { export *}
link framework "SafariServices"
link framework "Security"
}
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -734,14 +734,6 @@ NSData * GTM_NULLABLE_TYPE GTMDataFromInputStream(NSInputStream *inputStream, NS
// affect a fetch after the fetch has begun.
- (void)setRequestValue:(GTM_NULLABLE NSString *)value forHTTPHeaderField:(NSString *)field;

// The fetcher's request (deprecated.)
//
// Exposing a mutable object in the interface was convenient but a bad design decision due
// to thread-safety requirements. Clients should use the request property and
// setRequestValue:forHTTPHeaderField: instead.
@property(atomic, readonly, GTM_NULLABLE) NSMutableURLRequest *mutableRequest
GTMSESSION_DEPRECATE_ON_2016_SDKS("use 'request' or '-setRequestValue:forHTTPHeaderField:'");

// Data used for resuming a download task.
@property(atomic, readonly, GTM_NULLABLE) NSData *downloadResumeData;

Expand Down Expand Up @@ -1247,7 +1239,11 @@ NSData * GTM_NULLABLE_TYPE GTMDataFromInputStream(NSInputStream *inputStream, NS
// can catch those.

#ifdef __OBJC__
#if DEBUG
// If asserts are entirely no-ops, the synchronization monitor is just a bunch
// of counting code that doesn't report exceptional circumstances in any way.
// Only build the synchronization monitor code if NS_BLOCK_ASSERTIONS is not
// defined or asserts are being logged instead.
#if DEBUG && (!defined(NS_BLOCK_ASSERTIONS) || GTMSESSION_ASSERT_AS_LOG)
#define __GTMSessionMonitorSynchronizedVariableInner(varname, counter) \
varname ## counter
#define __GTMSessionMonitorSynchronizedVariable(varname, counter) \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ extern NSString *const kGTMSessionFetcherServiceSessionKey;

@interface GTMSessionFetcherService (TestingSupport)

// Convenience method to create a fetcher service for testing.
// Convenience methods to create a fetcher service for testing.
//
// Fetchers generated by this mock fetcher service will not perform any
// network operation, but will invoke callbacks and provide the supplied data
Expand All @@ -165,6 +165,9 @@ extern NSString *const kGTMSessionFetcherServiceSessionKey;
// See the description of the testBlock property below.
+ (instancetype)mockFetcherServiceWithFakedData:(GTM_NULLABLE NSData *)fakedDataOrNil
fakedError:(GTM_NULLABLE NSError *)fakedErrorOrNil;
+ (instancetype)mockFetcherServiceWithFakedData:(GTM_NULLABLE NSData *)fakedDataOrNil
fakedResponse:(NSHTTPURLResponse *)fakedResponse
fakedError:(GTM_NULLABLE NSError *)fakedErrorOrNil;

// Spin the run loop and discard events (or, if not on the main thread, just sleep the thread)
// until all running and delayed fetchers have completed.
Expand Down
Loading