Implement GetDisplayed on android M+

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/build_info.h"
 #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"
@@ skipping 288 matching lines @@
 
   Java_NotificationPlatformBridge_closeNotification(
       env, java_object_, j_profile_id, j_notification_id, origin, tag,
       webapk_package);
 }
 
 bool NotificationPlatformBridgeAndroid::GetDisplayed(
     const std::string& profile_id,
     bool incognito,
     std::set<std::string>* notifications) const {
-  // TODO(miguelg): This can actually be implemented for M+
-  return false;
+  DCHECK(notifications);
+  JNIEnv* env = AttachCurrentThread();
+
+  // Android only supports retrieving existing notifications from M+
+  if (base::android::BuildInfo::GetInstance()->sdk_int() <
+      base::android::SDK_VERSION_MARSHMALLOW) {
+    return false;
+  }
+
+  const ScopedJavaLocalRef<jstring> j_profile_id =
+      ConvertUTF8ToJavaString(env, profile_id);
+
+  ScopedJavaLocalRef<jobjectArray> j_notification_ids =
+      Java_NotificationPlatformBridge_getNotificationsForProfile(
+          env, java_object_, j_profile_id);
+  if (j_notification_ids.obj()) {

[Peter Beverloo, 2016/12/06 16:54:13]

nit: consider early returning:

if (!j_notification_ids.obj())
  return false;

[Miguel Garcia, 2016/12/14 15:47:32]

Actually I return null when there are no notifications (since I am returning a
raw array) so this should return true. That's why I decided to not do an early
return.

+    std::vector<std::string> notification_ids;
+    base::android::AppendJavaStringArrayToStringVector(
+        env, j_notification_ids.obj(), &notification_ids);
+    for (auto id : notification_ids) {

[Peter Beverloo, 2016/12/06 16:54:13]

nit: const auto& id (so that you don't make copies of the strings)

[Peter Beverloo, 2016/12/06 16:54:13]

nit: no brackets for one-line statements

[Miguel Garcia, 2016/12/14 15:47:32]

Done.

[Miguel Garcia, 2016/12/14 15:47:32]

Done.

+      notifications->insert(id);
+    }
+  }
+
+  return true;
 }
 
 // static
 bool NotificationPlatformBridgeAndroid::RegisterNotificationPlatformBridge(
     JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 // static
 void NotificationPlatformBridgeAndroid::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kNotificationsVibrateEnabled, true);
 }
 
 NotificationPlatformBridgeAndroid::RegeneratedNotificationInfo::
     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() {}