Merge remote-tracking branch 'origin/master' into ghm

Author: a-maurice

Android/firebase_dependencies.gradle

@@ -16,22 +16,22 @@ import org.gradle.util.ConfigureUtil;
 
 // A map of library to the dependencies that need to be added for it.
 def firebaseDependenciesMap = [
-  'app' : ['com.google.firebase:firebase-analytics:17.2.1'],
+  'app' : ['com.google.firebase:firebase-analytics:17.2.2'],
   'admob' : ['com.google.firebase:firebase-ads:18.3.0',
-             'com.google.android.gms:play-services-measurement-sdk-api:17.2.1'],
-  'analytics' : ['com.google.firebase:firebase-analytics:17.2.1'],
+             'com.google.android.gms:play-services-measurement-sdk-api:17.2.2'],
+  'analytics' : ['com.google.firebase:firebase-analytics:17.2.2'],
   'auth' : ['com.google.firebase:firebase-auth:19.2.0'],
-  'database' : ['com.google.firebase:firebase-database:19.2.0'],
+  'database' : ['com.google.firebase:firebase-database:19.2.1'],
   'dynamic_links' : ['com.google.firebase:firebase-dynamic-links:19.0.0'],
-  'functions' : ['com.google.firebase:firebase-functions:19.0.1'],
+  'functions' : ['com.google.firebase:firebase-functions:19.0.2'],
   'instance_id' : ['com.google.firebase:firebase-iid:20.0.2'],
   'invites' : ['com.google.firebase:firebase-invites:17.0.0'],
   // Messaging has an additional local dependency to include.
   'messaging' : ['com.google.firebase:firebase-messaging:20.1.0',
                  'firebase_cpp_sdk.messaging:messaging_java'],
-  'performance' : ['com.google.firebase:firebase-perf:19.0.4'],
-  'remote_config' : ['com.google.firebase:firebase-config:19.1.0'],
-  'storage' : ['com.google.firebase:firebase-storage:19.1.0']
+  'performance' : ['com.google.firebase:firebase-perf:19.0.5'],
+  'remote_config' : ['com.google.firebase:firebase-config:19.1.1'],
+  'storage' : ['com.google.firebase:firebase-storage:19.1.1']
 ]
 
 // A map of library to the gradle resources that they depend upon.

CMakeLists.txt

@@ -120,6 +120,18 @@ endif()
 
 # Some of the external libraries are not used for mobile.
 if (NOT ANDROID AND NOT IOS)
+  # Use the static versions of the OpenSSL libraries.
+  set(OPENSSL_USE_STATIC_LIBS TRUE)
+  if (MSVC)
+    # Get the correct version of the OpenSSL libraries based on building for MT.
+    if ("${CMAKE_CXX_FLAGS_DEBUG}" MATCHES "/MT" OR
+        "${CMAKE_CXX_FLAGS_RELEASE}" MATCHES "/MT")
+      set(OPENSSL_MSVC_STATIC_RT TRUE)
+    else()
+      set(OPENSSL_MSVC_STATIC_RT FALSE)
+    endif()
+  endif()
+
   # Build curl as a static library
   set(CURL_STATICLIB ON CACHE BOOL "")
   if (WIN32)
@@ -185,7 +197,7 @@ if (NOT ANDROID AND NOT IOS)
     )
     target_link_libraries(libuWS
       PRIVATE
-        ${OPENSSL_SSL_LIBRARY}
+        ${OPENSSL_LIBRARIES}
         uv_a
         zlibstatic
     )

admob/admob_resources/build.gradle

@@ -45,7 +45,7 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:17.2.1'
+  implementation 'com.google.firebase:firebase-analytics:17.2.2'
   implementation 'com.google.firebase:firebase-ads:18.3.0'
 }
 

app/app_resources/build.gradle

@@ -46,7 +46,7 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:17.2.1'
+  implementation 'com.google.firebase:firebase-analytics:17.2.2'
 }
 
 afterEvaluate {

app/google_api_resources/build.gradle

@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:17.2.1'
+  implementation 'com.google.firebase:firebase-analytics:17.2.2'
   implementation project(':app:app_resources')
 }
 

app/invites_resources/build.gradle

@@ -45,7 +45,7 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:17.2.1'
+  implementation 'com.google.firebase:firebase-analytics:17.2.2'
   implementation 'com.google.firebase:firebase-dynamic-links:19.0.0'
   implementation project(':app:app_resources')
 }

app/rest/CMakeLists.txt

@@ -76,6 +76,7 @@ target_link_libraries(firebase_rest_lib
     flatbuffers
     libcurl
     zlibstatic
+    ${CMAKE_DL_LIBS}
 )
 # Automatically include headers that might not be declared.
 if(MSVC)

app/src/app_options.cc

@@ -179,9 +179,9 @@ bool AppOptions::PopulateRequiredWithDefaults(
     JNIEnv* jni_env, jobject activity
 #endif  // FIREBASE_PLATFORM_ANDROID
 ) {
-  // Populate App ID and API key from the default options if they're not
-  // specified.
-  if (app_id_.empty() || api_key_.empty()) {
+  // Populate App ID, API key, and Project ID from the default options if
+  // they're not specified.
+  if (app_id_.empty() || api_key_.empty() || project_id_.empty()) {
     AppOptions default_options;
     if (AppOptions::LoadDefault(&default_options
 #if FIREBASE_PLATFORM_ANDROID
@@ -190,13 +190,15 @@ bool AppOptions::PopulateRequiredWithDefaults(
                                 )) {
       if (app_id_.empty()) app_id_ = default_options.app_id_;
       if (api_key_.empty()) api_key_ = default_options.api_key_;
+      if (project_id_.empty()) project_id_ = default_options.project_id_;
     } else {
       LogError("Failed to load default options when attempting to populate "
                "missing fields");
     }
   }
-  if (app_id_.empty() || api_key_.empty()) {
-    LogError("App ID and API key must be specified in App options.");
+  if (app_id_.empty() || api_key_.empty() || project_id_.empty()) {
+    LogError(
+        "App ID, API key, and Project ID must be specified in App options.");
     return false;
   }
   return true;

app/src/callback.cc

@@ -18,6 +18,7 @@
 
 #include <list>
 
+#include "app/memory/shared_ptr.h"
 #include "app/src/log.h"
 #include "app/src/mutex.h"
 #include "app/src/semaphore.h"
@@ -32,7 +33,7 @@ namespace callback {
 
 class CallbackEntry;
 
-class CallbackQueue : public std::list<CallbackEntry*> {
+class CallbackQueue : public std::list<SharedPtr<CallbackEntry>> {
  public:
   CallbackQueue() {}
   ~CallbackQueue() {}
@@ -51,7 +52,7 @@ class CallbackEntry {
   // callback_mutex_ is used to enforce a critical section for callback
   // execution and destruction.
   CallbackEntry(Callback* callback, Mutex* callback_mutex)
-      : callback_(callback), mutex_(callback_mutex) {}
+      : callback_(callback), mutex_(callback_mutex), executing_(false) {}
 
   // Destroy the callback.  This blocks if the callback is currently
   // executing.
@@ -61,35 +62,47 @@ class CallbackEntry {
   // Returns true if a callback was associated with this entry and was executed,
   // false otherwise.
   bool Execute() {
-    bool executed = false;
-    MutexLock lock(*mutex_);
-    if (callback_) {
-      callback_->Run();
-      // Note: The implementation of BlockingCallback below relies on the
-      // callback being disabled after being run. If that changes, please
-      // make sure to also update BlockingCallback.
-      DisableCallback();
-      executed = true;
+    {
+      MutexLock lock(*mutex_);
+      if (!callback_) return false;
+      executing_ = true;
     }
-    return executed;
+
+    callback_->Run();
+
+    {
+      MutexLock lock(*mutex_);
+      executing_ = false;
+    }
+
+    // Note: The implementation of BlockingCallback below relies on the
+    // callback being disabled after being run. If that changes, please
+    // make sure to also update BlockingCallback.
+    DisableCallback();
+
+    return true;
   }
 
   // Remove the callback method from this entry.
   bool DisableCallback() {
-    MutexLock lock(*mutex_);
-    if (callback_) {
-      delete callback_;
+    Callback* callback_to_delete = nullptr;
+    {
+      MutexLock lock(*mutex_);
+      if (executing_ || !callback_) return false;
+      callback_to_delete = callback_;
       callback_ = nullptr;
-      return true;
     }
-    return false;
+    delete callback_to_delete;
+    return true;
   }
 
  private:
   // Callback to call from PollCallbacks().
   Callback* callback_;
-  // Mutex that is held when modifying callback_.
+  // Mutex that is held when modifying callback_ and executing_.
   Mutex* mutex_;
+  // A flag set to true when callback_ is about to be called.
+  bool executing_;
 };
 
 // Dispatches a queue of callbacks.
@@ -106,18 +119,18 @@ class CallbackDispatcher {
                  remaining_callbacks);
     }
     while (!queue_.empty()) {
-      delete queue_.back();
+      queue_.back().reset();
       queue_.pop_back();
     }
   }
 
   // Add a callback to the dispatch queue returning a reference
   // to the entry which can be optionally be removed prior to dispatch.
   void* AddCallback(Callback* callback) {
-    CallbackEntry* entry = new CallbackEntry(callback, &execution_mutex_);
+    auto entry = MakeShared<CallbackEntry>(callback, &execution_mutex_);
     MutexLock lock(*queue_.mutex());
     queue_.push_back(entry);
-    return entry;
+    return entry.get();
   }
 
   // Remove the callback reference from the specified entry.
@@ -137,16 +150,19 @@ class CallbackDispatcher {
   int DispatchCallbacks() {
     int dispatched = 0;
     Mutex* queue_mutex = queue_.mutex();
-    MutexLock lock(*queue_mutex);
+    queue_mutex->Acquire();
     while (!queue_.empty()) {
-      CallbackEntry* callback_entry = queue_.front();
+      // Make a copy of the SharedPtr in case FlushCallbacks() is called
+      // currently.
+      SharedPtr<CallbackEntry> callback_entry = queue_.front();
       queue_.pop_front();
       queue_mutex->Release();
       callback_entry->Execute();
       dispatched++;
       queue_mutex->Acquire();
-      delete callback_entry;
+      callback_entry.reset();
     }
+    queue_mutex->Release();
     return dispatched;
   }
 
@@ -155,7 +171,7 @@ class CallbackDispatcher {
     int flushed = 0;
     MutexLock lock(*queue_.mutex());
     while (!queue_.empty()) {
-      delete queue_.front();
+      queue_.front().reset();
       queue_.pop_front();
       flushed++;
     }
@@ -299,7 +315,7 @@ void RemoveCallback(void* callback_reference) {
     // remove the CallbackEntry from the queue so we don't need an additional
     // Terminate() here to decrement the reference count that was added by
     // AddCallback().
-    static_cast<CallbackEntry*>(callback_reference)->DisableCallback();
+    g_callback_dispatcher->DisableCallback(callback_reference);
     Terminate(false);
   }
 }

app/src/tests/runner/ios/FIRAppDelegate.h

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2020 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 "UIKit/UIKit.h"
+
+@interface FIRAppDelegate : UIResponder <UIApplicationDelegate>
+
+@property(strong, nonatomic) UIWindow *window;
+
+@end

app/src/tests/runner/ios/FIRAppDelegate.m

@@ -0,0 +1,57 @@
+/*
+ * Copyright 2020 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 "FIRAppDelegate.h"
+
+@implementation FIRAppDelegate
+
+- (BOOL)application:(UIApplication *)application
+    didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+  // Override point for customization after application launch.
+  return YES;
+}
+
+- (void)applicationWillResignActive:(UIApplication *)application {
+  // Sent when the application is about to move from active to inactive state. This can occur for
+  // certain types of temporary interruptions (such as an incoming phone call or SMS message) or
+  // when the user quits the application and it begins the transition to the background state. Use
+  // this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates.
+  // Games should use this method to pause the game.
+}
+
+- (void)applicationDidEnterBackground:(UIApplication *)application {
+  // Use this method to release shared resources, save user data, invalidate timers, and store
+  // enough application state information to restore your application to its current state in case
+  // it is terminated later. If your application supports background execution, this method is
+  // called instead of applicationWillTerminate: when the user quits.
+}
+
+- (void)applicationWillEnterForeground:(UIApplication *)application {
+  // Called as part of the transition from the background to the inactive state; here you can undo
+  // many of the changes made on entering the background.
+}
+
+- (void)applicationDidBecomeActive:(UIApplication *)application {
+  // Restart any tasks that were paused (or not yet started) while the application was inactive. If
+  // the application was previously in the background, optionally refresh the user interface.
+}
+
+- (void)applicationWillTerminate:(UIApplication *)application {
+  // Called when the application is about to terminate. Save data if appropriate. See also
+  // applicationDidEnterBackground:.
+}
+
+@end

app/src/tests/runner/ios/FIRViewController.h

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2020 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 "UIKit/UIKit.h"
+
+@interface FIRViewController : UIViewController
+
+@end