import android.annotation.SuppressLint;
import android.content.Context;
+import android.content.SharedPreferences;
import android.database.Cursor;
import android.os.Build;
import android.os.Bundle;
// We have to use `android.support.v4.app.Fragment` until minimum API >= 23. Otherwise we cannot call `getContext()`.
+import android.preference.PreferenceManager;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
// `DATABASE_ID` is used by activities calling this fragment.
public static final String DATABASE_ID = "database_id";
- // `databaseId` is used in `onCreate()` and `onCreateView()`.
- private int databaseId;
+ // `databaseId` is public statis so it can be accessed from `DomainsActivity`. It is also used in `onCreate()` and `onCreateView()`.
+ public static int databaseId;
@Override
public void onCreate(Bundle savedInstanceState) {
@SuppressWarnings("deprecation")
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
- // Inflate `domain_settings`. `false` does not attach it to the root `container`.
- View domainSettingsView = inflater.inflate(R.layout.domain_settings, container, false);
+ // Inflate `domain_settings_fragment`. `false` does not attach it to the root `container`.
+ View domainSettingsView = inflater.inflate(R.layout.domain_settings_fragment, container, false);
// Get a handle for the `Context`.
Context context = getContext();
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`.
- DomainsDatabaseHelper domainsDatabaseHelper = new DomainsDatabaseHelper(getContext(), null, null, 0);
+ // Initialize the database handler. 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`.
+ DomainsDatabaseHelper domainsDatabaseHelper = new DomainsDatabaseHelper(context, null, null, 0);
// Get the database `Cursor` for this ID and move it to the first row.
Cursor domainCursor = domainsDatabaseHelper.getCursorForId(databaseId);
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, R.layout.spinner_item);
- final ArrayAdapter<CharSequence> userAgentEntryValuesArrayAdapter = ArrayAdapter.createFromResource(context, R.array.user_agent_entry_values, R.layout.spinner_item);
- ArrayAdapter<CharSequence> fontSizeArrayAdapter = ArrayAdapter.createFromResource(context, R.array.default_font_size_entries, R.layout.spinner_item);
- ArrayAdapter<CharSequence> fontSizeEntryValuesArrayAdapter = ArrayAdapter.createFromResource(context, R.array.default_font_size_entry_values, R.layout.spinner_item);
+ ArrayAdapter<CharSequence> userAgentArrayAdapter = ArrayAdapter.createFromResource(context, R.array.domain_settings_user_agent_entries, R.layout.spinner_item);
+ final ArrayAdapter<CharSequence> userAgentEntryValuesArrayAdapter = ArrayAdapter.createFromResource(context, R.array.domain_settings_user_agent_entry_values, R.layout.spinner_item);
+ ArrayAdapter<CharSequence> fontSizeArrayAdapter = ArrayAdapter.createFromResource(context, R.array.domain_settings_font_size_entries, R.layout.spinner_item);
+ ArrayAdapter<CharSequence> fontSizeEntryValuesArrayAdapter = ArrayAdapter.createFromResource(context, R.array.domain_settings_font_size_entry_values, R.layout.spinner_item);
final ArrayAdapter<CharSequence> displayImagesArrayAdapter = ArrayAdapter.createFromResource(context, R.array.display_website_images_array, R.layout.spinner_item);
// Set the `DropDownViewResource` on the `Spinners`.
WebView bareWebView = (WebView) bareWebViewLayout.findViewById(R.id.bare_webview);
final String webViewDefaultUserAgentString = bareWebView.getSettings().getUserAgentString();
+ // Get a handle for the shared preference.
+ SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+
+ // Store the default user agent string values.
+ final String defaultUserAgentString = sharedPreferences.getString("user_agent", "PrivacyBrowser/1.0");
+ final String defaultCustomUserAgentString = sharedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0");
+
// Get the position of the user agent in `userAgentEntryValuesArrayAdapter`.
int userAgentArrayPosition = userAgentEntryValuesArrayAdapter.getPosition(currentUserAgentString);
// Show `customUserAgentEditText` and set `userAgentString` as the text.
customUserAgentEditText.setVisibility(View.VISIBLE);
customUserAgentEditText.setText(currentUserAgentString);
- } else if (currentUserAgentString.equals("WebView default user agent")) { // We are using the `WebView` default user agent.
+ } else{ // We are using one of the preset user agents.
// Set the `userAgentSpinner` selection.
userAgentSpinner.setSelection(userAgentArrayPosition);
- // Show `userAgentTextView` and set the text.
+ // Show `userAgentTextView`.
userAgentTextView.setVisibility(View.VISIBLE);
- userAgentTextView.setText(webViewDefaultUserAgentString);
// Hide `customUserAgentEditText`.
customUserAgentEditText.setVisibility(View.GONE);
- } else { // We are using a standard user agent.
- // Set the `userAgentSpinner` selection.
- userAgentSpinner.setSelection(userAgentArrayPosition);
- // Show `userAgentTextView` and set the text.
- userAgentTextView.setVisibility(View.VISIBLE);
- userAgentTextView.setText(currentUserAgentString);
+ // Set the user agent text.
+ switch (currentUserAgentString) {
+ case "System default user agent":
+ // Display the user agent text string.
+ switch (defaultUserAgentString) {
+ case "WebView default user agent":
+ // Display the `WebView` default user agent.
+ userAgentTextView.setText(webViewDefaultUserAgentString);
+ break;
+
+ case "Custom user agent":
+ // Display the custom user agent.
+ userAgentTextView.setText(defaultCustomUserAgentString);
+ break;
+
+ default:
+ // Display the text from `defaultUserAgentString`.
+ userAgentTextView.setText(defaultUserAgentString);
+ }
+ break;
- // Hide `customUserAgentEditText`.
- customUserAgentEditText.setVisibility(View.GONE);
+ case "WebView default user agent":
+ // Display the `WebView` default user agent.
+ userAgentTextView.setText(webViewDefaultUserAgentString);
+ break;
+
+ default:
+ // Display the text from `currentUserAgentString`.
+ userAgentTextView.setText(currentUserAgentString);
+ }
}
// Set the selected font size.
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
// Store the new user agent string.
- String newUserAgentString = getResources().getStringArray(R.array.user_agent_entry_values)[position];
+ String newUserAgentString = getResources().getStringArray(R.array.domain_settings_user_agent_entry_values)[position];
// Set the new user agent.
switch (newUserAgentString) {
- case "Custom user agent":
- // Hide `userAgentTextView`.
- userAgentTextView.setVisibility(View.GONE);
+ case "System default user agent":
+ // Show `userAgentTextView`.
+ userAgentTextView.setVisibility(View.VISIBLE);
- // Show `customUserAgentEditText` and set `userAgentString` as the text.
- customUserAgentEditText.setVisibility(View.VISIBLE);
- customUserAgentEditText.setText(currentUserAgentString);
+ // Hide `customUserAgentEditText`.
+ customUserAgentEditText.setVisibility(View.GONE);
+
+ // Set the user text.
+ switch (defaultUserAgentString) {
+ case "WebView default user agent":
+ // Display the `WebView` default user agent.
+ userAgentTextView.setText(webViewDefaultUserAgentString);
+ break;
+
+ case "Custom user agent":
+ // Display the custom user agent.
+ userAgentTextView.setText(defaultCustomUserAgentString);
+ break;
+
+ default:
+ // Display the text from `defaultUserAgentString`.
+ userAgentTextView.setText(defaultUserAgentString);
+ }
break;
case "WebView default user agent":
customUserAgentEditText.setVisibility(View.GONE);
break;
+ case "Custom user agent":
+ // Hide `userAgentTextView`.
+ userAgentTextView.setVisibility(View.GONE);
+
+ // Show `customUserAgentEditText` and set `userAgentString` as the text.
+ customUserAgentEditText.setVisibility(View.VISIBLE);
+ customUserAgentEditText.setText(currentUserAgentString);
+ break;
+
default:
// Show `userAgentTextView` and set the text.
userAgentTextView.setVisibility(View.VISIBLE);
- userAgentTextView.setText(getResources().getStringArray(R.array.user_agent_entry_values)[position]);
+ userAgentTextView.setText(newUserAgentString);
// Hide `customUserAgentEditText`.
customUserAgentEditText.setVisibility(View.GONE);
- break;
}
}
projects / PrivacyBrowserAndroid.git / blobdiff