[Android] Explicitly request all needed runtime permissions.

chrome/android/java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java

 // Copyright 2013 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.pageinfo;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
@@ skipping 508 matching lines @@
      * Whether to show a 'Details' link to the connection info popup. The link is only shown for
      * HTTPS connections.
      */
     private boolean isConnectionDetailsLinkVisible() {
         return mContentPublisher == null && !isShowingOfflinePage() && mParsedUrl != null
                 && mParsedUrl.getScheme() != null
                         && mParsedUrl.getScheme().equals(UrlConstants.HTTPS_SCHEME);
     }
 
     private boolean hasAndroidPermission(int contentSettingType) {
-        String androidPermission = PrefServiceBridge.getAndroidPermissionForContentSetting(
+        String[] androidPermissions = PrefServiceBridge.getAndroidPermissionsForContentSetting(
                 contentSettingType);
-        return androidPermission == null || mWindowAndroid.hasPermission(androidPermission);
+        if (androidPermissions == null) return true;
+        for (int i = 0; i < androidPermissions.length; i++) {
+            if (!mWindowAndroid.hasPermission(androidPermissions[i])) {
+                return false;
+            }
+        }
+        return true;
     }
 
     /**
      * Adds a new row for the given permission.
      *
      * @param name The title of the permission to display to the user.
      * @param type The ContentSettingsType of the permission.
      * @param currentSettingValue The ContentSetting value of the currently selected setting.
      */
     @CalledByNative
@@ skipping 30 matching lines @@
             // permission_intent_override or permission_type.
             LocationUtils locationUtils = LocationUtils.getInstance();
             if (permission.type == ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION
                     && !locationUtils.isSystemLocationSettingEnabled()) {
                 warningTextResource = R.string.page_info_android_location_blocked;
                 permissionRow.setTag(R.id.permission_intent_override,
                         locationUtils.getSystemLocationSettingsIntent());
             } else if (!hasAndroidPermission(permission.type)) {
                 warningTextResource = R.string.page_info_android_permission_blocked;
                 permissionRow.setTag(R.id.permission_type,
-                        PrefServiceBridge.getAndroidPermissionForContentSetting(permission.type));
+                        PrefServiceBridge.getAndroidPermissionsForContentSetting(permission.type));
             }
 
             if (warningTextResource != 0) {
                 TextView permissionUnavailable = (TextView) permissionRow.findViewById(
                         R.id.website_settings_permission_unavailable_message);
                 permissionUnavailable.setVisibility(View.VISIBLE);
                 permissionUnavailable.setText(warningTextResource);
 
                 permissionIcon.setImageResource(R.drawable.exclamation_triangle);
                 permissionIcon.setColorFilter(ApiCompatibilityUtils.getColor(
@@ skipping 172 matching lines @@
                                 WebsiteSettingsAction.WEBSITE_SETTINGS_SECURITY_DETAILS_OPENED);
                         ConnectionInfoPopup.show(mContext, mTab.getWebContents());
                     }
                 }
             });
         } else if (view.getId() == R.id.website_settings_permission_row) {
             final Object intentOverride = view.getTag(R.id.permission_intent_override);
 
             if (intentOverride == null && mWindowAndroid != null) {
                 // Try and immediately request missing Android permissions where possible.
-                final String permissionType = (String) view.getTag(R.id.permission_type);
-                if (mWindowAndroid.canRequestPermission(permissionType)) {
-                    final String[] permissionRequest = new String[] {permissionType};
-                    mWindowAndroid.requestPermissions(permissionRequest, new PermissionCallback() {
-                        @Override
-                        public void onRequestPermissionsResult(
-                                String[] permissions, int[] grantResults) {
-                            if (grantResults.length > 0
-                                    && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                                updatePermissionDisplay();
+                final String[] permissionType = (String[]) view.getTag(R.id.permission_type);
+                for (int i = 0; i < permissionType.length; i++) {
+                    // If any permissions can be requested, attempt to request them all.
+                    if (mWindowAndroid.canRequestPermission(permissionType[i])) {

[mlamouri (slow - plz ping), 2017/02/10 14:09:04]

for readability, what about an early `continue`? Indentation is going crazy :)

[Ted C, 2017/02/10 17:24:46]

Done.

+                        mWindowAndroid.requestPermissions(permissionType, new PermissionCallback() {
+                            @Override
+                            public void onRequestPermissionsResult(
+                                    String[] permissions, int[] grantResults) {
+                                if (grantResults.length > 0
+                                        && grantResults[0] == PackageManager.PERMISSION_GRANTED) {

[mlamouri (slow - plz ping), 2017/02/10 14:09:04]

What if there were multiple permissions? Does it still make sense to only look
at the first one?

[Ted C, 2017/02/10 17:24:46]

Nice catch.  Since each row can be tied to multiple permissions, it only makes
sense to update the UI if all of them are granted.  Now it loops and checks
if they're all granted before updating the UI.

+                                    updatePermissionDisplay();
+                                }
                             }
-                        }
-                    });
-                    return;
+                        });
+                        return;
+                    }
                 }
             }
 
             runAfterDismiss(new Runnable() {
                 @Override
                 public void run() {
                     Intent settingsIntent;
                     if (intentOverride != null) {
                         settingsIntent = (Intent) intentOverride;
                     } else {
@@ skipping 161 matching lines @@
         new WebsiteSettingsPopup(activity, tab, offlinePageCreationDate, contentPublisher);
     }
 
     private static native long nativeInit(WebsiteSettingsPopup popup, WebContents webContents);
 
     private native void nativeDestroy(long nativeWebsiteSettingsPopupAndroid);
 
     private native void nativeRecordWebsiteSettingsAction(
             long nativeWebsiteSettingsPopupAndroid, int action);
 }