X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Ffragments%2FAboutVersionFragment.kt;h=b0f47002a6f622755ed29ef5d8a17547bcf32318;hb=dc36dea65a4eb37496fb1ecbbd9f8e1906f50216;hp=079b2ac87b47c734fef26c33bc63be2e5cbe2ee2;hpb=5186b668274b09e37b371c0a134e53255c98ad98;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt index 079b2ac8..b0f47002 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt @@ -27,7 +27,6 @@ import android.content.ClipboardManager import android.content.Context import android.content.Intent import android.content.pm.PackageManager -import android.net.Uri import android.os.Build import android.os.Bundle import android.os.Handler @@ -160,7 +159,7 @@ class AboutVersionFragment : Fragment() { } // Define the save about version text activity result launcher. It must be defined before `onCreate()` is run or the app will crash. - private val saveAboutVersionTextActivityResultLauncher = registerForActivityResult(ActivityResultContracts.CreateDocument("text/plain")) { fileUri: Uri? -> + private val saveAboutVersionTextActivityResultLauncher = registerForActivityResult(ActivityResultContracts.CreateDocument("text/plain")) { fileUri -> // Only save the file if the URI is not null, which happens if the user exited the file picker by pressing back. if (fileUri != null) { // Initialize the file name string from the file URI last path segment. @@ -209,7 +208,7 @@ class AboutVersionFragment : Fragment() { } // Define the save about version image activity result launcher. It must be defined before `onCreate()` is run or the app will crash. - private val saveAboutVersionImageActivityResultLauncher = registerForActivityResult(ActivityResultContracts.CreateDocument("image/png")) { fileUri: Uri? -> + private val saveAboutVersionImageActivityResultLauncher = registerForActivityResult(ActivityResultContracts.CreateDocument("image/png")) { fileUri -> // Save the file if the URI is not null, which happens if the user exits the file picker by pressing back. if (fileUri != null) SaveAboutVersionImageCoroutine.saveImage(requireActivity(), fileUri, aboutVersionLayout.findViewById(R.id.about_version_linearlayout)) @@ -276,35 +275,35 @@ class AboutVersionFragment : Fragment() { // Setup the labels. val version = getString(R.string.version_code, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE) - val brandLabel = getString(R.string.brand) + " " - val manufacturerLabel = getString(R.string.manufacturer) + " " - val modelLabel = getString(R.string.model) + " " - val deviceLabel = getString(R.string.device) + " " - val bootloaderLabel = getString(R.string.bootloader) + " " - val androidLabel = getString(R.string.android) + " " - val buildLabel = getString(R.string.build) + " " - val kernelLabel = getString(R.string.kernel) + " " - val webViewVersionLabel = getString(R.string.webview_version) + " " - appConsumedMemoryLabel = getString(R.string.app_consumed_memory) + " " - appAvailableMemoryLabel = getString(R.string.app_available_memory) + " " - appTotalMemoryLabel = getString(R.string.app_total_memory) + " " - appMaximumMemoryLabel = getString(R.string.app_maximum_memory) + " " - systemConsumedMemoryLabel = getString(R.string.system_consumed_memory) + " " - systemAvailableMemoryLabel = getString(R.string.system_available_memory) + " " - systemTotalMemoryLabel = getString(R.string.system_total_memory) + " " - val easyListLabel = getString(R.string.easylist_label) + " " - val easyPrivacyLabel = getString(R.string.easyprivacy_label) + " " - val fanboyAnnoyanceLabel = getString(R.string.fanboys_annoyance_label) + " " - val fanboySocialLabel = getString(R.string.fanboys_social_label) + " " - val ultraListLabel = getString(R.string.ultralist_label) + " " - val ultraPrivacyLabel = getString(R.string.ultraprivacy_label) + " " - val issuerDNLabel = getString(R.string.issuer_dn) + " " - val subjectDNLabel = getString(R.string.subject_dn) + " " - val startDateLabel = getString(R.string.start_date) + " " - val endDateLabel = getString(R.string.end_date) + " " - val certificateVersionLabel = getString(R.string.certificate_version) + " " - val serialNumberLabel = getString(R.string.serial_number) + " " - val signatureAlgorithmLabel = getString(R.string.signature_algorithm) + " " + val brandLabel = getString(R.string.brand) + val manufacturerLabel = getString(R.string.manufacturer) + val modelLabel = getString(R.string.model) + val deviceLabel = getString(R.string.device) + val bootloaderLabel = getString(R.string.bootloader) + val androidLabel = getString(R.string.android) + val buildLabel = getString(R.string.build) + val kernelLabel = getString(R.string.kernel) + val webViewVersionLabel = getString(R.string.webview_version) + appConsumedMemoryLabel = getString(R.string.app_consumed_memory) + appAvailableMemoryLabel = getString(R.string.app_available_memory) + appTotalMemoryLabel = getString(R.string.app_total_memory) + appMaximumMemoryLabel = getString(R.string.app_maximum_memory) + systemConsumedMemoryLabel = getString(R.string.system_consumed_memory) + systemAvailableMemoryLabel = getString(R.string.system_available_memory) + systemTotalMemoryLabel = getString(R.string.system_total_memory) + val easyListLabel = getString(R.string.easylist_label) + val easyPrivacyLabel = getString(R.string.easyprivacy_label) + val fanboyAnnoyanceLabel = getString(R.string.fanboys_annoyance_label) + val fanboySocialLabel = getString(R.string.fanboys_social_label) + val ultraListLabel = getString(R.string.ultralist_label) + val ultraPrivacyLabel = getString(R.string.ultraprivacy_label) + val issuerDNLabel = getString(R.string.issuer_dn) + val subjectDNLabel = getString(R.string.subject_dn) + val startDateLabel = getString(R.string.start_date) + val endDateLabel = getString(R.string.end_date) + val certificateVersionLabel = getString(R.string.certificate_version) + val serialNumberLabel = getString(R.string.serial_number) + val signatureAlgorithmLabel = getString(R.string.signature_algorithm) // The WebView layout is only used to get the default user agent from `bare_webview`. It is not used to render content on the screen. // Once the minimum API >= 26 this can be accomplished with the WebView package info. @@ -421,7 +420,7 @@ class AboutVersionFragment : Fragment() { // Null must be checked because some Samsung tablets report a null value for the radio instead of an empty string. Grrrr. if (radio != null && radio.isNotEmpty()) { // Setup the label. - val radioLabel = getString(R.string.radio) + " " + val radioLabel = getString(R.string.radio) // Create a spannable string builder. val radioStringBuilder = SpannableStringBuilder(radioLabel + radio) @@ -437,7 +436,7 @@ class AboutVersionFragment : Fragment() { } // Setup the label. - val securityPatchLabel = getString(R.string.security_patch) + " " + val securityPatchLabel = getString(R.string.security_patch) // Get the security patch version. val securityPatch = Build.VERSION.SECURITY_PATCH @@ -452,7 +451,7 @@ class AboutVersionFragment : Fragment() { securityPatchTextView.text = securityPatchStringBuilder // Create the WebView provider label. - val webViewProviderLabel = getString(R.string.webview_provider) + " " + val webViewProviderLabel = getString(R.string.webview_provider) // Get the current WebView package info. val webViewPackageInfo = WebViewCompat.getCurrentWebViewPackage(requireContext())!! @@ -472,7 +471,7 @@ class AboutVersionFragment : Fragment() { // Only populate the Orbot text view if it is installed. if (orbot.isNotEmpty()) { // Setup the label. - val orbotLabel = getString(R.string.orbot) + " " + val orbotLabel = getString(R.string.orbot) // Create a spannable string builder. val orbotStringBuilder = SpannableStringBuilder(orbotLabel + orbot) @@ -490,7 +489,7 @@ class AboutVersionFragment : Fragment() { // Only populate the I2P text view if it is installed. if (i2p.isNotEmpty()) { // Setup the label. - val i2pLabel = getString(R.string.i2p) + " " + val i2pLabel = getString(R.string.i2p) // Create a spannable string builder. val i2pStringBuilder = SpannableStringBuilder(i2pLabel + i2p) @@ -508,7 +507,7 @@ class AboutVersionFragment : Fragment() { // Only populate the OpenKeychain text view if it is installed. if (openKeychain.isNotEmpty()) { // Setup the label. - val openKeychainLabel = getString(R.string.openkeychain) + " " + val openKeychainLabel = getString(R.string.openkeychain) // Create a spannable string builder. val openKeychainStringBuilder = SpannableStringBuilder(openKeychainLabel + openKeychain)