OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 package org.chromium.chrome.browser.preferences.website; | 5 package org.chromium.chrome.browser.preferences.website; |
6 | 6 |
7 import android.content.Context; | 7 import android.content.Context; |
8 import android.content.DialogInterface; | 8 import android.content.DialogInterface; |
9 import android.content.res.Resources; | 9 import android.content.res.Resources; |
10 import android.graphics.PorterDuff; | 10 import android.graphics.PorterDuff; |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
63 "os_permissions_warning_divider"; | 63 "os_permissions_warning_divider"; |
64 // Actions at the top (if adding new, see hasUsagePreferences below): | 64 // Actions at the top (if adding new, see hasUsagePreferences below): |
65 public static final String PREF_CLEAR_DATA = "clear_data"; | 65 public static final String PREF_CLEAR_DATA = "clear_data"; |
66 // Buttons: | 66 // Buttons: |
67 public static final String PREF_RESET_SITE = "reset_site_button"; | 67 public static final String PREF_RESET_SITE = "reset_site_button"; |
68 // Website permissions (if adding new, see hasPermissionsPreferences and res etSite below): | 68 // Website permissions (if adding new, see hasPermissionsPreferences and res etSite below): |
69 public static final String PREF_CAMERA_CAPTURE_PERMISSION = "camera_permissi on_list"; | 69 public static final String PREF_CAMERA_CAPTURE_PERMISSION = "camera_permissi on_list"; |
70 public static final String PREF_COOKIES_PERMISSION = "cookies_permission_lis t"; | 70 public static final String PREF_COOKIES_PERMISSION = "cookies_permission_lis t"; |
71 public static final String PREF_FULLSCREEN_PERMISSION = "fullscreen_permissi on_list"; | 71 public static final String PREF_FULLSCREEN_PERMISSION = "fullscreen_permissi on_list"; |
72 public static final String PREF_JAVASCRIPT_PERMISSION = "javascript_permissi on_list"; | 72 public static final String PREF_JAVASCRIPT_PERMISSION = "javascript_permissi on_list"; |
73 public static final String PREF_KEYGEN_PERMISSION = "keygen_permission_list" ; | |
Finnur
2015/11/05 20:44:41
You definitely need the xml changes I asked about
svaldez
2015/11/10 15:25:02
Done.
| |
73 public static final String PREF_LOCATION_ACCESS = "location_access_list"; | 74 public static final String PREF_LOCATION_ACCESS = "location_access_list"; |
74 public static final String PREF_MIC_CAPTURE_PERMISSION = "microphone_permiss ion_list"; | 75 public static final String PREF_MIC_CAPTURE_PERMISSION = "microphone_permiss ion_list"; |
75 public static final String PREF_MIDI_SYSEX_PERMISSION = "midi_sysex_permissi on_list"; | 76 public static final String PREF_MIDI_SYSEX_PERMISSION = "midi_sysex_permissi on_list"; |
76 public static final String PREF_POPUP_PERMISSION = "popup_permission_list"; | 77 public static final String PREF_POPUP_PERMISSION = "popup_permission_list"; |
77 public static final String PREF_PROTECTED_MEDIA_IDENTIFIER_PERMISSION = | 78 public static final String PREF_PROTECTED_MEDIA_IDENTIFIER_PERMISSION = |
78 "protected_media_identifier_permission_list"; | 79 "protected_media_identifier_permission_list"; |
79 public static final String PREF_PUSH_NOTIFICATIONS_PERMISSION = | 80 public static final String PREF_PUSH_NOTIFICATIONS_PERMISSION = |
80 "push_notifications_list"; | 81 "push_notifications_list"; |
81 | 82 |
82 // All permissions from the permissions preference category must be listed h ere. | 83 // All permissions from the permissions preference category must be listed h ere. |
83 // TODO(mvanouwerkerk): Use this array in more places to reduce verbosity. | 84 // TODO(mvanouwerkerk): Use this array in more places to reduce verbosity. |
84 private static final String[] PERMISSION_PREFERENCE_KEYS = { | 85 private static final String[] PERMISSION_PREFERENCE_KEYS = { |
85 PREF_CAMERA_CAPTURE_PERMISSION, | 86 PREF_CAMERA_CAPTURE_PERMISSION, |
86 PREF_COOKIES_PERMISSION, | 87 PREF_COOKIES_PERMISSION, |
87 PREF_FULLSCREEN_PERMISSION, | 88 PREF_FULLSCREEN_PERMISSION, |
88 PREF_JAVASCRIPT_PERMISSION, | 89 PREF_JAVASCRIPT_PERMISSION, |
90 PREF_KEYGEN_PERMISSION, | |
89 PREF_LOCATION_ACCESS, | 91 PREF_LOCATION_ACCESS, |
90 PREF_MIC_CAPTURE_PERMISSION, | 92 PREF_MIC_CAPTURE_PERMISSION, |
91 PREF_MIDI_SYSEX_PERMISSION, | 93 PREF_MIDI_SYSEX_PERMISSION, |
92 PREF_POPUP_PERMISSION, | 94 PREF_POPUP_PERMISSION, |
93 PREF_PROTECTED_MEDIA_IDENTIFIER_PERMISSION, | 95 PREF_PROTECTED_MEDIA_IDENTIFIER_PERMISSION, |
94 PREF_PUSH_NOTIFICATIONS_PERMISSION, | 96 PREF_PUSH_NOTIFICATIONS_PERMISSION, |
95 }; | 97 }; |
96 | 98 |
97 // The website this page is displaying details about. | 99 // The website this page is displaying details about. |
98 private Website mSite; | 100 private Website mSite; |
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
277 preference.setOnPreferenceClickListener(this); | 279 preference.setOnPreferenceClickListener(this); |
278 } else if (PREF_CAMERA_CAPTURE_PERMISSION.equals(preference.getKey() )) { | 280 } else if (PREF_CAMERA_CAPTURE_PERMISSION.equals(preference.getKey() )) { |
279 setUpListPreference(preference, mSite.getCameraPermission()); | 281 setUpListPreference(preference, mSite.getCameraPermission()); |
280 } else if (PREF_COOKIES_PERMISSION.equals(preference.getKey())) { | 282 } else if (PREF_COOKIES_PERMISSION.equals(preference.getKey())) { |
281 setUpListPreference(preference, mSite.getCookiePermission()); | 283 setUpListPreference(preference, mSite.getCookiePermission()); |
282 } else if (PREF_FULLSCREEN_PERMISSION.equals(preference.getKey())) { | 284 } else if (PREF_FULLSCREEN_PERMISSION.equals(preference.getKey())) { |
283 preference.setEnabled(false); | 285 preference.setEnabled(false); |
284 setUpListPreference(preference, mSite.getFullscreenPermission()) ; | 286 setUpListPreference(preference, mSite.getFullscreenPermission()) ; |
285 } else if (PREF_JAVASCRIPT_PERMISSION.equals(preference.getKey())) { | 287 } else if (PREF_JAVASCRIPT_PERMISSION.equals(preference.getKey())) { |
286 setUpListPreference(preference, mSite.getJavaScriptPermission()) ; | 288 setUpListPreference(preference, mSite.getJavaScriptPermission()) ; |
289 } else if (PREF_KEYGEN_PERMISSION.equals(preference.getKey())) { | |
290 setUpListPreference(preference, mSite.getKeygenPermission()); | |
287 } else if (PREF_LOCATION_ACCESS.equals(preference.getKey())) { | 291 } else if (PREF_LOCATION_ACCESS.equals(preference.getKey())) { |
288 setUpLocationPreference(preference); | 292 setUpLocationPreference(preference); |
289 } else if (PREF_MIC_CAPTURE_PERMISSION.equals(preference.getKey())) { | 293 } else if (PREF_MIC_CAPTURE_PERMISSION.equals(preference.getKey())) { |
290 setUpListPreference(preference, mSite.getMicrophonePermission()) ; | 294 setUpListPreference(preference, mSite.getMicrophonePermission()) ; |
291 } else if (PREF_MIDI_SYSEX_PERMISSION.equals(preference.getKey())) { | 295 } else if (PREF_MIDI_SYSEX_PERMISSION.equals(preference.getKey())) { |
292 setUpListPreference(preference, mSite.getMidiPermission()); | 296 setUpListPreference(preference, mSite.getMidiPermission()); |
293 } else if (PREF_POPUP_PERMISSION.equals(preference.getKey())) { | 297 } else if (PREF_POPUP_PERMISSION.equals(preference.getKey())) { |
294 setUpListPreference(preference, mSite.getPopupPermission()); | 298 setUpListPreference(preference, mSite.getPopupPermission()); |
295 } else if (PREF_PROTECTED_MEDIA_IDENTIFIER_PERMISSION.equals(prefere nce.getKey())) { | 299 } else if (PREF_PROTECTED_MEDIA_IDENTIFIER_PERMISSION.equals(prefere nce.getKey())) { |
296 setUpListPreference(preference, mSite.getProtectedMediaIdentifie rPermission()); | 300 setUpListPreference(preference, mSite.getProtectedMediaIdentifie rPermission()); |
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
501 private int getContentSettingsTypeFromPreferenceKey(String preferenceKey) { | 505 private int getContentSettingsTypeFromPreferenceKey(String preferenceKey) { |
502 switch (preferenceKey) { | 506 switch (preferenceKey) { |
503 case PREF_CAMERA_CAPTURE_PERMISSION: | 507 case PREF_CAMERA_CAPTURE_PERMISSION: |
504 return ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAM ERA; | 508 return ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAM ERA; |
505 case PREF_COOKIES_PERMISSION: | 509 case PREF_COOKIES_PERMISSION: |
506 return ContentSettingsType.CONTENT_SETTINGS_TYPE_COOKIES; | 510 return ContentSettingsType.CONTENT_SETTINGS_TYPE_COOKIES; |
507 case PREF_FULLSCREEN_PERMISSION: | 511 case PREF_FULLSCREEN_PERMISSION: |
508 return ContentSettingsType.CONTENT_SETTINGS_TYPE_FULLSCREEN; | 512 return ContentSettingsType.CONTENT_SETTINGS_TYPE_FULLSCREEN; |
509 case PREF_JAVASCRIPT_PERMISSION: | 513 case PREF_JAVASCRIPT_PERMISSION: |
510 return ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT; | 514 return ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT; |
515 case PREF_KEYGEN_PERMISSION: | |
516 return ContentSettingsType.CONTENT_SETTINGS_TYPE_KEYGEN; | |
511 case PREF_LOCATION_ACCESS: | 517 case PREF_LOCATION_ACCESS: |
512 return ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION; | 518 return ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION; |
513 case PREF_MIC_CAPTURE_PERMISSION: | 519 case PREF_MIC_CAPTURE_PERMISSION: |
514 return ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC ; | 520 return ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC ; |
515 case PREF_MIDI_SYSEX_PERMISSION: | 521 case PREF_MIDI_SYSEX_PERMISSION: |
516 return ContentSettingsType.CONTENT_SETTINGS_TYPE_MIDI_SYSEX; | 522 return ContentSettingsType.CONTENT_SETTINGS_TYPE_MIDI_SYSEX; |
517 case PREF_POPUP_PERMISSION: | 523 case PREF_POPUP_PERMISSION: |
518 return ContentSettingsType.CONTENT_SETTINGS_TYPE_POPUPS; | 524 return ContentSettingsType.CONTENT_SETTINGS_TYPE_POPUPS; |
519 case PREF_PROTECTED_MEDIA_IDENTIFIER_PERMISSION: | 525 case PREF_PROTECTED_MEDIA_IDENTIFIER_PERMISSION: |
520 return ContentSettingsType.CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA _IDENTIFIER; | 526 return ContentSettingsType.CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA _IDENTIFIER; |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
557 public boolean onPreferenceChange(Preference preference, Object newValue) { | 563 public boolean onPreferenceChange(Preference preference, Object newValue) { |
558 ContentSetting permission = ContentSetting.fromString((String) newValue) ; | 564 ContentSetting permission = ContentSetting.fromString((String) newValue) ; |
559 if (PREF_CAMERA_CAPTURE_PERMISSION.equals(preference.getKey())) { | 565 if (PREF_CAMERA_CAPTURE_PERMISSION.equals(preference.getKey())) { |
560 mSite.setCameraPermission(permission); | 566 mSite.setCameraPermission(permission); |
561 } else if (PREF_COOKIES_PERMISSION.equals(preference.getKey())) { | 567 } else if (PREF_COOKIES_PERMISSION.equals(preference.getKey())) { |
562 mSite.setCookiePermission(permission); | 568 mSite.setCookiePermission(permission); |
563 } else if (PREF_FULLSCREEN_PERMISSION.equals(preference.getKey())) { | 569 } else if (PREF_FULLSCREEN_PERMISSION.equals(preference.getKey())) { |
564 mSite.setFullscreenPermission(permission); | 570 mSite.setFullscreenPermission(permission); |
565 } else if (PREF_JAVASCRIPT_PERMISSION.equals(preference.getKey())) { | 571 } else if (PREF_JAVASCRIPT_PERMISSION.equals(preference.getKey())) { |
566 mSite.setJavaScriptPermission(permission); | 572 mSite.setJavaScriptPermission(permission); |
573 } else if (PREF_KEYGEN_PERMISSION.equals(preference.getKey())) { | |
574 mSite.setKeygenPermission(permission); | |
567 } else if (PREF_LOCATION_ACCESS.equals(preference.getKey())) { | 575 } else if (PREF_LOCATION_ACCESS.equals(preference.getKey())) { |
568 mSite.setGeolocationPermission(permission); | 576 mSite.setGeolocationPermission(permission); |
569 } else if (PREF_MIC_CAPTURE_PERMISSION.equals(preference.getKey())) { | 577 } else if (PREF_MIC_CAPTURE_PERMISSION.equals(preference.getKey())) { |
570 mSite.setMicrophonePermission(permission); | 578 mSite.setMicrophonePermission(permission); |
571 } else if (PREF_MIDI_SYSEX_PERMISSION.equals(preference.getKey())) { | 579 } else if (PREF_MIDI_SYSEX_PERMISSION.equals(preference.getKey())) { |
572 mSite.setMidiPermission(permission); | 580 mSite.setMidiPermission(permission); |
573 } else if (PREF_POPUP_PERMISSION.equals(preference.getKey())) { | 581 } else if (PREF_POPUP_PERMISSION.equals(preference.getKey())) { |
574 mSite.setPopupPermission(permission); | 582 mSite.setPopupPermission(permission); |
575 } else if (PREF_PROTECTED_MEDIA_IDENTIFIER_PERMISSION.equals(preference. getKey())) { | 583 } else if (PREF_PROTECTED_MEDIA_IDENTIFIER_PERMISSION.equals(preference. getKey())) { |
576 mSite.setProtectedMediaIdentifierPermission(permission); | 584 mSite.setProtectedMediaIdentifierPermission(permission); |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
609 if (preference != null) screen.removePreference(preference); | 617 if (preference != null) screen.removePreference(preference); |
610 } | 618 } |
611 | 619 |
612 // Clear the permissions. | 620 // Clear the permissions. |
613 mSite.setCameraPermission(ContentSetting.DEFAULT); | 621 mSite.setCameraPermission(ContentSetting.DEFAULT); |
614 mSite.setCookiePermission(ContentSetting.DEFAULT); | 622 mSite.setCookiePermission(ContentSetting.DEFAULT); |
615 WebsitePreferenceBridge.nativeClearCookieData(mSite.getAddress().getOrig in()); | 623 WebsitePreferenceBridge.nativeClearCookieData(mSite.getAddress().getOrig in()); |
616 mSite.setFullscreenPermission(ContentSetting.DEFAULT); | 624 mSite.setFullscreenPermission(ContentSetting.DEFAULT); |
617 mSite.setGeolocationPermission(ContentSetting.DEFAULT); | 625 mSite.setGeolocationPermission(ContentSetting.DEFAULT); |
618 mSite.setJavaScriptPermission(ContentSetting.DEFAULT); | 626 mSite.setJavaScriptPermission(ContentSetting.DEFAULT); |
627 mSite.setKeygenPermission(ContentSetting.DEFAULT); | |
619 mSite.setMicrophonePermission(ContentSetting.DEFAULT); | 628 mSite.setMicrophonePermission(ContentSetting.DEFAULT); |
620 mSite.setMidiPermission(ContentSetting.DEFAULT); | 629 mSite.setMidiPermission(ContentSetting.DEFAULT); |
621 mSite.setPopupPermission(ContentSetting.DEFAULT); | 630 mSite.setPopupPermission(ContentSetting.DEFAULT); |
622 mSite.setProtectedMediaIdentifierPermission(ContentSetting.DEFAULT); | 631 mSite.setProtectedMediaIdentifierPermission(ContentSetting.DEFAULT); |
623 mSite.setPushNotificationPermission(ContentSetting.DEFAULT); | 632 mSite.setPushNotificationPermission(ContentSetting.DEFAULT); |
624 | 633 |
625 // Clear the storage and finish the activity if necessary. | 634 // Clear the storage and finish the activity if necessary. |
626 if (mSite.getTotalUsage() > 0) { | 635 if (mSite.getTotalUsage() > 0) { |
627 clearStoredData(); | 636 clearStoredData(); |
628 } else { | 637 } else { |
629 // Clearing stored data implies popping back to parent menu if there | 638 // Clearing stored data implies popping back to parent menu if there |
630 // is nothing left to show. Therefore, we only need to explicitly | 639 // is nothing left to show. Therefore, we only need to explicitly |
631 // close the activity if there's no stored data to begin with. | 640 // close the activity if there's no stored data to begin with. |
632 getActivity().finish(); | 641 getActivity().finish(); |
633 } | 642 } |
634 } | 643 } |
635 } | 644 } |
OLD | NEW |