Integrate Latest @ 170282474

jonsimantov · jonsimantov · commit d2e594e9039d · 2017-09-28T10:57:38.000-07:00
Changes to messaging/testapp ...
- Updated testapp to display deep link if one was provided.

CL: 170282474
diff --git a/messaging/testapp/AndroidManifest.xml b/messaging/testapp/AndroidManifest.xml
@@ -28,6 +28,17 @@
         <action android:name="android.intent.action.MAIN" />
         <category android:name="android.intent.category.LAUNCHER" />
       </intent-filter>
+
+      <!-- To take advantage of deep links in Firebase Messages on Android, your
+           app must be configured to listen for links to your domain. Update the
+           URLs in the following intent-filter to enable links for your app. -->
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+        <data android:host="CHANGE_THIS_DOMAIN.example.com" android:scheme="http"/>
+        <data android:host="CHANGE_THIS_DOMAIN.example.com" android:scheme="https"/>
+      </intent-filter>
     </activity>
 
     <service android:name="com.google.firebase.messaging.cpp.ListenerService"
diff --git a/messaging/testapp/readme.md b/messaging/testapp/readme.md
@@ -125,6 +125,22 @@ with:
       and download the SDK and NDK if the locations are not yet set.
     * Android Studio will write these paths to `local.properties`.
 
+**Optional: Configure your deep link URL**
+
+- To enable your app to receive deep links via FCM, you will need to add an
+  intent filter to your AndroidManifest.xml in the native activity that
+  associates your domain with your app.
+
+```
+<intent-filter>
+  <action android:name="android.intent.action.VIEW"/>
+  <category android:name="android.intent.category.DEFAULT"/>
+  <category android:name="android.intent.category.BROWSABLE"/>
+  <data android:host="your-domain-here.example.com" android:scheme="http"/>
+  <data android:host="your-domain-here.example.com" android:scheme="https"/>
+</intent-filter>
+```
+
 **Build & Run**
 
 - Open `build.gradle` in Android Studio.
diff --git a/messaging/testapp/src/common_main.cc b/messaging/testapp/src/common_main.cc
@@ -77,6 +77,9 @@ extern "C" int common_main(int argc, const char* argv[]) {
       if (!message.message_id.empty()) {
         LogMessage("message_id: %s", message.message_id.c_str());
       }
+      if (!message.link.empty()) {
+        LogMessage("  link: %s", message.link.c_str());
+      }
       if (!message.data.empty()) {
         LogMessage("data:");
         for (const auto& field : message.data) {
