X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Factivities%2FDomainsActivity.java;h=de68623e5eaa5974253a8ba78fd5dc146c101a4d;hb=8ca39b63e2d15fbb6828e255be4e0b5493c744ce;hp=59c5fb9ff6d4b30bcdabea988b905757c937c453;hpb=8de7d02ce90569e36be421d89c44d3ef3f7378f6;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.java index 59c5fb9f..de68623e 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.java @@ -21,6 +21,7 @@ package com.stoutner.privacybrowser.activities; import android.content.Context; import android.database.Cursor; +import android.net.http.SslCertificate; import android.os.Bundle; import android.os.Handler; import android.support.design.widget.FloatingActionButton; @@ -38,6 +39,7 @@ import android.view.ViewGroup; import android.widget.CursorAdapter; import android.widget.EditText; import android.widget.ListView; +import android.widget.RadioButton; import android.widget.Spinner; import android.widget.Switch; import android.widget.TextView; @@ -49,15 +51,12 @@ import com.stoutner.privacybrowser.fragments.DomainsListFragment; import com.stoutner.privacybrowser.helpers.DomainsDatabaseHelper; public class DomainsActivity extends AppCompatActivity implements AddDomainDialog.AddDomainListener { - // `twoPanedMode` is public static so it can be accessed from `DomainsListFragment`. It is also used in `onCreate()` and `populateDomainsListView()`. + // `twoPanedMode` is public static so it can be accessed from `DomainsListFragment`. It is also used in `onCreate()`, `onCreateOptionsMenu()`, and `populateDomainsListView()`. public static boolean twoPanedMode; - // `databaseId` is public static so it can be accessed from `DomainsListFragment`. It is also used in `saveDomainSettings()` and `populateDomainsListView()`. + // `databaseId` is public static so it can be accessed from `DomainsListFragment`. It is also used in `onCreateOptionsMenu()`, `saveDomainSettings()` and `populateDomainsListView()`. public static int currentDomainDatabaseId; - // `domainSettingsFragmentDisplayed` is public static so it can be accessed from `DomainsListFragment`. It is also used in `onCreate()`, `onOptionsItemSelected()`, and `onBackPressed()`. - public static boolean domainSettingsFragmentDisplayed; - // `deleteMenuItem` is public static so it can be accessed from `DomainsListFragment`. It is also used in `onCreateOptionsMenu()`, `onOptionsItemSelected()`, and `onBackPressed()`. public static MenuItem deleteMenuItem; @@ -70,7 +69,7 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // `context` is used in `onCreate()`, `onOptionsItemSelected()`, and `onAddDomain()`. private Context context; - // `supportFragmentManager` is used in `onCreate()`. + // `supportFragmentManager` is used in `onCreate()` and `onCreateOptionsMenu()`. private FragmentManager supportFragmentManager; // `domainsDatabaseHelper` is used in `onCreate()` and `saveDomainSettings()`. @@ -79,9 +78,21 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // `domainsListView` is used in `onCreate()` and `populateDomainsList()`. private ListView domainsListView; - // `addDomainFAB` is used in `onCreate()`, `onOptionsItemSelected()`, and `onBackPressed()`. + // `addDomainFAB` is used in `onCreate()`, `onCreateOptionsMenu()`, `onOptionsItemSelected()`, and `onBackPressed()`. private FloatingActionButton addDomainFAB; + // `deletedDomainPosition` is used in an inner and outer class in `onOptionsItemSelected()`. + private int deletedDomainPosition; + + // `restartAfterRotate` is used in `onCreate()` and `onCreateOptionsMenu()`. + private boolean restartAfterRotate; + + // `domainSettingsDisplayedBeforeRotate` is used in `onCreate()` and `onCreateOptionsMenu()`. + private boolean domainSettingsDisplayedBeforeRotate; + + // `domainSettingsDatabaseIdBeforeRotate` is used in `onCreate()` and `onCreateOptionsMenu()`. + private int domainSettingsDatabaseIdBeforeRotate; + @Override protected void onCreate(Bundle savedInstanceState) { // Set the activity theme. @@ -94,6 +105,13 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // Run the default commands. super.onCreate(savedInstanceState); + // Extract the values from `savedInstanceState` if it is not `null`. + if (savedInstanceState != null) { + restartAfterRotate = true; + domainSettingsDisplayedBeforeRotate = savedInstanceState.getBoolean("domainSettingsDisplayed"); + domainSettingsDatabaseIdBeforeRotate = savedInstanceState.getInt("domainSettingsDatabaseId"); + } + // Set the content view. setContentView(R.layout.domains_coordinatorlayout); @@ -118,11 +136,6 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // Determine if we are in two pane mode. `domain_settings_fragment_container` does not exist on devices with a width less than 900dp. twoPanedMode = (findViewById(R.id.domain_settings_fragment_container) != null); - // Display `DomainsListFragment`. - DomainsListFragment domainsListFragment = new DomainsListFragment(); - supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainsListFragment).commit(); - supportFragmentManager.executePendingTransactions(); - // Configure `addDomainFAB`. addDomainFAB = (FloatingActionButton) findViewById(R.id.add_domain_fab); addDomainFAB.setOnClickListener(new View.OnClickListener() { @@ -146,8 +159,50 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // Only display `deleteMenuItem` (initially) in two-paned mode. deleteMenuItem.setVisible(twoPanedMode); - // Populate the list of domains. We have to do this from `onCreateOptionsMenu()` instead of `onCreate()` because `populateDomainsListView()` needs the `deleteMenuItem` to be inflated. `-1` highlights the first domain. - populateDomainsListView(-1); + // Display the fragments. This must be done from `onCreateOptionsMenu()` instead of `onCreate()` because `populateDomainsListView()` needs `deleteMenuItem` to be inflated. + if (restartAfterRotate && !twoPanedMode && domainSettingsDisplayedBeforeRotate) { // The device was rotated, the new configuration is in single-paned mode, and domain settings were displayed previously. + // Reset `restartAfterRotate`. + restartAfterRotate = false; + + // Store `currentDomainDatabaseId`. + currentDomainDatabaseId = domainSettingsDatabaseIdBeforeRotate; + + // Add `currentDomainDatabaseId` to `argumentsBundle`. + Bundle argumentsBundle = new Bundle(); + argumentsBundle.putInt(DomainSettingsFragment.DATABASE_ID, currentDomainDatabaseId); + + // Add `argumentsBundle` to `domainSettingsFragment`. + DomainSettingsFragment domainSettingsFragment = new DomainSettingsFragment(); + domainSettingsFragment.setArguments(argumentsBundle); + + // Show `deleteMenuItem`. + deleteMenuItem.setVisible(true); + + // Hide `add_domain_fab`. + addDomainFAB.setVisibility(View.GONE); + + // Display `domainSettingsFragment`. + supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainSettingsFragment).commit(); + } else if (restartAfterRotate && twoPanedMode && domainSettingsDisplayedBeforeRotate) { // The device was rotated, the new configuration is in two-paned mode, and domain settings were displayed previously. + // Reset `restartAfterRotate`. + restartAfterRotate = false; + + // Display `DomainsListFragment`. + DomainsListFragment domainsListFragment = new DomainsListFragment(); + supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainsListFragment).commit(); + supportFragmentManager.executePendingTransactions(); + + // Populate the list of domains. `domainSettingsDatabaseId` highlights the domain that was highlighted before the rotation. + populateDomainsListView(domainSettingsDatabaseIdBeforeRotate); + } else { // The device was not rotated or, if it was, domain settings were not displayed previously. + // Display `DomainsListFragment`. + DomainsListFragment domainsListFragment = new DomainsListFragment(); + supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainsListFragment).commit(); + supportFragmentManager.executePendingTransactions(); + + // Populate the list of domains. `-1` highlights the first domain. + populateDomainsListView(-1); + } // Success! return true; @@ -168,7 +223,7 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // Go home. NavUtils.navigateUpFromSameTask(this); - } else if (domainSettingsFragmentDisplayed) { // The device is in single-paned mode and `DomainSettingsFragment` is displayed. + } else if (findViewById(R.id.domain_settings_scrollview) != null) { // The device is in single-paned mode and `DomainSettingsFragment` is displayed. // Save the current domain settings. saveDomainSettings(); @@ -180,9 +235,6 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // Populate the list of domains. `-1` highlights the first domain if in two-paned mode. It has no effect in single-paned mode. populateDomainsListView(-1); - // Update `domainSettingsFragmentDisplayed`. - domainSettingsFragmentDisplayed = false; - // Display `addDomainFAB`. addDomainFAB.setVisibility(View.VISIBLE); @@ -198,11 +250,11 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // Store a copy of `currentDomainDatabaseId` because it could change while the `Snackbar` is displayed. final int databaseIdToDelete = currentDomainDatabaseId; - // Store the deleted domain position, which is needed if `Undo` is selected in the `Snackbar`. - final int deletedDomainPosition = domainsListView.getCheckedItemPosition(); - // Update the fragments and menu items. if (twoPanedMode) { // Two-paned mode. + // Store the deleted domain position, which is needed if `Undo` is selected in the `Snackbar`. + deletedDomainPosition = domainsListView.getCheckedItemPosition(); + // Disable the options `MenuItems`. deleteMenuItem.setEnabled(false); deleteMenuItem.setIcon(R.drawable.delete_blue); @@ -215,9 +267,6 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainsListFragment).commit(); supportFragmentManager.executePendingTransactions(); - // Update `domainSettingsFragmentDisplayed`. - domainSettingsFragmentDisplayed = false; - // Display `addDomainFAB`. addDomainFAB.setVisibility(View.VISIBLE); @@ -317,9 +366,6 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // Show and enable `deleteMenuItem`. deleteMenuItem.setVisible(true); - // Set `domainSettingsFragmentDisplayed`. - domainSettingsFragmentDisplayed = true; - // Display `domainSettingsFragment`. supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainSettingsFragment).commit(); } @@ -373,6 +419,24 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo return true; } + @Override + protected void onSaveInstanceState(Bundle outState) { + // Store the current `DomainSettingsFragment` state in `outState`. + if (findViewById(R.id.domain_settings_scrollview) != null) { // `DomainSettingsFragment` is displayed. + // Save any changes that have been made to the domain settings. + saveDomainSettings(); + + // Store `DomainSettingsDisplayed`. + outState.putBoolean("domainSettingsDisplayed", true); + outState.putInt("domainSettingsDatabaseId", DomainSettingsFragment.databaseId); + } else { // `DomainSettingsFragment` is not displayed. + outState.putBoolean("domainSettingsDisplayed", false); + outState.putInt("domainSettingsDatabaseId", -1); + } + + super.onSaveInstanceState(outState); + } + // Control what the navigation bar back button does. @Override public void onBackPressed() { @@ -384,7 +448,7 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // Go home. NavUtils.navigateUpFromSameTask(this); - } else if (domainSettingsFragmentDisplayed) { // The device is in single-paned mode and `DomainSettingsFragment` is displayed. + } else if (findViewById(R.id.domain_settings_scrollview) != null) { // The device is in single-paned mode and `DomainSettingsFragment` is displayed. // Save the current domain settings. saveDomainSettings(); @@ -396,9 +460,6 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // Populate the list of domains. `-1` highlights the first domain if in two-paned mode. It has no effect in single-paned mode. populateDomainsListView(-1); - // Update `domainSettingsFragmentDisplayed`. - domainSettingsFragmentDisplayed = false; - // Display `addDomainFAB`. addDomainFAB.setVisibility(View.VISIBLE); @@ -434,9 +495,6 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // Show and enable `deleteMenuItem`. DomainsActivity.deleteMenuItem.setVisible(true); - // Set `domainSettingsFragmentDisplayed`. - DomainsActivity.domainSettingsFragmentDisplayed = true; - // Add `currentDomainDatabaseId` to `argumentsBundle`. Bundle argumentsBundle = new Bundle(); argumentsBundle.putInt(DomainSettingsFragment.DATABASE_ID, currentDomainDatabaseId); @@ -462,6 +520,10 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo EditText customUserAgentEditText = (EditText) findViewById(R.id.domain_settings_custom_user_agent_edittext); Spinner fontSizeSpinner = (Spinner) findViewById(R.id.domain_settings_font_size_spinner); Spinner displayWebpageImagesSpinner = (Spinner) findViewById(R.id.domain_settings_display_webpage_images_spinner); + Spinner nightModeSpinner = (Spinner) findViewById(R.id.domain_settings_night_mode_spinner); + Switch pinnedSslCertificateSwitch = (Switch) findViewById(R.id.domain_settings_pinned_ssl_certificate_switch); + RadioButton savedSslCertificateRadioButton = (RadioButton) findViewById(R.id.saved_ssl_certificate_radiobutton); + RadioButton currentWebsiteCertificateRadioButton = (RadioButton) findViewById(R.id.current_website_certificate_radiobutton); // Extract the data for the domain settings. String domainNameString = domainNameEditText.getText().toString(); @@ -473,6 +535,8 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo int userAgentPositionInt = userAgentSpinner.getSelectedItemPosition(); int fontSizePositionInt = fontSizeSpinner.getSelectedItemPosition(); int displayWebpageImagesInt = displayWebpageImagesSpinner.getSelectedItemPosition(); + int nightModeInt = nightModeSpinner.getSelectedItemPosition(); + boolean pinnedSslCertificate = pinnedSslCertificateSwitch.isChecked(); // Get the data for the `Spinners` from the entry values string arrays. String userAgentString = getResources().getStringArray(R.array.domain_settings_user_agent_entry_values)[userAgentPositionInt]; @@ -485,8 +549,33 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo } // Save the domain settings. - domainsDatabaseHelper.saveDomain(currentDomainDatabaseId, domainNameString, javaScriptEnabledBoolean, firstPartyCookiesEnabledBoolean, thirdPartyCookiesEnabledBoolean, domStorageEnabledEnabledBoolean, formDataEnabledBoolean, userAgentString, fontSizeInt, - displayWebpageImagesInt); + if (savedSslCertificateRadioButton.isChecked()) { // The current certificate is being used. + // Update the database except for the certificate. + domainsDatabaseHelper.updateDomainExceptCertificate(DomainsActivity.currentDomainDatabaseId, domainNameString, javaScriptEnabledBoolean, firstPartyCookiesEnabledBoolean, thirdPartyCookiesEnabledBoolean, domStorageEnabledEnabledBoolean, + formDataEnabledBoolean, userAgentString, fontSizeInt, displayWebpageImagesInt, nightModeInt, pinnedSslCertificate); + } else if (currentWebsiteCertificateRadioButton.isChecked()) { // The certificate is being updated with the current website certificate. + // Get the current website SSL certificate. + SslCertificate currentWebsiteSslCertificate = MainWebViewActivity.sslCertificate; + + // Store the values from the SSL certificate. + String issuedToCommonName = currentWebsiteSslCertificate.getIssuedTo().getCName(); + String issuedToOrganization = currentWebsiteSslCertificate.getIssuedTo().getOName(); + String issuedToOrganizationalUnit = currentWebsiteSslCertificate.getIssuedTo().getUName(); + String issuedByCommonName = currentWebsiteSslCertificate.getIssuedBy().getCName(); + String issuedByOrganization = currentWebsiteSslCertificate.getIssuedBy().getOName(); + String issuedByOrganizationalUnit = currentWebsiteSslCertificate.getIssuedBy().getUName(); + long startDateLong = currentWebsiteSslCertificate.getValidNotBeforeDate().getTime(); + long endDateLong = currentWebsiteSslCertificate.getValidNotAfterDate().getTime(); + + // Update the database. + domainsDatabaseHelper.updateDomainWithCertificate(currentDomainDatabaseId, domainNameString, javaScriptEnabledBoolean, firstPartyCookiesEnabledBoolean, thirdPartyCookiesEnabledBoolean, domStorageEnabledEnabledBoolean, formDataEnabledBoolean, + userAgentString, fontSizeInt, displayWebpageImagesInt, nightModeInt, pinnedSslCertificate, issuedToCommonName, issuedToOrganization, issuedToOrganizationalUnit, issuedByCommonName, issuedByOrganization, issuedByOrganizationalUnit, + startDateLong, endDateLong); + } else { // No certificate is selected. + // Update the database, with PINNED_SSL_CERTIFICATE set to false. + domainsDatabaseHelper.updateDomainExceptCertificate(currentDomainDatabaseId, domainNameString, javaScriptEnabledBoolean, firstPartyCookiesEnabledBoolean, thirdPartyCookiesEnabledBoolean, domStorageEnabledEnabledBoolean, formDataEnabledBoolean, + userAgentString, fontSizeInt, displayWebpageImagesInt, nightModeInt, false); + } } private void populateDomainsListView(final int highlightedDomainDatabaseId) {