Extend with a language code in http accept languages

chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PwsClientImpl.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.content.Context;
 import android.graphics.Bitmap;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.text.TextUtils;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import org.chromium.base.LocaleUtils;
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.GoogleAPIKeys;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeVersionInfo;
 import org.chromium.chrome.browser.physicalweb.PwsClient.FetchIconCallback;
 import org.chromium.chrome.browser.physicalweb.PwsClient.ResolveScanCallback;
 
 import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Formatter;
 import java.util.HashSet;
 import java.util.Locale;
 
 /**
  * This class sends requests to the Physical Web Service.
  */
 class PwsClientImpl implements PwsClient {
     private static final String TAG = "PhysicalWeb";
     private static final String ENDPOINT_URL =
@@ skipping 204 matching lines @@
      * chrome/browser/android/preferences/pref_service_bridge.cc
      * @param locales A comma separated string that represents a list of default locales.
      * @param acceptLanguages The default language list for the language of the user's locales.
      * @return An updated language list.
      */
     @VisibleForTesting
     static String prependToAcceptLanguagesIfNecessary(String locales, String acceptLanguages) {
         String localeStrings = locales + "," + acceptLanguages;
         String[] localeList = localeStrings.split(",");
 
-        ArrayList<Locale> uniqueList = new ArrayList<>();
+        HashSet<Locale> seenLocales = new HashSet<>();
+        ArrayList<String> uniqueList = new ArrayList<>();
         for (String localeString : localeList) {
             Locale locale = LocaleUtils.forLanguageTag(localeString);
-            if (uniqueList.contains(locale) || locale.getLanguage().isEmpty()) {
+            if (seenLocales.contains(locale) || locale.getLanguage().isEmpty()) {
                 continue;
             }
-            uniqueList.add(locale);
+            seenLocales.add(locale);
+            uniqueList.add(LocaleUtils.toLanguageTag(locale));
         }
-
-        // If language is not in the accept languages list, also add language code.
-        // A language code should only be inserted after the last languageTag that
-        // contains that language.
-        // This will work with the IDS_ACCEPT_LANGUAGE localized strings bundled
-        // with Chrome but may fail on arbitrary lists of language tags due to
-        // differences in case and whitespace.
-        HashSet<String> seenLanguages = new HashSet<>();
-        ArrayList<String> outputList = new ArrayList<>();
-        for (int i = uniqueList.size() - 1; i >= 0; i--) {
-            Locale localeAdd = uniqueList.get(i);
-            String languageAdd = localeAdd.getLanguage();
-            String countryAdd = localeAdd.getCountry();
-
-            if (!seenLanguages.contains(languageAdd)) {
-                seenLanguages.add(languageAdd);
-                outputList.add(languageAdd);
-            }
-            if (!countryAdd.isEmpty()) {
-                outputList.add(LocaleUtils.toLanguageTag(localeAdd));
-            }
-        }
-        Collections.reverse(outputList);
-        return TextUtils.join(",", outputList);
+        return TextUtils.join(",", uniqueList);
     }
 
     /**
      * Given a list of comma-delimited language codes in decreasing order of preference, insert
      * q-values to represent the relative quality/precedence of each language. The logic should
      * match GenerateAcceptLanguageHeader in net/http/http_util.cc.
      * @param languageList A comma-delimited list of language codes containing no whitespace.
      * @return An Accept-Language header with q-values.
      */
     @VisibleForTesting
@@ skipping 12 matching lines @@
                 langListWithQ.format(",%s;q=0.%d", language, qvalue10);
             }
             // It does not make sense to have 'q=0'.
             if (qvalue10 > kQvalueDecrement10) {
                 qvalue10 -= kQvalueDecrement10;
             }
         }
         return langListWithQ.toString();
     }
 }