Integrate Latest @ 144490897

Changes to admob/testapp ... - Fix tag on logger element. Changes to messaging/testapp ... - Add iOS 10 SDK UserNotifications framework to Messaging testapp xcode project. - Update Firebase C++ Messaging notification code to use the Xcode 8 (iOS 10) SDK. Changes to storage/testapp ... - Force the Storage documents path to have a trailing slash, as with some SDKs it's not provided with a slash by the API. - Fixed output log message for GetDownloadUrl test. CL: 144490897

Author: jonsimantov

admob/testapp/src/android/java/com/google/firebase/example/LoggingUtils.java

@@ -33,6 +33,7 @@ public static void initLogWindow(Activity activity) {
  LinearLayout linearLayout = new LinearLayout(activity);
  ScrollView scrollView = new ScrollView(activity);
  TextView textView = new TextView(activity);
+ textView.setTag("Logger");
  linearLayout.addView(scrollView);
  scrollView.addView(textView);
  Window window = activity.getWindow();

messaging/testapp/testapp.xcodeproj/project.pbxproj

@@ -15,6 +15,7 @@
 529227241C85FB7600C89379 /* ios_main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 529227221C85FB7600C89379 /* ios_main.mm */; };
 52B71EBB1C8600B600398745 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 52B71EBA1C8600B600398745 /* Images.xcassets */; };
 D66B16871CE46E8900E5638A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D66B16861CE46E8900E5638A /* LaunchScreen.storyboard */; };
+D6E5B5581E29779D00CC1BF8 /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D6E5B5571E29779D00CC1BF8 /* UserNotifications.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -30,13 +31,15 @@
 52B71EBA1C8600B600398745 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = testapp/Images.xcassets; sourceTree = "<group>"; };
 52FD1FF81C85FFA000BC68E3 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = testapp/Info.plist; sourceTree = "<group>"; };
 D66B16861CE46E8900E5638A /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
+D6E5B5571E29779D00CC1BF8 /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 529226CF1C85F68000C89379 /* Frameworks */ = {
 isa = PBXFrameworksBuildPhase;
 buildActionMask = 2147483647;
 files = (
+D6E5B5581E29779D00CC1BF8 /* UserNotifications.framework in Frameworks */,
 529226D81C85F68000C89379 /* CoreGraphics.framework in Frameworks */,
 529226DA1C85F68000C89379 /* UIKit.framework in Frameworks */,
 529226D61C85F68000C89379 /* Foundation.framework in Frameworks */,
@@ -70,6 +73,7 @@
 529226D41C85F68000C89379 /* Frameworks */ = {
 isa = PBXGroup;
 children = (
+D6E5B5571E29779D00CC1BF8 /* UserNotifications.framework */,
 529226D51C85F68000C89379 /* Foundation.framework */,
 529226D71C85F68000C89379 /* CoreGraphics.framework */,
 529226D91C85F68000C89379 /* UIKit.framework */,

storage/testapp/src/common_main.cc

@@ -156,8 +156,8 @@ extern "C" int common_main(int argc, const char* argv[]) {
  firebase::storage::StorageReference ref =
  storage->GetReference("test_app_data").Child(saved_url);
 
- LogMessage("Saved url: %s/test_app_data/%s", ref.bucket().c_str(),
- ref.name().c_str());
+ LogMessage("Storage URL: gs://%s/%s", ref.bucket().c_str(),
+ ref.full_path().c_str());
 
  // Read and write from memory. This will save a small file and then read it
  // back from the storage to confirm that it was uploaded. Then it will remove

storage/testapp/src/ios/ios_main.mm

@@ -62,7 +62,9 @@ bool ProcessEvents(int msec) {
  NSArray<NSString *> *paths =
  NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
  NSString *documentsDirectory = paths.firstObject;
- return std::string(documentsDirectory.UTF8String);
+ // Force a trailing slash by removing any that exists, then appending another.
+ return std::string(
+ [[documentsDirectory stringByStandardizingPath] stringByAppendingString:@"/"].UTF8String);
 }
 
 WindowContext GetWindowContext() {