Merge branch 'main' of https://github.com/firebase/firebase-cpp-sdk

Author: jonsimantov

app/rest/request_options.h

@@ -45,7 +45,8 @@ struct RequestOptions {
   bool stream_post_fields;
   // Stores key-value pairs in header.
   std::map<std::string, std::string> header;
-  // The maximum time in milliseconds to allow the request and response.
+  // The maximum time in milliseconds to allow the request and response
+  // (or 0 for no timeout).
   int64_t timeout_ms;
 
   // Set true to make the library display more verbose info to help debug. Does

gma/src/ios/FADNativeDelegate.h

@@ -32,7 +32,7 @@ class NativeAdInternalIOS;
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface FADNativeDelegate : NSObject <GADNativeAdLoaderDelegate, GADAdLoaderDelegate>
+@interface FADNativeDelegate : NSObject <GADNativeAdLoaderDelegate, GADAdLoaderDelegate, GADNativeAdDelegate>
 
 /// Returns a FADNativeDelegate object with NativeAdInternalIOS.
 - (FADNativeDelegate *)initWithInternalNativeAd:

gma/src/ios/native_ad_internal_ios.mm

@@ -220,6 +220,7 @@
 
 void NativeAdInternalIOS::NativeAdDidReceiveAd(GADNativeAd *ad) {
   firebase::MutexLock lock(mutex_);
+  ad.delegate = native_ad_delegate_;
   native_ad_ = ad;
 
   NSObject *gad_icon = ad.icon;

release_build_files/readme.md

@@ -639,6 +639,7 @@ code.
       GoogleUserMessagingPlatform version 2.3.0.
     - GMA (Android): Updated dependency to play-services-ads version 23.0.0 and
       user-messaging-platform version 2.2.0.
+    - Storage (Desktop): Removed 5-minute timeout for uploads and downloads.
 
 ### 11.9.0
 -   Changes

storage/src/desktop/storage_reference_desktop.cc

@@ -238,6 +238,9 @@ void StorageReferenceInternal::PrepareRequestBlocking(
   request->set_url(url);
   request->set_method(method);
 
+  // Set this request to have no timeout.
+  request->options().timeout_ms = 0;
+
   // Fetch auth token and apply it, if there is one:
   std::string token = storage_->GetAuthToken();
   if (token.length() > 0) {