X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Ffragments%2FDomainsListFragment.java;h=172a6438279ce315366bde0b774ec762988845af;hb=8ca39b63e2d15fbb6828e255be4e0b5493c744ce;hp=553c107d82bbab1181c521cefd90ee03e4603b3c;hpb=5545ec452e70a3b8a99ff7b4bef330c1333d1a60;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainsListFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainsListFragment.java
index 553c107d..172a6438 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainsListFragment.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainsListFragment.java
@@ -19,6 +19,7 @@
 
 package com.stoutner.privacybrowser.fragments;
 
+import android.net.http.SslCertificate;
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
 // We have to use `android.support.v4.app.Fragment` until minimum API >= 23.  Otherwise we cannot call `getContext()`.
@@ -30,6 +31,7 @@ import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.EditText;
 import android.widget.ListView;
+import android.widget.RadioButton;
 import android.widget.Spinner;
 import android.widget.Switch;
 
@@ -78,6 +80,10 @@ public class DomainsListFragment extends Fragment {
                     EditText customUserAgentEditText = (EditText) domainSettingsFragmentView.findViewById(R.id.domain_settings_custom_user_agent_edittext);
                     Spinner fontSizeSpinner = (Spinner) domainSettingsFragmentView.findViewById(R.id.domain_settings_font_size_spinner);
                     Spinner displayWebpageImagesSpinner = (Spinner) domainSettingsFragmentView.findViewById(R.id.domain_settings_display_webpage_images_spinner);
+                    Spinner nightModeSpinner = (Spinner) domainSettingsFragmentView.findViewById(R.id.domain_settings_night_mode_spinner);
+                    Switch pinnedSslCertificateSwitch = (Switch) domainSettingsFragmentView.findViewById(R.id.domain_settings_pinned_ssl_certificate_switch);
+                    RadioButton savedSslCertificateRadioButton = (RadioButton) domainSettingsFragmentView.findViewById(R.id.saved_ssl_certificate_radiobutton);
+                    RadioButton currentWebsiteCertificateRadioButton = (RadioButton) domainSettingsFragmentView.findViewById(R.id.current_website_certificate_radiobutton);
 
                     // Extract the data for the domain settings.
                     String domainNameString = domainNameEditText.getText().toString();
@@ -89,6 +95,8 @@ public class DomainsListFragment extends Fragment {
                     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];
@@ -101,8 +109,33 @@ public class DomainsListFragment extends Fragment {
                     }
 
                     // Save the domain settings.
-                    domainsDatabaseHelper.saveDomain(DomainsActivity.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(DomainsActivity.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(DomainsActivity.currentDomainDatabaseId, domainNameString, javaScriptEnabledBoolean, firstPartyCookiesEnabledBoolean, thirdPartyCookiesEnabledBoolean, domStorageEnabledEnabledBoolean,
+                                formDataEnabledBoolean, userAgentString, fontSizeInt, displayWebpageImagesInt, nightModeInt, false);
+                    }
                 }
 
                 // Store the new `currentDomainDatabaseId`, converting it from `long` to `int` to match the format of the domains database.