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=c4c522741f892e56f80ee0930bc4a7a8b9856d14;hpb=b1612e9c92c3aa6cc39e89c2a7859dfeebf71bf9;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 c4c52274..b0f47002 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2022 Soren Stoutner . + * Copyright 2016-2023 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -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 @@ -51,9 +50,14 @@ import androidx.webkit.WebViewCompat import com.google.android.material.snackbar.Snackbar -import com.stoutner.privacybrowser.R import com.stoutner.privacybrowser.BuildConfig -import com.stoutner.privacybrowser.asynctasks.SaveAboutVersionImage +import com.stoutner.privacybrowser.R +import com.stoutner.privacybrowser.coroutines.SaveAboutVersionImageCoroutine + +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext import java.io.ByteArrayInputStream import java.io.InputStream @@ -155,56 +159,59 @@ 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) { - try { - // Get the about version string. - val aboutVersionString = getAboutVersionString() + // Initialize the file name string from the file URI last path segment. + var fileNameString = fileUri.lastPathSegment - // Open an output stream. - val outputStream = requireActivity().contentResolver.openOutputStream(fileUri)!! + // Query the exact file name if the API >= 26. + if (Build.VERSION.SDK_INT >= 26) { + // Get a cursor from the content resolver. + val contentResolverCursor = requireActivity().contentResolver.query(fileUri, null, null, null)!! - // Write the about version string to the output stream. - outputStream.write(aboutVersionString.toByteArray(StandardCharsets.UTF_8)) + // Move to the first row. + contentResolverCursor.moveToFirst() - // Close the output stream. - outputStream.close() + // Get the file name from the cursor. + fileNameString = contentResolverCursor.getString(contentResolverCursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)) - // Initialize the file name string from the file URI last path segment. - var fileNameString = fileUri.lastPathSegment + // Close the cursor. + contentResolverCursor.close() + } - // Query the exact file name if the API >= 26. - if (Build.VERSION.SDK_INT >= 26) { - // Get a cursor from the content resolver. - val contentResolverCursor = requireActivity().contentResolver.query(fileUri, null, null, null)!! + try { + // Get the about version string. + val aboutVersionString = getAboutVersionString() - // Move to the first row. - contentResolverCursor.moveToFirst() + // Open an output stream. + val outputStream = requireActivity().contentResolver.openOutputStream(fileUri)!! - // Get the file name from the cursor. - fileNameString = contentResolverCursor.getString(contentResolverCursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)) + // Save about version using a coroutine with Dispatchers.IO. + CoroutineScope(Dispatchers.Main).launch { + withContext(Dispatchers.IO) { + // Write the about version string to the output stream. + outputStream.write(aboutVersionString.toByteArray(StandardCharsets.UTF_8)) - // Close the cursor. - contentResolverCursor.close() + // Close the output stream. + outputStream.close() + } } // Display a snackbar with the saved logcat information. Snackbar.make(aboutVersionLayout, getString(R.string.saved, fileNameString), Snackbar.LENGTH_SHORT).show() } catch (exception: Exception) { // Display a snackbar with the error message. - Snackbar.make(aboutVersionLayout, getString(R.string.error_saving_file) + " " + exception.toString(), Snackbar.LENGTH_INDEFINITE).show() + Snackbar.make(aboutVersionLayout, getString(R.string.error_saving_file, fileNameString, exception.toString()), Snackbar.LENGTH_INDEFINITE).show() } } } // 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? -> - // 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) { - // Save the about version image. - SaveAboutVersionImage(requireActivity(), fileUri, aboutVersionLayout.findViewById(R.id.about_version_linearlayout)).execute() - } + 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)) } override fun onCreate(savedInstanceState: Bundle?) { @@ -267,36 +274,36 @@ class AboutVersionFragment : Fragment() { certificateSignatureAlgorithmTextView = aboutVersionLayout.findViewById(R.id.certificate_signature_algorithm) // Setup the labels. - val version = getString(R.string.version) + " " + BuildConfig.VERSION_NAME + " (" + getString(R.string.version_code) + " " + 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 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) // 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. @@ -311,7 +318,7 @@ class AboutVersionFragment : Fragment() { val device = Build.DEVICE val bootloader = Build.BOOTLOADER val radio = Build.getRadioVersion() - val android = Build.VERSION.RELEASE + " (" + getString(R.string.api) + " " + Build.VERSION.SDK_INT + ")" + val android = getString(R.string.api, Build.VERSION.RELEASE, Build.VERSION.SDK_INT) val build = Build.DISPLAY val kernel = System.getProperty("os.version") @@ -332,12 +339,12 @@ class AboutVersionFragment : Fragment() { val i2p: String = try { // Check to see if the F-Droid flavor is installed. The newer `getPackageInfo()` may be used once the minimum API >= 33. @Suppress("DEPRECATION") - requireContext().packageManager.getPackageInfo("net.i2p.android.router", 0).versionName + " " + requireContext().getString(R.string.fdroid_flavor) + requireContext().getString(R.string.fdroid_flavor, requireContext().packageManager.getPackageInfo("net.i2p.android.router", 0).versionName) } catch (exception: PackageManager.NameNotFoundException) { // The F-Droid flavor is not installed. try { // Check to see if the F-Droid flavor is installed. The newer `getPackageInfo()` may be used once the minimum API >= 33. @Suppress("DEPRECATION") - requireContext().packageManager.getPackageInfo("net.i2p.android", 0).versionName + " " + requireContext().getString(R.string.google_play_flavor) + requireContext().getString(R.string.google_play_flavor, requireContext().packageManager.getPackageInfo("net.i2p.android", 0).versionName) } catch (exception: PackageManager.NameNotFoundException) { // The Google Play flavor is not installed either. // Store an empty string. "" @@ -413,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) @@ -429,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 @@ -444,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())!! @@ -464,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) @@ -482,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) @@ -500,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) @@ -708,7 +715,7 @@ class AboutVersionFragment : Fragment() { updateMemoryUsageBoolean = true } - fun updateMemoryUsage(activity: Activity) { + private fun updateMemoryUsage(activity: Activity) { try { // Update the memory usage if enabled. if (updateMemoryUsageBoolean) { @@ -789,7 +796,7 @@ class AboutVersionFragment : Fragment() { } } - fun getAboutVersionString(): String { + private fun getAboutVersionString(): String { // Initialize an about version string builder. val aboutVersionStringBuilder = StringBuilder() @@ -895,4 +902,4 @@ class AboutVersionFragment : Fragment() { // Return the string. return aboutVersionStringBuilder.toString() } -} \ No newline at end of file +}