[TEMP DO NOT COMMIT] NewTabPageAdapter for multiple sections

chrome/browser/android/ntp/ntp_snippets_bridge.cc

 // Copyright 2016 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/android/ntp/ntp_snippets_bridge.h"
 
 #include <jni.h>
 
 #include "base/android/callback_android.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/callback.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/ntp_snippets/content_suggestions_service_factory.h"
 #include "chrome/browser/ntp_snippets/ntp_snippets_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/ntp_snippets/content_suggestion.h"
 #include "jni/SnippetsBridge_jni.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::ConvertUTF8ToJavaString;
 using base::android::JavaParamRef;
 using base::android::ToJavaArrayOfStrings;
+using base::android::ToJavaIntArray;
 using base::android::ToJavaLongArray;
 using base::android::ToJavaFloatArray;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
+using ntp_snippets::ContentSuggestion;
 using ntp_snippets::ContentSuggestionsCategory;
 using ntp_snippets::ContentSuggestionsCategoryStatus;
 
 namespace {
 
 void SnippetVisitedHistoryRequestCallback(
       base::android::ScopedJavaGlobalRef<jobject> callback,
       bool success,
       const history::URLRow& row,
       const history::VisitVector& visitVector) {
@@ skipping 71 matching lines @@
                                        const JavaParamRef<jstring>& jurl) {
   base::android::ScopedJavaGlobalRef<jobject> callback(jcallback);
 
   history_service_->QueryURL(
       GURL(ConvertJavaStringToUTF8(env, jurl)),
       false,
       base::Bind(&SnippetVisitedHistoryRequestCallback, callback),
       &tracker_);
 }
 
-int NTPSnippetsBridge::GetCategoryStatus(JNIEnv* env,
-                                         const JavaParamRef<jobject>& obj) {
+ScopedJavaLocalRef<jintArray> NTPSnippetsBridge::GetCategories(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& obj) {
+  std::vector<ContentSuggestionsCategory> categories =
+      content_suggestions_service_->GetCategories();
+  return ToJavaIntArray(env, reinterpret_cast<int*>(categories.data()),
+                        categories.size());
+}
+
+ScopedJavaLocalRef<jobjectArray> NTPSnippetsBridge::GetSuggestionsForCategory(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& obj,
+    jint category) {
+  // Could potentially cache these?
+  ScopedJavaLocalRef<jclass> content_suggestion_clazz(
+      env, env->FindClass(
+               "org/chromium/chrome/browser/ntp/snippets/SnippetArticle"));
+  const std::vector<ContentSuggestion>& suggestions =
+      content_suggestions_service_->GetSuggestionsForCategory(
+          static_cast<ContentSuggestionsCategory>(category));
+  ScopedJavaLocalRef<jobjectArray> result(
+      env, env->NewObjectArray(suggestions.size(),
+                               content_suggestion_clazz.obj(), nullptr));
+  for (size_t index = 0; index < suggestions.size(); index++) {
+    const ContentSuggestion& suggestion = suggestions[index];
+    ScopedJavaLocalRef<jobject> javaSuggestion =
+        Java_SnippetsBridge_createContentSuggestion(
+            env, obj.obj(), ConvertUTF8ToJavaString(env, suggestion.id()).obj(),
+            ConvertUTF8ToJavaString(env, suggestion.title()).obj(),
+            ConvertUTF8ToJavaString(env, suggestion.url().spec()).obj(),
+            ConvertUTF8ToJavaString(env, suggestion.amp_url().spec()).obj(),
+            ConvertUTF8ToJavaString(env, suggestion.snippet_text()).obj(),
+            static_cast<jlong>(suggestion.publish_date().ToJavaTime()),
+            ConvertUTF8ToJavaString(env, suggestion.publisher_name()).obj(),
+            static_cast<jfloat>(suggestion.score()), JniIntWrapper(index));
+    env->SetObjectArrayElement(result.obj(), index, javaSuggestion.obj());
+  }
+  return result;
+}
+
+int NTPSnippetsBridge::GetArticlesCategoryStatus(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& obj) {
   return static_cast<int>(content_suggestions_service_->GetCategoryStatus(
       ContentSuggestionsCategory::ARTICLES));
 }
 
+int NTPSnippetsBridge::GetCategoryStatus(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& obj,
+    jint category) {
+  return static_cast<int>(content_suggestions_service_->GetCategoryStatus(
+      static_cast<ContentSuggestionsCategory>(category)));
+}
+
 NTPSnippetsBridge::~NTPSnippetsBridge() {}
 
 void NTPSnippetsBridge::OnNewSuggestions() {
   if (observer_.is_null())
     return;
 
+  JNIEnv* env = base::android::AttachCurrentThread();
+  Java_SnippetsBridge_onNewSuggestions(env, observer_.obj());
+
   std::vector<std::string> ids;
   std::vector<std::string> titles;
   // URL for the article. This will also be used to find the favicon for the
   // article.
   std::vector<std::string> urls;
   // URL for the AMP version of the article if it exists. This will be used as
   // the URL to direct the user to on tap.
   std::vector<std::string> amp_urls;
   std::vector<std::string> snippets;
   std::vector<int64_t> timestamps;
   std::vector<std::string> publishers;
   std::vector<float> scores;
   for (const ntp_snippets::ContentSuggestion& suggestion :
        content_suggestions_service_->GetSuggestionsForCategory(
            ContentSuggestionsCategory::ARTICLES)) {
     ids.push_back(suggestion.id());
     titles.push_back(suggestion.title());
     // The url from source_info is a url for a site that is one of the
     // HOST_RESTRICT parameters, so this is preferred.
     urls.push_back(suggestion.url().spec());
     amp_urls.push_back(suggestion.amp_url().spec());
     snippets.push_back(suggestion.snippet_text());
     timestamps.push_back(suggestion.publish_date().ToJavaTime());
     publishers.push_back(suggestion.publisher_name());
     scores.push_back(suggestion.score());
   }
 
-  JNIEnv* env = base::android::AttachCurrentThread();
   Java_SnippetsBridge_onSnippetsAvailable(
       env, observer_.obj(), ToJavaArrayOfStrings(env, ids).obj(),
       ToJavaArrayOfStrings(env, titles).obj(),
       ToJavaArrayOfStrings(env, urls).obj(),
       ToJavaArrayOfStrings(env, amp_urls).obj(),
       ToJavaArrayOfStrings(env, snippets).obj(),
       ToJavaLongArray(env, timestamps).obj(),
       ToJavaArrayOfStrings(env, publishers).obj(),
       ToJavaFloatArray(env, scores).obj());
 }
@@ skipping 21 matching lines @@
   if (!image.IsEmpty())
     j_bitmap = gfx::ConvertToJavaBitmap(image.ToSkBitmap());
 
   base::android::RunCallbackAndroid(callback, j_bitmap);
 }
 
 // static
 bool NTPSnippetsBridge::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }