Use new Physical Web service on Google infrastructure

chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PwsClient.java

 // Copyright 2015 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.
 
 package org.chromium.chrome.browser.physicalweb;
 
 import android.graphics.Bitmap;
 import android.os.AsyncTask;
 
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
+import org.chromium.chrome.GoogleAPIKeys;
+import org.chromium.chrome.browser.ChromeVersionInfo;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.Collection;
 
 /**
  * This class sends requests to the Physical Web Service.
  */
 class PwsClient {
     private static final String TAG = "PhysicalWeb";
-    private static final String ENDPOINT_URL = "https://url-caster.appspot.com/resolve-scan";
+    private static final String ENDPOINT_URL = "https://test-physicalweb.sandbox.googleapis.com/v1alpha1/urls:resolve";
 
     /**
      * Callback that is run after the PWS sends a response to a resolve-scan request.
      */
     public interface ResolveScanCallback {
         /**
          * Handle newly returned PwsResults.
          * @param pwsResults The results returned by the PWS.
          */
         public void onPwsResults(Collection<PwsResult> pwsResults);
     }
 
     /**
      * Callback that is run after receiving the response to an icon fetch request.
      */
     public interface FetchIconCallback {
         /**
          * Handle newly returned favicon Bitmaps.
          * @param iconUrl The favicon URL.
          * @param iconBitmap The icon image data.
          */
         public void onIconReceived(String iconUrl, Bitmap iconBitmap);
     }
 
+    private String apiKey() {

[agrieve, 2015/11/06 19:17:53]

nit: Should be called "getApiKey()"

[dvh, 2015/11/06 19:27:46]

Done.

+        if (ChromeVersionInfo.isStableBuild()) {
+            return GoogleAPIKeys.GOOGLE_API_KEY;
+        } else {
+            return GoogleAPIKeys.GOOGLE_API_KEY_PHYSICAL_WEB_TEST;

[newt (away), 2015/11/06 19:02:47]

Do we really want to use GOOGLE_API_KEY_PHYSICAL_WEB_TEST on Beta builds and
Dev? I'd recommend only using the test keys on local builds (or perhaps canary
and dev) if that works for your purposes.

[dvh, 2015/11/06 19:27:46]

Discussed about the plan offline.

+        }
+    }
+
     private static JSONObject createResolveScanPayload(Collection<String> urls)
             throws JSONException {
         // Encode the urls.
         JSONArray objects = new JSONArray();
         for (String url : urls) {
             JSONObject obj = new JSONObject();
             obj.put("url", url);
             objects.put(obj);
         }
 
         // Organize the data into a single object.
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("objects", objects);
+        jsonObject.put("urls", objects);
         return jsonObject;
     }
 
     private static Collection<PwsResult> parseResolveScanResponse(JSONObject result) {
         // Get the metadata array.
         Collection<PwsResult> pwsResults = new ArrayList<>();
         JSONArray metadata;
         try {
             metadata = result.getJSONArray("metadata");
         } catch (JSONException e) {
             Log.e(TAG, "PWS returned invalid metadata", e);
             return pwsResults;
         }
 
         // Loop through the metadata for each url.
         for (int i = 0; i < metadata.length(); i++) {
             try {
                 JSONObject obj = metadata.getJSONObject(i);
-                String requestUrl = obj.getString("id");
-                String siteUrl = obj.getString("url");
-                String iconUrl = obj.optString("icon", null);
-                String title = obj.optString("title", "");
-                String description = obj.optString("description", "");
-                pwsResults.add(new PwsResult(requestUrl, siteUrl, iconUrl, title, description));
+                JSONObject pageInfo = obj.getJSONObject("pageInfo");
+                String scannedUrl = pageInfo.getString("scannedUrl");
+                String resolvedUrl = pageInfo.getString("resolvedUrl");
+                String iconUrl = pageInfo.optString("icon", null);
+                String title = pageInfo.optString("title", "");
+                String description = pageInfo.optString("description", "");
+                pwsResults.add(new PwsResult(scannedUrl, resolvedUrl, iconUrl, title, description));
             } catch (JSONException e) {
                 Log.e(TAG, "PWS returned invalid metadata", e);
                 continue;
             }
         }
         return pwsResults;
     }
 
     /**
      * Send an HTTP request to the PWS to resolve a set of URLs.
@@ skipping 21 matching lines @@
                 }
                 Log.e(TAG, "Error making request to PWS%s", httpErr, e);
                 resolveScanCallback.onPwsResults(new ArrayList<PwsResult>());
             }
         };
 
         // Create the request.
         HttpRequest request = null;
         try {
             JSONObject payload = createResolveScanPayload(broadcastUrls);
+            String url = ENDPOINT_URL + "?key=" + apiKey();

[agrieve, 2015/11/06 19:17:53]

variable unused?

[dvh, 2015/11/06 19:27:46]

Acknowledged.

             request = new JsonObjectHttpRequest(ENDPOINT_URL, payload, requestCallback);
         } catch (MalformedURLException e) {
             Log.e(TAG, "Error creating PWS HTTP request", e);
             return;
         } catch (JSONException e) {
             Log.e(TAG, "Error creating PWS JSON payload", e);
             return;
         }
         // The callback will be called on the main thread.
         AsyncTask.THREAD_POOL_EXECUTOR.execute(request);
@@ skipping 30 matching lines @@
         try {
             request = new BitmapHttpRequest(iconUrl, requestCallback);
         } catch (MalformedURLException e) {
             Log.e(TAG, "Error creating icon request", e);
             return;
         }
         // The callback will be called on the main thread.
         AsyncTask.THREAD_POOL_EXECUTOR.execute(request);
     }
 }