/*
- * Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
+ *
+ * Huawei spinner code fix contributed 2017 Thomas Jensen <lianergoist@vongriffen.dk>. Copyright assigned to Soren Stoutner <soren@stoutner.com>.
*
* This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
*
import android.widget.TextView;
import com.stoutner.privacybrowser.R;
+import com.stoutner.privacybrowser.activities.MainWebViewActivity;
import com.stoutner.privacybrowser.helpers.DomainsDatabaseHelper;
public class DomainSettingsFragment extends Fragment {
final TextView userAgentTextView = (TextView) domainSettingsView.findViewById(R.id.domain_settings_user_agent_textview);
final EditText customUserAgentEditText = (EditText) domainSettingsView.findViewById(R.id.domain_settings_custom_user_agent_edittext);
Spinner fontSizeSpinner = (Spinner) domainSettingsView.findViewById(R.id.domain_settings_font_size_spinner);
+ final ImageView displayWebpageImagesImageView = (ImageView) domainSettingsView.findViewById(R.id.domain_settings_display_webpage_images_imageview);
+ Spinner displayWebpageImagesSpinner = (Spinner) domainSettingsView.findViewById(R.id.domain_settings_display_webpage_images_spinner);
// Initialize the database handler. `this` specifies the context. The two `nulls` do not specify the database name or a `CursorFactory`.
// The `0` specifies the database version, but that is ignored and set instead using a constant in `DomainsDatabaseHelper`.
int formDataEnabledInt = domainCursor.getInt(domainCursor.getColumnIndex(DomainsDatabaseHelper.ENABLE_FORM_DATA));
final String currentUserAgentString = domainCursor.getString(domainCursor.getColumnIndex(DomainsDatabaseHelper.USER_AGENT));
int fontSizeInt = domainCursor.getInt(domainCursor.getColumnIndex(DomainsDatabaseHelper.FONT_SIZE));
+ int displayImagesInt = domainCursor.getInt(domainCursor.getColumnIndex(DomainsDatabaseHelper.DISPLAY_IMAGES));
// Create `ArrayAdapters` for the `Spinners`and their `entry values`.
ArrayAdapter<CharSequence> userAgentArrayAdapter = ArrayAdapter.createFromResource(context, R.array.user_agent_entries, android.R.layout.simple_spinner_item);
final ArrayAdapter<CharSequence> userAgentEntryValuesArrayAdapter = ArrayAdapter.createFromResource(context, R.array.user_agent_entry_values, android.R.layout.simple_spinner_item);
ArrayAdapter<CharSequence> fontSizeArrayAdapter = ArrayAdapter.createFromResource(context, R.array.default_font_size_entries, android.R.layout.simple_spinner_item);
ArrayAdapter<CharSequence> fontSizeEntryValuesArrayAdapter = ArrayAdapter.createFromResource(context, R.array.default_font_size_entry_values, android.R.layout.simple_spinner_item);
-
- // Set the drop down style for the `ArrayAdapters`.
- userAgentArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
- fontSizeArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+ final ArrayAdapter<CharSequence> displayImagesArrayAdapter = ArrayAdapter.createFromResource(context, R.array.display_website_images_array, android.R.layout.simple_spinner_item);
+
+ // Some phones running Huawei's customized Android 7.0 have layout problems displaying a spinner with the default `simple_spinner_dropdown_item`. The Huawei P9 Lite is known to be affected.
+ if (Build.BRAND.equals("HUAWEI") && (Build.VERSION.SDK_INT == 24)) { // The device is manufactured by Huawei and is running Android 7.0.
+ // Use a customized `simple_spinner_dropdown_item`. Huawei spinner code fix contributed 2017 Thomas Jensen <lianergoist@vongriffen.dk>. Copyright assigned to Soren Stoutner <soren@stoutner.com>.
+ userAgentArrayAdapter.setDropDownViewResource(R.layout.simple_spinner_dropdown_item_huawei_fix);
+ fontSizeArrayAdapter.setDropDownViewResource(R.layout.simple_spinner_dropdown_item_huawei_fix);
+ displayImagesArrayAdapter.setDropDownViewResource(R.layout.simple_spinner_dropdown_item_huawei_fix);
+ } else { // Use the standard `android.R.layout.simple_spinner_dropdown_item` on all other devices.
+ userAgentArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+ fontSizeArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+ displayImagesArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+ }
// Set the `ArrayAdapters` for the `Spinners`.
userAgentSpinner.setAdapter(userAgentArrayAdapter);
fontSizeSpinner.setAdapter(fontSizeArrayAdapter);
+ displayWebpageImagesSpinner.setAdapter(displayImagesArrayAdapter);
// Set the domain name from the the database cursor.
domainNameEditText.setText(domainNameString);
firstPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_enabled));
} else { // First-party cookies are disabled.
firstPartyCookiesEnabledSwitch.setChecked(false);
- firstPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_disabled));
+ firstPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_disabled_light));
}
// Only display third-party cookies if SDK_INT >= 21.
thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_warning));
} else { // First party cookies are enabled but third-party cookies are disabled.
thirdPartyCookiesEnabledSwitch.setChecked(false);
- thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_disabled));
+ thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_disabled_light));
}
} else { // First-party cookies are disabled.
// Set the status of third-party cookies, but disable it.
if (thirdPartyCookiesEnabledInt == 1) { // Third-party cookies are enabled but first-party cookies are disabled.
thirdPartyCookiesEnabledSwitch.setChecked(true);
thirdPartyCookiesEnabledSwitch.setEnabled(false);
- thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_ghosted));
+ thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_ghosted_light));
} else { // Both first party and third-party cookies are disabled.
thirdPartyCookiesEnabledSwitch.setChecked(false);
thirdPartyCookiesEnabledSwitch.setEnabled(false);
- thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_ghosted));
+ thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_ghosted_light));
}
}
} else { // Third-party cookies cannot be configured for API <= 21.
domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_enabled));
} else { // JavaScript is enabled but DOM storage is disabled.
domStorageEnabledSwitch.setChecked(false);
- domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_disabled));
+ domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_disabled_light));
}
} else { // JavaScript is disabled.
- // Set the status of DOM storage, but disable it.
+ // Set the checked status of DOM storage.
if (domStorageEnabledInt == 1) { // DOM storage is enabled but JavaScript is disabled.
domStorageEnabledSwitch.setChecked(true);
- domStorageEnabledSwitch.setEnabled(false);
- domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_ghosted));
} else { // Both JavaScript and DOM storage are disabled.
domStorageEnabledSwitch.setChecked(false);
- domStorageEnabledSwitch.setEnabled(false);
- domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_ghosted));
}
+
+ // Disable `domStorageEnabledSwitch` and set the icon to be ghosted.
+ domStorageEnabledSwitch.setEnabled(false);
+ domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_ghosted_light));
}
// Set the form data status. Once minimum API >= 21 we can use a selector as the tint mode instead of specifying different icons.
formDataImageView.setImageDrawable(getResources().getDrawable(R.drawable.form_data_enabled));
} else { // Form data is disabled.
formDataEnabledSwitch.setChecked(false);
- formDataImageView.setImageDrawable(getResources().getDrawable(R.drawable.form_data_disabled));
+ formDataImageView.setImageDrawable(getResources().getDrawable(R.drawable.form_data_disabled_light));
}
// We need to inflated a `WebView` to get the default user agent.
int fontSizeArrayPosition = fontSizeEntryValuesArrayAdapter.getPosition(String.valueOf(fontSizeInt));
fontSizeSpinner.setSelection(fontSizeArrayPosition);
+ // Set the selected display website images mode.
+ displayWebpageImagesSpinner.setSelection(displayImagesInt);
+
+ // Set the display website images icon.
+ switch (displayImagesInt) {
+ case DomainsDatabaseHelper.DISPLAY_WEBPAGE_IMAGES_SYSTEM_DEFAULT:
+ if (MainWebViewActivity.displayWebpageImagesBoolean) {
+ displayWebpageImagesImageView.setImageDrawable(getResources().getDrawable(R.drawable.images_enabled_light));
+ } else {
+ displayWebpageImagesImageView.setImageDrawable(getResources().getDrawable(R.drawable.images_disabled_light));
+ }
+ break;
+
+ case DomainsDatabaseHelper.DISPLAY_WEBPAGE_IMAGES_ENABLED:
+ displayWebpageImagesImageView.setImageDrawable(getResources().getDrawable(R.drawable.images_enabled_light));
+ break;
+
+ case DomainsDatabaseHelper.DISPLAY_WEBPAGE_IMAGES_DISABLED:
+ displayWebpageImagesImageView.setImageDrawable(getResources().getDrawable(R.drawable.images_disabled_light));
+ break;
+ }
+
+
// Set the `javaScriptEnabledSwitch` `OnCheckedChangeListener()`.
javaScriptEnabledSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
if (domStorageEnabledSwitch.isChecked()) { // DOM storage is enabled.
domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_enabled));
} else { // DOM storage is disabled.
- domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_disabled));
+ domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_disabled_light));
}
} else { // JavaScript is disabled.
// Update the JavaScript icon.
domStorageEnabledSwitch.setEnabled(false);
// Set the DOM storage icon to be ghosted.
- domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_ghosted));
+ domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_ghosted_light));
}
}
});
if (thirdPartyCookiesEnabledSwitch.isChecked()) { // Third-party cookies are enabled.
thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_warning));
} else { // Third-party cookies are disabled.
- thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_disabled));
+ thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_disabled_light));
}
} else { // First-party cookies are disabled.
// Update the first-party cookies icon.
- firstPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_disabled));
+ firstPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_disabled_light));
// Disable the third-party cookies `Switch`.
thirdPartyCookiesEnabledSwitch.setEnabled(false);
// Set the third-party cookies icon to be ghosted.
- thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_ghosted));
+ thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_ghosted_light));
}
}
});
if (isChecked) {
thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_warning));
} else {
- thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_disabled));
+ thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_disabled_light));
}
}
});
if (isChecked) {
domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_enabled));
} else {
- domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_disabled));
+ domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_disabled_light));
}
}
});
if (isChecked) {
formDataImageView.setImageDrawable(getResources().getDrawable(R.drawable.form_data_enabled));
} else {
- formDataImageView.setImageDrawable(getResources().getDrawable(R.drawable.form_data_disabled));
+ formDataImageView.setImageDrawable(getResources().getDrawable(R.drawable.form_data_disabled_light));
}
}
});
}
});
+ // Set the `displayImagesSwitch` `onItemClickListener()`.
+ displayWebpageImagesSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+ @Override
+ public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+ // Update the icon.
+ switch (position) {
+ case DomainsDatabaseHelper.DISPLAY_WEBPAGE_IMAGES_SYSTEM_DEFAULT:
+ if (MainWebViewActivity.displayWebpageImagesBoolean) {
+ displayWebpageImagesImageView.setImageDrawable(getResources().getDrawable(R.drawable.images_enabled_light));
+ } else {
+ displayWebpageImagesImageView.setImageDrawable(getResources().getDrawable(R.drawable.images_disabled_light));
+ }
+ break;
+
+ case DomainsDatabaseHelper.DISPLAY_WEBPAGE_IMAGES_ENABLED:
+ displayWebpageImagesImageView.setImageDrawable(getResources().getDrawable(R.drawable.images_enabled_light));
+ break;
+
+ case DomainsDatabaseHelper.DISPLAY_WEBPAGE_IMAGES_DISABLED:
+ displayWebpageImagesImageView.setImageDrawable(getResources().getDrawable(R.drawable.images_disabled_light));
+ break;
+ }
+ }
+
+ @Override
+ public void onNothingSelected(AdapterView<?> parent) {
+ // Do nothing.
+ }
+ });
+
return domainSettingsView;
}
}
projects / PrivacyBrowserAndroid.git / blobdiff