Hooking up Android N inline notification replies end-to-end

chrome/browser/notifications/notification_platform_bridge_android.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/notifications/notification_platform_bridge_android.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
+#include "base/strings/nullable_string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/native_notification_display_service.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_common.h"
 #include "chrome/browser/notifications/notification_display_service_factory.h"
 #include "chrome/browser/notifications/persistent_notification_delegate.h"
 #include "chrome/browser/notifications/platform_notification_service_impl.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/common/persistent_notification_status.h"
 #include "content/public/common/platform_notification_data.h"
 #include "jni/NotificationPlatformBridge_jni.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/image/image.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF8;
+using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
 
 namespace {
 
 ScopedJavaLocalRef<jobjectArray> ConvertToJavaBitmaps(
     const std::vector<message_center::ButtonInfo>& buttons) {
   std::vector<SkBitmap> skbitmaps;
@@ skipping 18 matching lines @@
 }
 
 // Callback to run once the profile has been loaded in order to perform a
 // given |operation| in a notification.
 // TODO(miguelg) move it to notification_common?
 void ProfileLoadedCallback(NotificationCommon::Operation operation,
                            NotificationCommon::Type notification_type,
                            const std::string& origin,
                            const std::string& notification_id,
                            int action_index,
+                           const base::NullableString16& reply,
                            Profile* profile) {
   if (!profile) {
     // TODO(miguelg): Add UMA for this condition.
     // Perhaps propagate this through PersistentNotificationStatus.
     LOG(WARNING) << "Profile not loaded correctly";
     return;
   }
 
   NotificationDisplayService* display_service =
       NotificationDisplayServiceFactory::GetForProfile(profile);
 
   static_cast<NativeNotificationDisplayService*>(display_service)
       ->ProcessNotificationOperation(operation, notification_type, origin,
-                                     notification_id, action_index);
+                                     notification_id, action_index, reply);
 }
 
 }  // namespace
 
 // Called by the Java side when a notification event has been received, but the
 // NotificationBridge has not been initialized yet. Enforce initialization of
 // the class.
 static void InitializeNotificationPlatformBridge(
     JNIEnv* env,
     const JavaParamRef<jclass>& clazz) {
@@ skipping 16 matching lines @@
 
 void NotificationPlatformBridgeAndroid::OnNotificationClicked(
     JNIEnv* env,
     const JavaParamRef<jobject>& java_object,
     const JavaParamRef<jstring>& java_notification_id,
     const JavaParamRef<jstring>& java_origin,
     const JavaParamRef<jstring>& java_profile_id,
     jboolean incognito,
     const JavaParamRef<jstring>& java_tag,
     const JavaParamRef<jstring>& java_webapk_package,
-    jint action_index) {
+    jint action_index,
+    const base::android::JavaParamRef<_jstring*>& java_reply) {

[Peter Beverloo, 2016/10/17 14:11:39]

Are you sure that we can't just have

    const JavaParamRef<string>& java_reply

like everything else, and check the "is_null()" method for the NULL check?

I can't find the pattern that you're using anywhere else. A const reference to a
param reference to a pointer to a _jstring sounds dodgy. Let's check with torne@
if we're not sure.

[awdf, 2016/10/17 14:51:24]

:O wow, I have no idea where that came from.. perhaps autocomplete?

Fixed now anyway.

   std::string notification_id =
       ConvertJavaStringToUTF8(env, java_notification_id);
   std::string tag = ConvertJavaStringToUTF8(env, java_tag);
   std::string profile_id = ConvertJavaStringToUTF8(env, java_profile_id);
   std::string webapk_package =
       ConvertJavaStringToUTF8(env, java_webapk_package);
+  base::NullableString16 reply =
+      java_reply
+          ? base::NullableString16(ConvertJavaStringToUTF16(env, java_reply),
+                                   false /* is_null */)
+          : base::NullableString16();
 
   GURL origin(ConvertJavaStringToUTF8(env, java_origin));
   regenerated_notification_infos_[notification_id] =
       RegeneratedNotificationInfo(origin.spec(), tag, webapk_package);
 
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   DCHECK(profile_manager);
 
   profile_manager->LoadProfile(
       profile_id, incognito,
       base::Bind(&ProfileLoadedCallback, NotificationCommon::CLICK,
                  NotificationCommon::PERSISTENT, origin.spec(), notification_id,
-                 action_index));
+                 action_index, reply));
 }
 
 void NotificationPlatformBridgeAndroid::OnNotificationClosed(
     JNIEnv* env,
     const JavaParamRef<jobject>& java_object,
     const JavaParamRef<jstring>& java_notification_id,
     const JavaParamRef<jstring>& java_origin,
     const JavaParamRef<jstring>& java_profile_id,
     jboolean incognito,
     const JavaParamRef<jstring>& java_tag,
     jboolean by_user) {
   std::string profile_id = ConvertJavaStringToUTF8(env, java_profile_id);
   std::string notification_id =
       ConvertJavaStringToUTF8(env, java_notification_id);
 
   // The notification was closed by the platform, so clear all local state.
   regenerated_notification_infos_.erase(notification_id);
 
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   DCHECK(profile_manager);
 
   profile_manager->LoadProfile(
       profile_id, incognito,
       base::Bind(&ProfileLoadedCallback, NotificationCommon::CLOSE,
                  NotificationCommon::PERSISTENT,
                  ConvertJavaStringToUTF8(env, java_origin), notification_id,
-                 -1 /* action index */));
+                 -1 /* action index */, base::NullableString16() /* reply */));
 }
 
 void NotificationPlatformBridgeAndroid::Display(
     NotificationCommon::Type notification_type,
     const std::string& notification_id,
     const std::string& profile_id,
     bool incognito,
     const Notification& notification) {
   JNIEnv* env = AttachCurrentThread();
   // TODO(miguelg): Store the notification type in java instead of assuming it's
@@ skipping 141 matching lines @@
     RegeneratedNotificationInfo() {}
 
 NotificationPlatformBridgeAndroid::RegeneratedNotificationInfo::
     RegeneratedNotificationInfo(const std::string& origin,
                                 const std::string& tag,
                                 const std::string& webapk_package)
     : origin(origin), tag(tag), webapk_package(webapk_package) {}
 
 NotificationPlatformBridgeAndroid::RegeneratedNotificationInfo::
     ~RegeneratedNotificationInfo() {}