Merge branch 'master' into varconst/write-batch-opt-1

Author: var-const

Example/Messaging/Tests/FIRMessagingTest.m

@@ -17,6 +17,8 @@
 #import <XCTest/XCTest.h>
 
 #import <OCMock/OCMock.h>
+
+#import <FirebaseCore/FIRAppInternal.h>
 #import <FirebaseInstanceID/FirebaseInstanceID.h>
 
 #import "FIRMessaging.h"
@@ -44,13 +46,17 @@ @interface FIRMessagingTest : XCTestCase
 @property(nonatomic, readonly, strong) FIRMessaging *messaging;
 @property(nonatomic, readwrite, strong) id mockMessaging;
 @property(nonatomic, readwrite, strong) id mockInstanceID;
+@property(nonatomic, readwrite, strong) id mockFirebaseApp;
 
 @end
 
 @implementation FIRMessagingTest
 
 - (void)setUp {
   [super setUp];
+  _mockFirebaseApp = OCMClassMock([FIRApp class]);
+  OCMStub([_mockFirebaseApp defaultApp]).andReturn(_mockFirebaseApp);
+
   _messaging = [[FIRMessaging alloc] initWithInstanceID:[FIRInstanceID instanceID]
                                            userDefaults:[NSUserDefaults standardUserDefaults]];
   _mockMessaging = OCMPartialMock(self.messaging);
@@ -63,6 +69,7 @@ - (void)setUp {
 - (void)tearDown {
   [_mockMessaging stopMocking];
   [_mockInstanceID stopMocking];
+  [_mockFirebaseApp stopMocking];
   [super tearDown];
 }
 
@@ -76,7 +83,7 @@ - (void)testAutoInitEnableFlag {
 }
 
 - (void)testAutoInitEnableFlagOverrideGlobalTrue {
-  OCMStub([self.mockMessaging isGlobalAutomaticDataCollectionEnabled]).andReturn(YES);
+  OCMStub([_mockFirebaseApp isAutomaticDataCollectionEnabled]).andReturn(YES);
   id bundleMock = OCMPartialMock([NSBundle mainBundle]);
   OCMStub([bundleMock objectForInfoDictionaryKey:kFIRMessagingPlistAutoInitEnabled]).andReturn(nil);
   XCTAssertTrue(self.messaging.isAutoInitEnabled);
@@ -87,7 +94,7 @@ - (void)testAutoInitEnableFlagOverrideGlobalTrue {
 }
 
 - (void)testAutoInitEnableFlagOverrideGlobalFalse {
-  OCMStub([self.mockMessaging isGlobalAutomaticDataCollectionEnabled]).andReturn(YES);
+  OCMStub([_mockFirebaseApp isAutomaticDataCollectionEnabled]).andReturn(YES);
   id bundleMock = OCMPartialMock([NSBundle mainBundle]);
   OCMStub([bundleMock objectForInfoDictionaryKey:kFIRMessagingPlistAutoInitEnabled]).andReturn(nil);
   XCTAssertTrue(self.messaging.isAutoInitEnabled);
@@ -98,7 +105,7 @@ - (void)testAutoInitEnableFlagOverrideGlobalFalse {
 }
 
 - (void)testAutoInitEnableGlobalDefaultTrue {
-  OCMStub([self.mockMessaging isGlobalAutomaticDataCollectionEnabled]).andReturn(YES);
+  OCMStub([_mockFirebaseApp isAutomaticDataCollectionEnabled]).andReturn(YES);
   id bundleMock = OCMPartialMock([NSBundle mainBundle]);
   OCMStub([bundleMock objectForInfoDictionaryKey:kFIRMessagingPlistAutoInitEnabled]).andReturn(nil);
 
@@ -107,7 +114,7 @@ - (void)testAutoInitEnableGlobalDefaultTrue {
 }
 
 - (void)testAutoInitEnableGlobalDefaultFalse {
-  OCMStub([self.mockMessaging isGlobalAutomaticDataCollectionEnabled]).andReturn(NO);
+  OCMStub([_mockFirebaseApp isAutomaticDataCollectionEnabled]).andReturn(NO);
   id bundleMock = OCMPartialMock([NSBundle mainBundle]);
   OCMStub([bundleMock objectForInfoDictionaryKey:kFIRMessagingPlistAutoInitEnabled]).andReturn(nil);
 

Example/Podfile

@@ -12,7 +12,7 @@ target 'Core_Example_iOS' do
   # The next line is the forcing function for the Firebase pod. The Firebase
   # version's subspecs should depend on the component versions in their
   # corresponding podspec's.
-  pod 'Firebase/Core', '5.3.0'
+  pod 'Firebase/Core', '5.4.0'
 
   target 'Core_Tests_iOS' do
     inherit! :search_paths

Firebase/Core/FIROptions.m

@@ -43,7 +43,7 @@
 NSString *const kFIRLibraryVersionID =
     @"5"     // Major version (one or more digits)
     @"00"    // Minor version (exactly 2 digits)
-    @"04"    // Build number (exactly 2 digits)
+    @"05"    // Build number (exactly 2 digits)
     @"000";  // Fixed "000"
 // Plist file name.
 NSString *const kServiceInfoFileName = @"GoogleService-Info";

Firebase/Messaging/CHANGELOG.md

@@ -1,3 +1,7 @@
+# Unreleased
+- Fixed an issue where Messaging wouldn't properly unswizzle swizzled delegate
+  methods. (#1481)
+
 # 2018-07-10 -- v3.0.3
 - Fixed an issue that client should suspend the topic requests when token is not available and resume the topic operation when the token is generated.
 - Corrected the deprecation warning when subscribing to or unsubscribing from an invalid topic. (#1397)

Firebase/Messaging/FIRMessaging+FIRApp.m

@@ -26,12 +26,6 @@
 #import "FIRMessagingVersionUtilities.h"
 #import "FIRMessaging_Private.h"
 
-@interface FIRMessaging ()
-
-@property(nonatomic, readwrite, strong) NSString *fcmSenderID;
-
-@end
-
 @implementation FIRMessaging (FIRApp)
 
 + (void)load {
@@ -58,22 +52,6 @@ + (void)didReceiveConfigureSDKNotification:(NSNotification *)notification {
 }
 
 - (void)configureMessaging:(FIRApp *)app {
-  FIROptions *options = app.options;
-  NSError *error;
-  if (!options.GCMSenderID.length) {
-    error =
-        [FIRApp errorForSubspecConfigurationFailureWithDomain:kFirebaseCloudMessagingErrorDomain
-                                                    errorCode:FIRErrorCodeCloudMessagingFailed
-                                                      service:kFIRServiceMessaging
-                                                       reason:@"Google Sender ID must not be nil"
-                                                              @" or empty."];
-    [self exitApp:app withError:error];
-    return;
-  }
-
-  self.fcmSenderID = [options.GCMSenderID copy];
-  self.globalAutomaticDataCollectionEnabled = [app isAutomaticDataCollectionEnabled];
-
   // Swizzle remote-notification-related methods (app delegate and UNUserNotificationCenter)
   if ([FIRMessagingRemoteNotificationsProxy canSwizzleMethods]) {
     NSString *docsURLString = @"https://firebase.google.com/docs/cloud-messaging/ios/client"

Firebase/Messaging/FIRMessaging.m

@@ -36,6 +36,7 @@
 #import "FIRMessagingUtilities.h"
 #import "FIRMessagingVersionUtilities.h"
 
+#import <FirebaseCore/FIRAppInternal.h>
 #import <FirebaseCore/FIRReachabilityChecker.h>
 #import <FirebaseInstanceID/FirebaseInstanceID.h>
 
@@ -127,7 +128,6 @@ @interface FIRMessaging ()<FIRMessagingClientDelegate, FIRMessagingReceiverDeleg
                            FIRReachabilityDelegate>
 
 // FIRApp properties
-@property(nonatomic, readwrite, copy) NSString *fcmSenderID;
 @property(nonatomic, readwrite, strong) NSData *apnsTokenData;
 @property(nonatomic, readwrite, strong) NSString *defaultFcmToken;
 
@@ -173,10 +173,6 @@ - (instancetype)initWithInstanceID:(FIRInstanceID *)instanceID
     _loggedMessageIDs = [NSMutableSet set];
     _instanceID = instanceID;
     _messagingUserDefaults = defaults;
-
-    // TODO: Remove this once the race condition with FIRApp configuring and InstanceID
-    //       is fixed. This must be fixed before Core's flag becomes public.
-    _globalAutomaticDataCollectionEnabled = YES;
   }
   return self;
 }
@@ -479,7 +475,7 @@ - (BOOL)isAutoInitEnabled {
   }
 
   // If none of above exists, we default to the global switch that comes from FIRApp.
-  return self.isGlobalAutomaticDataCollectionEnabled;
+  return [[FIRApp defaultApp] isAutomaticDataCollectionEnabled];
 }
 
 - (void)setAutoInitEnabled:(BOOL)autoInitEnabled {

Firebase/Messaging/FIRMessagingRemoteNotificationsProxy.m

@@ -211,7 +211,7 @@ - (void)listenForDelegateChangesInUserNotificationCenter:(id)notificationCenter
 
 #pragma mark - UNNotificationCenter Swizzling
 
-- (void)swizzleUserNotificationCenterDelegate:(id)delegate {
+- (void)swizzleUserNotificationCenterDelegate:(id _Nonnull)delegate {
   if (self.currentUserNotificationCenterDelegate == delegate) {
     // Via pointer-check, compare if we have already swizzled this item.
     return;
@@ -246,7 +246,7 @@ - (void)swizzleUserNotificationCenterDelegate:(id)delegate {
   }
 }
 
-- (void)unswizzleUserNotificationCenterDelegate:(id)delegate {
+- (void)unswizzleUserNotificationCenterDelegate:(id _Nonnull)delegate {
   if (self.currentUserNotificationCenterDelegate != delegate) {
     // We aren't swizzling this delegate, so don't do anything.
     return;
@@ -256,6 +256,10 @@ - (void)unswizzleUserNotificationCenterDelegate:(id)delegate {
   // Call unswizzle methods, even if the method was not implemented (it will fail gracefully).
   [self unswizzleSelector:willPresentNotificationSelector
                   inClass:[self.currentUserNotificationCenterDelegate class]];
+  SEL didReceiveNotificationResponseSelector =
+      NSSelectorFromString(kUserNotificationDidReceiveResponseSelectorString);
+  [self unswizzleSelector:didReceiveNotificationResponseSelector
+                  inClass:[self.currentUserNotificationCenterDelegate class]];
   self.currentUserNotificationCenterDelegate = nil;
   self.hasSwizzledUserNotificationDelegate = NO;
 }

Firebase/Messaging/FIRMessaging_Private.h

@@ -38,9 +38,6 @@ FOUNDATION_EXPORT NSString *const kFIRMessagingUserDefaultsKeyAutoInitEnabled;
 
 #pragma mark - Private API
 
-// The data collection flag from Core.
-@property(nonatomic, readwrite, getter=isGlobalAutomaticDataCollectionEnabled) BOOL globalAutomaticDataCollectionEnabled;
-
 - (NSString *)defaultFcmToken;
 - (FIRMessagingClient *)client;
 - (FIRMessagingPubSub *)pubsub;

FirebaseAuth.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseAuth'
-  s.version          = '5.0.1'
+  s.version          = '5.0.2'
   s.summary          = 'The official iOS client for Firebase Authentication (plus community support for macOS and tvOS)'
 
   s.description      = <<-DESC

FirebaseCore.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseCore'
-  s.version          = '5.0.4'
+  s.version          = '5.0.5'
   s.summary          = 'Firebase Core for iOS (plus community support for macOS and tvOS)'
 
   s.description      = <<-DESC
@@ -35,6 +35,6 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration
   s.pod_target_xcconfig = {
     'OTHER_CFLAGS' => '-fno-autolink',
     'GCC_PREPROCESSOR_DEFINITIONS' =>
-      'FIRCore_VERSION=' + s.version.to_s + ' Firebase_VERSION=5.3.0'
+      'FIRCore_VERSION=' + s.version.to_s + ' Firebase_VERSION=5.4.0'
   }
 end

FirebaseDatabase.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseDatabase'
-  s.version          = '5.0.1'
+  s.version          = '5.0.2'
   s.summary          = 'Firebase Open Source Libraries for iOS (plus community support for macOS and tvOS)'
 
   s.description      = <<-DESC

FirebaseFirestore.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseFirestore'
-  s.version          = '0.12.4'
+  s.version          = '0.12.5'
   s.summary          = 'Google Cloud Firestore for iOS'
 
   s.description      = <<-DESC

FirebaseFunctions.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseFunctions'
-  s.version          = '2.0.0'
+  s.version          = '2.1.0'
   s.summary          = 'Cloud Functions for Firebase iOS SDK.'
 
   s.description      = <<-DESC

FirebaseMessaging.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseMessaging'
-  s.version          = '3.0.2'
+  s.version          = '3.0.3'
   s.summary          = 'Firebase Messaging for iOS'
 
   s.description      = <<-DESC

Firestore/Example/FuzzTests/FSTFuzzTestsPrincipal.mm

@@ -18,16 +18,27 @@
 
 #include "LibFuzzer/FuzzerDefs.h"
 
+#include "Firestore/core/src/firebase/firestore/model/database_id.h"
 #include "Firestore/core/src/firebase/firestore/remote/serializer.h"
 
+using firebase::firestore::model::DatabaseId;
 using firebase::firestore::remote::Serializer;
 
 namespace {
 
 // Fuzz-test the deserialization process in Firestore. The Serializer reads raw
 // bytes and converts them to a model object.
 void FuzzTestDeserialization(const uint8_t *data, size_t size) {
-  // TODO(minafarid): fuzz-test Serializer.
+  DatabaseId database_id{"project", DatabaseId::kDefault};
+  Serializer serializer{database_id};
+
+  @try {
+    serializer.DecodeFieldValue(data, size);
+  } @catch (...) {
+    // Caught exceptions are ignored because the input might be malformed and
+    // the deserialization might throw an error as intended. Fuzzing focuses on
+    // runtime errors that are detected by the sanitizers.
+  }
 }
 
 // Contains the code to be fuzzed. Called by the fuzzing library with

Firestore/Example/Podfile

@@ -10,7 +10,7 @@ target 'Firestore_Example_iOS' do
   # The next line is the forcing function for the Firebase pod. The Firebase
   # version's subspecs should depend on the component versions in their
   # corresponding podspec's.
-  pod 'Firebase/Core', '5.3.0'
+  pod 'Firebase/Core', '5.4.0'
 
   pod 'FirebaseAuth', :path => '../../'
   pod 'FirebaseCore', :path => '../../'

Firestore/core/src/firebase/firestore/core/CMakeLists.txt

@@ -19,6 +19,8 @@ cc_library(
     database_info.h
     target_id_generator.cc
     target_id_generator.h
+    query.cc
+    query.h
   DEPENDS
     absl_strings
     firebase_firestore_model

Firestore/core/src/firebase/firestore/core/query.cc

@@ -0,0 +1,61 @@
+/*
+ * 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.
+ */
+
+#include "Firestore/core/src/firebase/firestore/core/query.h"
+
+#include "Firestore/core/src/firebase/firestore/model/document_key.h"
+#include "Firestore/core/src/firebase/firestore/model/resource_path.h"
+
+namespace firebase {
+namespace firestore {
+namespace core {
+
+using model::Document;
+using model::DocumentKey;
+using model::ResourcePath;
+
+bool Query::Matches(const Document& doc) const {
+  return MatchesPath(doc) && MatchesOrderBy(doc) && MatchesFilters(doc) &&
+         MatchesBounds(doc);
+}
+
+bool Query::MatchesPath(const Document& doc) const {
+  ResourcePath doc_path = doc.key().path();
+  if (DocumentKey::IsDocumentKey(path_)) {
+    return path_ == doc_path;
+  } else {
+    return path_.IsPrefixOf(doc_path) && path_.size() == doc_path.size() - 1;
+  }
+}
+
+bool Query::MatchesFilters(const Document&) const {
+  // TODO(rsgowman): Implement this correctly.
+  return true;
+}
+
+bool Query::MatchesOrderBy(const Document&) const {
+  // TODO(rsgowman): Implement this correctly.
+  return true;
+}
+
+bool Query::MatchesBounds(const Document&) const {
+  // TODO(rsgowman): Implement this correctly.
+  return true;
+}
+
+}  // namespace core
+}  // namespace firestore
+}  // namespace firebase