diff options
author | Tao Bai <michaelbai@google.com> | 2014-05-13 13:55:52 -0700 |
---|---|---|
committer | Tao Bai <michaelbai@google.com> | 2014-05-14 11:04:42 -0700 |
commit | e1b6b3b2f9c0dbf201234162101023770835df9e (patch) | |
tree | 5169a99decf4690eda805a408eb81e44899e518a /src/com/android/browser | |
parent | 86b21dc331237980b9df44df19e6f202e6049cbb (diff) | |
download | packages_apps_Browser-e1b6b3b2f9c0dbf201234162101023770835df9e.zip packages_apps_Browser-e1b6b3b2f9c0dbf201234162101023770835df9e.tar.gz packages_apps_Browser-e1b6b3b2f9c0dbf201234162101023770835df9e.tar.bz2 |
Use general permission API.
Geolocation related code is untouched.
PermissionsPrompt is almost same as GeolocationPermissionPrompt, except
- Remember checkbox is hidden as we don't has this feature in framework now.
- The resource name is appended according the request.
- Remove toast.
BUG: 13699047
Change-Id: I1f3f1908bf9c7131ecf2d060fc79d3e5c8842f94
Diffstat (limited to 'src/com/android/browser')
-rw-r--r-- | src/com/android/browser/PermissionsPrompt.java | 126 | ||||
-rw-r--r-- | src/com/android/browser/Tab.java | 33 |
2 files changed, 159 insertions, 0 deletions
diff --git a/src/com/android/browser/PermissionsPrompt.java b/src/com/android/browser/PermissionsPrompt.java new file mode 100644 index 0000000..284a3ea --- /dev/null +++ b/src/com/android/browser/PermissionsPrompt.java @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.browser; + +import android.content.Context; +import android.net.Uri; +import android.util.AttributeSet; +import android.view.Gravity; +import android.view.View; +import android.webkit.GeolocationPermissions; +import android.webkit.PermissionRequest; +import android.widget.Button; +import android.widget.CheckBox; +import android.widget.RelativeLayout; +import android.widget.TextView; +import android.widget.Toast; + +import java.util.Enumeration; +import java.util.Vector; + +public class PermissionsPrompt extends RelativeLayout { + private TextView mMessage; + private Button mAllowButton; + private Button mDenyButton; + private CheckBox mRemember; + private PermissionRequest mRequest; + + public PermissionsPrompt(Context context) { + this(context, null); + } + + public PermissionsPrompt(Context context, AttributeSet attrs) { + super(context, attrs); + } + + @Override + protected void onFinishInflate() { + super.onFinishInflate(); + init(); + } + + private void init() { + mMessage = (TextView) findViewById(R.id.message); + mAllowButton = (Button) findViewById(R.id.allow_button); + mDenyButton = (Button) findViewById(R.id.deny_button); + mRemember = (CheckBox) findViewById(R.id.remember); + // TODO: Retain permission. + // Hide the Remember checkBox as this feature is missing. + mRemember.setVisibility(View.INVISIBLE); + + mAllowButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + handleButtonClick(true); + } + }); + mDenyButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + handleButtonClick(false); + } + }); + } + + public void show(PermissionRequest request) { + mRequest = request; + setMessage(); + mRemember.setChecked(true); + setVisibility(View.VISIBLE); + } + + public void setMessage() { + long resources = mRequest.getResources(); + Vector<String> strings = new Vector<String>(); + if ((resources & PermissionRequest.RESOURCE_GEOLOCATION) != 0) + strings.add(getResources().getString(R.string.resource_geolocation)); + else if ((resources & PermissionRequest.RESOURCE_VIDEO_CAPTURE) != 0) + strings.add(getResources().getString(R.string.resource_video_capture)); + else if ((resources & PermissionRequest.RESOURCE_AUDIO_CAPTURE) != 0) + strings.add(getResources().getString(R.string.resource_audio_capture)); + if (strings.isEmpty()) return; + + Enumeration<String> e = strings.elements(); + StringBuilder sb = new StringBuilder(e.nextElement()); + if (e.hasMoreElements()) { + sb.append(", "); + sb.append(e.nextElement()); + } + + mMessage.setText(String.format( + getResources().getString(R.string.permissions_prompt_message), + mRequest.getOrigin(), sb.toString())); + } + + /** + * Hides the prompt. + */ + public void hide() { + setVisibility(View.GONE); + } + + /** + * Handles a click on one the buttons by invoking the callback. + */ + private void handleButtonClick(boolean allow) { + hide(); + if (allow) + mRequest.grant(mRequest.getResources()); + else + mRequest.deny(); + } +} diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java index ed20e67..668786c 100644 --- a/src/com/android/browser/Tab.java +++ b/src/com/android/browser/Tab.java @@ -50,7 +50,9 @@ import android.webkit.BrowserDownloadListener; import android.webkit.ClientCertRequest; import android.webkit.ConsoleMessage; import android.webkit.GeolocationPermissions; +import android.webkit.GeolocationPermissions.Callback; import android.webkit.HttpAuthHandler; +import android.webkit.PermissionRequest; import android.webkit.SslErrorHandler; import android.webkit.URLUtil; import android.webkit.ValueCallback; @@ -135,6 +137,8 @@ class Tab implements PictureListener { // The Geolocation permissions prompt private GeolocationPermissionsPrompt mGeolocationPermissionsPrompt; + // The permissions prompt + private PermissionsPrompt mPermissionsPrompt; // Main WebView wrapper private View mContainer; // Main WebView @@ -912,6 +916,19 @@ class Tab implements PictureListener { } } + @Override + public void onPermissionRequest(PermissionRequest request) { + if (!mInForeground) return; + getPermissionsPrompt().show(request); + } + + @Override + public void onPermissionRequestCanceled(PermissionRequest request) { + if (mInForeground && mPermissionsPrompt != null) { + mPermissionsPrompt.hide(); + } + } + /* Adds a JavaScript error message to the system log and if the JS * console is enabled in the about:debug options, to that console * also. @@ -1232,6 +1249,10 @@ class Tab implements PictureListener { mGeolocationPermissionsPrompt.hide(); } + if (mPermissionsPrompt != null) { + mPermissionsPrompt.hide(); + } + mWebViewController.onSetWebView(this, w); if (mMainView != null) { @@ -1539,6 +1560,18 @@ class Tab implements PictureListener { } /** + * @return The permissions prompt for this tab. + */ + PermissionsPrompt getPermissionsPrompt() { + if (mPermissionsPrompt == null) { + ViewStub stub = (ViewStub) mContainer + .findViewById(R.id.permissions_prompt); + mPermissionsPrompt = (PermissionsPrompt) stub.inflate(); + } + return mPermissionsPrompt; + } + + /** * @return The application id string */ String getAppId() { |