Integrate Latest @ 122440465

Changes to admob/testapp ... - Fixed clean up of Banner View and Interstitial Ad helper classes. - Updates testapp/build.gradle files to use current tools. Fixes several broken gradle builds. - Adds a LaunchScreen storyboard to the AdMob testapp to remvove black bars on top and bottom of simulator. - Fix old podfile versions in Auth, Admob, RemoteConfig - Cleans up log messages in AdMob testapp common_main.cc. - Adding logging output window to admob testapp. Includes both ios and android. - Use console.firebase.google.com instead of g.co/firebase Changes to analytics/testapp ... - Integrated desktop_main.cc changes to all test applications. - Updates testapp/build.gradle files to use current tools. Fixes several broken gradle builds. - Added storyboard to Analytics test app missing from cl/122311484 - Clean up before shutting down the Analytics test application. - Migrate changes from admob testapp to other testapps. - Removed duplicated title string from test applications. - Updated Analytics testapp dependencies to latest Pods and aars. - Mirror logging changes from admob across all samples. Changes to auth/testapp ... - Integrated desktop_main.cc changes to all test applications. - Auth test application shutdown. - Added desktop test application for each API. - Updates testapp/build.gradle files to use current tools. Fixes several broken gradle builds. - Removed TODOs and temporary code, and filed bugs for them. - Fix old podfile versions in Auth, Admob, RemoteConfig - Migrate changes from admob testapp to other testapps. - Removed duplicated title string from test applications. - Add Twitter and GitHub credential support. - Change all API interfaces to return Future rather than const Future&. - Put auth under firebase::auth namespace, instead of just firebase. - Mirror logging changes from admob across all samples. Changes to invites/testapp ... - Remove ios_main.h from Invites xcode project. - Integrated desktop_main.cc changes to all test applications. - Clean up before shutting down the Invites test application. - Added desktop test application for each API. - Updates testapp/build.gradle files to use current tools. Fixes several broken gradle builds. - Migrate changes from admob testapp to other testapps. - Removed duplicated title string from test applications. - Fix iOS build dependencies (Podfile) for Invites. - Updated build.gradle to match the dependencies that Invites quickstart uses for M8. - Mirror logging changes from admob across all samples. Changes to messaging/testapp ... - Integrated desktop_main.cc changes to all test applications. - Added desktop test application for each API. - Updates testapp/build.gradle files to use current tools. Fixes several broken gradle builds. - Updated the sample app to work around the known issue where the app does notrespond to data/notification messages when in the background. - Fixed re-initialization of the Firebase Messaging test application. - Migrate changes from admob testapp to other testapps. - Fixed notification of instance IDs in the messaging test application. - Removed "Main tick" message from messaging test application. - Removed duplicated title string from test applications. - Updating iOS Messaging to M8. This is a breaking change for the release config. - Mirror logging changes from admob across all samples. Changes to remote_config/testapp ... - Integrated desktop_main.cc changes to all test applications. - Added desktop test application for each API. - Updates testapp/build.gradle files to use current tools. Fixes several broken gradle builds. - Clean up before shutting down the Remote Config test application. - Fix old podfile versions in Auth, Admob, RemoteConfig - Migrate changes from admob testapp to other testapps. - Removed duplicated title string from test applications. - Remove the asserts for default values in the Remote Config testapp. - Update the Remote Config podfile and build.gradle - Change Remote Config's SetDefault use of map to an array of typedef pair. CL: 122440465

Author: Stewart Miles

admob/testapp/LaunchScreen.storyboard

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6211" systemVersion="14A298i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+ <dependencies>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6204"/>
+ </dependencies>
+ <scenes/>
+</document>

admob/testapp/Podfile

@@ -3,6 +3,6 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '7.0'
 # AdMob test application.
 target 'testapp' do
- pod 'Firebase/Core', '3.1.1'
- pod 'Google-Mobile-Ads-SDK', '~> 7.7’
+ pod 'Firebase/AdMob'
+ pod 'Firebase/Core', '3.1.6'
 end

admob/testapp/build.gradle

@@ -5,8 +5,8 @@ buildscript {
  jcenter()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:1.5.0'
- classpath 'com.google.gms:google-services:1.5.1-beta2'
+ classpath 'com.android.tools.build:gradle:2.0.0'
+ classpath 'com.google.gms:google-services:3.0.0'
  }
 }
 
@@ -59,7 +59,7 @@ project.ext {
 
 android {
  compileSdkVersion 23
- buildToolsVersion '23.0.1'
+ buildToolsVersion '23.0.2'
 
  sourceSets {
  main {
@@ -89,7 +89,7 @@ android {
 
 dependencies {
  compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.google.android.gms:play-services-ads:8.5.4'
+ compile 'com.google.android.gms:play-services-ads:9.0.0'
 }
 
 apply plugin: 'com.google.gms.google-services'

admob/testapp/readme.md

@@ -34,7 +34,7 @@ Getting Started
  - For further details please refer to the
  [general instructions for setting up an iOS app with Firebase](https://developers.google.com/firebase/docs/ios/setup).
  - Register your iOS app with Firebase.
- - Create a new app on [Firebase console](https://g.co/firebase), and attach
+ - Create a new app on the [Firebase console](https://console.firebase.google.com), and attach
  your iOS app to it.
  - You can use "com.google.ios.admob.testapp" as the iOS Bundle ID
  while you're testing. You can omit App Store ID while testing.
@@ -44,7 +44,7 @@ Getting Started
  - You will need to either,
  1. Check "Copy items if needed" when adding the frameworks, or
  2. Add the framework path in "Framework Search Paths"
- - e.g. If you downloaded the Firebase C++ SDK to
+ - For example, if you downloaded the Firebase C++ SDK to
  `/Users/me/firebase_cpp_sdk`,
  then you would add the path
  `/Users/me/firebase_cpp_sdk/frameworks/ios/universal`.
@@ -61,7 +61,7 @@ Getting Started
 
 ### Android
  - Register your Android app with Firebase.
- - Create a new app on [Firebase console](https://g.co/firebase), and attach
+ - Create a new app on the [Firebase console](https://console.firebase.google.com), and attach
  your Android app to it.
  - You can use "com.google.android.admob.testapp" as the Package Name
  while you're testing.

admob/testapp/src/android/android_main.cc

@@ -13,60 +13,243 @@
 // limitations under the License.
 
 #include <stdarg.h>
+#include <stdio.h>
 
 #include <android/log.h>
 #include <android_native_app_glue.h>
+#include <pthread.h>
+#include <cassert>
 
 #include "main.h" // NOLINT
 
 // This implementation is derived from http://github.com/google/fplutil
 
-extern "C" int common_main(void* ad_parent);
+extern "C" int common_main(int argc, const char* argv[]);
 
-static struct android_app* gAppState = nullptr;
+static struct android_app* g_app_state = nullptr;
+static bool g_destroy_requested = false;
+static bool g_started = false;
+static bool g_restarted = false;
+static pthread_mutex_t g_started_mutex;
+
+// Handle state changes from via native app glue.
+static void OnAppCmd(struct android_app* app, int32_t cmd) {
+ g_destroy_requested |= cmd == APP_CMD_DESTROY;
+}
 
 // Process events pending on the main thread.
-bool ProcessAndroidEvents(int msec) {
+// Returns true when the app receives an event requesting exit.
+bool ProcessEvents(int msec) {
  struct android_poll_source* source = nullptr;
  int events;
  int looperId = ALooper_pollAll(msec, nullptr, &events,
  reinterpret_cast<void**>(&source));
  if (looperId >= 0 && source) {
- source->process(gAppState, source);
+ source->process(g_app_state, source);
+ }
+ return g_destroy_requested | g_restarted;
+}
+
+// Get the activity.
+jobject GetActivity() { return g_app_state->activity->clazz; }
+
+// Get the window context. For Android, it's a jobject pointing to the Activity.
+jobject GetWindowContext() { return g_app_state->activity->clazz; }
+
+// Find a class, attempting to load the class if it's not found.
+jclass FindClass(JNIEnv* env, jobject activity_object, const char* class_name) {
+ jclass class_object = env->FindClass(class_name);
+ if (env->ExceptionCheck()) {
+ env->ExceptionClear();
+ // If the class isn't found it's possible NativeActivity is being used by
+ // the application which means the class path is set to only load system
+ // classes. The following falls back to loading the class using the
+ // Activity before retrieving a reference to it.
+ jclass activity_class = env->FindClass("android/app/Activity");
+ jmethodID activity_get_class_loader = env->GetMethodID(
+ activity_class, "getClassLoader", "()Ljava/lang/ClassLoader;");
+
+ jobject class_loader_object =
+ env->CallObjectMethod(activity_object, activity_get_class_loader);
+
+ jclass class_loader_class = env->FindClass("java/lang/ClassLoader");
+ jmethodID class_loader_load_class =
+ env->GetMethodID(class_loader_class, "loadClass",
+ "(Ljava/lang/String;)Ljava/lang/Class;");
+ jstring class_name_object = env->NewStringUTF(class_name);
+
+ class_object = static_cast<jclass>(env->CallObjectMethod(
+ class_loader_object, class_loader_load_class, class_name_object));
+
+ if (env->ExceptionCheck()) {
+ env->ExceptionClear();
+ class_object = nullptr;
+ }
+ env->DeleteLocalRef(class_name_object);
+ env->DeleteLocalRef(class_loader_object);
+ }
+ return class_object;
+}
+
+// Vars that we need available for appending text to the log window:
+class LoggingUtilsData {
+ public:
+ LoggingUtilsData()
+ : logging_utils_class_(nullptr),
+ logging_utils_add_log_text_(0),
+ logging_utils_init_log_window_(0) {}
+
+ ~LoggingUtilsData() {
+ JNIEnv* env = GetJniEnv();
+ assert(env);
+ if (logging_utils_class_) {
+ env->DeleteGlobalRef(logging_utils_class_);
+ }
+ }
+
+ void Init() {
+ JNIEnv* env = GetJniEnv();
+ assert(env);
+
+ jclass logging_utils_class = FindClass(
+ env, GetActivity(), "com/google/firebase/example/LoggingUtils");
+ assert(logging_utils_class != 0);
+
+ // Need to store as global references so it don't get moved during garbage
+ // collection.
+ logging_utils_class_ =
+ static_cast<jclass>(env->NewGlobalRef(logging_utils_class));
+ env->DeleteLocalRef(logging_utils_class);
+
+ logging_utils_init_log_window_ = env->GetStaticMethodID(
+ logging_utils_class_, "initLogWindow", "(Landroid/app/Activity;)V");
+ logging_utils_add_log_text_ = env->GetStaticMethodID(
+ logging_utils_class_, "addLogText", "(Ljava/lang/String;)V");
+
+ env->CallStaticVoidMethod(logging_utils_class_,
+ logging_utils_init_log_window_, GetActivity());
+ }
+
+ void AppendText(const char* text) {
+ if (logging_utils_class_ == 0) return; // haven't been initted yet
+ JNIEnv* env = GetJniEnv();
+ assert(env);
+ jstring text_string = env->NewStringUTF(text);
+ env->CallStaticVoidMethod(logging_utils_class_, logging_utils_add_log_text_,
+ text_string);
+ env->DeleteLocalRef(text_string);
+ }
+
+ private:
+ jclass logging_utils_class_;
+ jmethodID logging_utils_add_log_text_;
+ jmethodID logging_utils_init_log_window_;
+};
+
+LoggingUtilsData* g_logging_utils_data;
+
+// Checks if a JNI exception has happened, and if so, logs it to the console.
+void CheckJNIException() {
+ JNIEnv* env = GetJniEnv();
+ if (env->ExceptionCheck()) {
+ // Get the exception text.
+ jthrowable exception = env->ExceptionOccurred();
+ env->ExceptionClear();
+
+ // Convert the exception to a string.
+ jclass object_class = env->FindClass("java/lang/Object");
+ jmethodID toString =
+ env->GetMethodID(object_class, "toString", "()Ljava/lang/String;");
+ jstring s = (jstring)env->CallObjectMethod(exception, toString);
+ const char* exception_text = env->GetStringUTFChars(s, nullptr);
+
+ // Log the exception text.
+ __android_log_print(ANDROID_LOG_INFO, FIREBASE_TESTAPP_NAME,
+ "-------------------JNI exception:");
+ __android_log_print(ANDROID_LOG_INFO, FIREBASE_TESTAPP_NAME, "%s",
+ exception_text);
+ __android_log_print(ANDROID_LOG_INFO, FIREBASE_TESTAPP_NAME,
+ "-------------------");
+
+ // Also, assert fail.
+ assert(false);
+
+ // In the event we didn't assert fail, clean up.
+ env->ReleaseStringUTFChars(s, exception_text);
+ env->DeleteLocalRef(s);
+ env->DeleteLocalRef(exception);
  }
- return gAppState->destroyRequested;
 }
 
 // Log a message that can be viewed in "adb logcat".
-int LogMessage(const char* format, ...) {
+void LogMessage(const char* format, ...) {
+ static const int kLineBufferSize = 100;
+ char buffer[kLineBufferSize + 2];
+
  va_list list;
- int rc;
  va_start(list, format);
- rc = __android_log_vprint(ANDROID_LOG_INFO, FIREBASE_TESTAPP_NAME, format,
- list);
+ int string_len = vsnprintf(buffer, kLineBufferSize, format, list);
+ string_len = string_len < kLineBufferSize ? string_len : kLineBufferSize;
+ // append a linebreak to the buffer:
+ buffer[string_len] = '\n';
+ buffer[string_len + 1] = '\0';
+
+ __android_log_vprint(ANDROID_LOG_INFO, FIREBASE_TESTAPP_NAME, format, list);
+ g_logging_utils_data->AppendText(buffer);
+ CheckJNIException();
  va_end(list);
- return rc;
 }
 
 // Get the JNI environment.
 JNIEnv* GetJniEnv() {
- JavaVM* vm = gAppState->activity->vm;
+ JavaVM* vm = g_app_state->activity->vm;
  JNIEnv* env;
  jint result = vm->AttachCurrentThread(&env, nullptr);
  return result == JNI_OK ? env : nullptr;
 }
 
-// Get the activity.
-jobject GetActivity() { return gAppState->activity->clazz; }
-
 // Execute common_main(), flush pending events and finish the activity.
 extern "C" void android_main(struct android_app* state) {
- int return_value;
- gAppState = state;
+ // native_app_glue spawns a new thread, calling android_main() when the
+ // activity onStart() or onRestart() methods are called. This code handles
+ // the case where we're re-entering this method on a different thread by
+ // signalling the existing thread to exit, waiting for it to complete before
+ // reinitializing the application.
+ if (g_started) {
+ g_restarted = true;
+ // Wait for the existing thread to exit.
+ pthread_mutex_lock(&g_started_mutex);
+ pthread_mutex_unlock(&g_started_mutex);
+ } else {
+ g_started_mutex = PTHREAD_MUTEX_INITIALIZER;
+ }
+ pthread_mutex_lock(&g_started_mutex);
+ g_started = true;
+
+ // Save native app glue state and setup a callback to track the state.
+ g_destroy_requested = false;
+ g_app_state = state;
+ g_app_state->onAppCmd = OnAppCmd;
+
+ // Create the logging display.
+ g_logging_utils_data = new LoggingUtilsData();
+ g_logging_utils_data->Init();
+
+ // Execute cross platform entry point.
  static const char* argv[] = {FIREBASE_TESTAPP_NAME};
- return_value = common_main(static_cast<void*>(GetActivity()));
+ int return_value = common_main(1, argv);
  (void)return_value; // Ignore the return value.
- ProcessAndroidEvents(10);
- ANativeActivity_finish(state->activity);
- gAppState->activity->vm->DetachCurrentThread();
+ ProcessEvents(10);
+
+ // Clean up logging display.
+ delete g_logging_utils_data;
+ g_logging_utils_data = nullptr;
+
+ // Finish the activity.
+ if (!g_restarted) ANativeActivity_finish(state->activity);
+
+ g_app_state->activity->vm->DetachCurrentThread();
+ g_started = false;
+ g_restarted = false;
+ pthread_mutex_unlock(&g_started_mutex);
 }

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

@@ -0,0 +1,54 @@
+// Copyright 2016 Google Inc. All rights reserved.
+//
+// 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.
+
+package com.google.firebase.example;
+
+import android.app.Activity;
+import android.os.Handler;
+import android.os.Looper;
+import android.view.Window;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
+import android.widget.TextView;
+
+/**
+ * A utility class, encapsulating the data and methods required to log arbitrary
+ * text to the screen, via a non-editable TextView.
+ */
+public class LoggingUtils {
+ public static TextView sTextView = null;
+
+ public static void initLogWindow(Activity activity) {
+ LinearLayout linearLayout = new LinearLayout(activity);
+ ScrollView scrollView = new ScrollView(activity);
+ TextView textView = new TextView(activity);
+ linearLayout.addView(scrollView);
+ scrollView.addView(textView);
+ Window window = activity.getWindow();
+ window.takeSurface(null);
+ window.setContentView(linearLayout);
+ sTextView = textView;
+ }
+
+ public static void addLogText(final String text) {
+ new Handler(Looper.getMainLooper()).post(new Runnable() {
+ @Override
+ public void run() {
+ if (sTextView != null) {
+ sTextView.append(text);
+ }
+ }
+ });
+ }
+}