Make pinned settings tab aware.

[PrivacyBrowserAndroid.git] / app / src / main / java / com / stoutner / privacybrowser / fragments / DomainSettingsFragment.java

diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java
index 614bb374e80278243f42043b5b5adb05f196af1d..43032f84933c3481c443c95c2e0f16ec3b1c3215 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java
@@ -28,10 +28,6 @@ import android.net.http.SslCertificate;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-// `android.support.v4.app.Fragment` must be used until minimum API >= 23.  Otherwise `getContext()` does not work.
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.CardView;
 import android.text.Editable;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
@@ -52,7 +48,12 @@ import android.widget.Spinner;
 import android.widget.Switch;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.cardview.widget.CardView;
+import androidx.fragment.app.Fragment;  // The AndroidX fragment must be used until minimum API >= 23.  Otherwise `getContext()` does not work.
+
 import com.stoutner.privacybrowser.R;
+import com.stoutner.privacybrowser.activities.DomainsActivity;
 import com.stoutner.privacybrowser.activities.MainWebViewActivity;
 import com.stoutner.privacybrowser.helpers.DomainsDatabaseHelper;
 
@@ -182,7 +183,7 @@ public class DomainSettingsFragment extends Fragment {
         String endDateLabel = getString(R.string.end_date) + "  ";
 
         // Get the current website SSL certificate
-        final SslCertificate currentWebsiteSslCertificate = MainWebViewActivity.sslCertificate;
+        final SslCertificate currentWebsiteSslCertificate = DomainsActivity.currentSslCertificate;
 
         // Initialize the database handler.  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);
@@ -1163,7 +1164,7 @@ public class DomainSettingsFragment extends Fragment {
 
         // Populate the saved and current IP addresses.
         savedIpAddressesTextView.setText(savedIpAddresses);
-        currentIpAddressesTextView.setText(MainWebViewActivity.currentHostIpAddresses);
+        currentIpAddressesTextView.setText(DomainsActivity.currentIpAddresses);
 
         // Set the initial display status of the IP addresses card views.
         if (pinnedIpAddressesSwitch.isChecked()) {  // IP addresses are pinned.