/*
- * Copyright © 2021-2022 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2021-2023 Soren Stoutner <soren@stoutner.com>.
*
* This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
*
// Setup each tab.
override fun instantiateItem(container: ViewGroup, tabNumber: Int): Any {
// Get the current position of this WebView fragment.
- val webViewPosition = MainWebViewActivity.webViewPagerAdapter.getPositionForId(webViewFragmentId)
+ val webViewPosition = MainWebViewActivity.webViewStateAdapter!!.getPositionForId(webViewFragmentId)
// Get the WebView tab fragment.
- val webViewTabFragment = MainWebViewActivity.webViewPagerAdapter.getPageFragment(webViewPosition)
+ val webViewTabFragment = MainWebViewActivity.webViewStateAdapter!!.getPageFragment(webViewPosition)
// Get the WebView fragment view.
val webViewFragmentView = webViewTabFragment.requireView()
val endDateTextView = tabLayout.findViewById<TextView>(R.id.end_date)
// Setup the labels.
- val domainNameLabel = context.getString(R.string.domain_label) + " "
- val ipAddressesLabel = context.getString(R.string.ip_addresses) + " "
- val cNameLabel = context.getString(R.string.common_name) + " "
- val oNameLabel = context.getString(R.string.organization) + " "
- val uNameLabel = context.getString(R.string.organizational_unit) + " "
- val startDateLabel = context.getString(R.string.start_date) + " "
- val endDateLabel = context.getString(R.string.end_date) + " "
+ val domainNameLabel = context.getString(R.string.domain_label)
+ val ipAddressesLabel = context.getString(R.string.ip_addresses)
+ val cNameLabel = context.getString(R.string.common_name)
+ val oNameLabel = context.getString(R.string.organization)
+ val uNameLabel = context.getString(R.string.organizational_unit)
+ val startDateLabel = context.getString(R.string.start_date)
+ val endDateLabel = context.getString(R.string.end_date)
// Convert the URL to a URI.
val currentUri = Uri.parse(nestedScrollWebView.url)
currentSslEndDate = sslCertificate.validNotAfterDate
}
- // Get the pinned SSL certificate.
- val pinnedSslCertificateArrayList = nestedScrollWebView.getPinnedSslCertificate()
+ // Get the pinned SSL certificate pair.
+ val pinnedSslCertificatePair = nestedScrollWebView.getPinnedSslCertificate()
// Extract the arrays from the array list.
- val pinnedSslCertificateStringArray = pinnedSslCertificateArrayList[0] as Array<*>
- val pinnedSslCertificateDateArray = pinnedSslCertificateArrayList[1] as Array<*>
+ val pinnedSslCertificateStringArray = pinnedSslCertificatePair.first
+ val pinnedSslCertificateDateArray = pinnedSslCertificatePair.second
// Setup the domain name spannable string builder.
val domainNameStringBuilder = SpannableStringBuilder(domainNameLabel + domainName)
issuedByCNameStringBuilder = SpannableStringBuilder(cNameLabel + pinnedSslCertificateStringArray[3])
issuedByONameStringBuilder = SpannableStringBuilder(oNameLabel + pinnedSslCertificateStringArray[4])
issuedByUNameStringBuilder = SpannableStringBuilder(uNameLabel + pinnedSslCertificateStringArray[5])
-
- // Set the dates if they aren't null. Formatting a null date causes a crash.
- startDateStringBuilder = if (pinnedSslCertificateDateArray[0] == null) {
- SpannableStringBuilder(startDateLabel)
- } else {
- SpannableStringBuilder(startDateLabel + DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.LONG).format(pinnedSslCertificateDateArray[0]))
- }
-
- endDateStringBuilder = if (pinnedSslCertificateDateArray[1] == null) {
- SpannableStringBuilder(endDateLabel)
- } else {
- SpannableStringBuilder(endDateLabel + DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.LONG).format(pinnedSslCertificateDateArray[1]))
- }
+ startDateStringBuilder = SpannableStringBuilder(startDateLabel + DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.LONG).format(pinnedSslCertificateDateArray[0]))
+ endDateStringBuilder = SpannableStringBuilder(endDateLabel + DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.LONG).format(pinnedSslCertificateDateArray[1]))
}
// Create the color spans.
- val blueColorSpan = ForegroundColorSpan(context.getColor(R.color.blue_text))
+ val blueColorSpan = ForegroundColorSpan(context.getColor(R.color.alt_blue_text))
val redColorSpan = ForegroundColorSpan(context.getColor(R.color.red_text))
// Set the domain name to be blue.
// Return the tab layout.
return tabLayout
}
-}
\ No newline at end of file
+}