X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Factivities%2FLogcatActivity.kt;h=9c6e5de181b27d8e15b8960948d7f2b17cc23af1;hp=e555f1943e062129802e4ceb2f86ca565b4e35b7;hb=484f0b0f0143c53a4722cee3a31e714df0c8c49a;hpb=d53f0640263cf0799e7304fa459864c542ab0d2a

diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.kt b/app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.kt
index e555f194..9c6e5de1 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.kt
@@ -62,15 +62,15 @@ class LogcatActivity : AppCompatActivity() {
     private lateinit var logcatTextView: TextView
 
     // Define the save logcat activity result launcher.  It must be defined before `onCreate()` is run or the app will crash.
-    private val saveLogcatActivityResultLauncher = registerForActivityResult(ActivityResultContracts.CreateDocument()) { fileNameUri: Uri? ->
+    private val saveLogcatActivityResultLauncher = registerForActivityResult(ActivityResultContracts.CreateDocument()) { 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 (fileNameUri != null) {
+        if (fileUri != null) {
             try {
                 // Get the logcat string.
                 val logcatString = logcatTextView.text.toString()
 
                 // Open an output stream.
-                val outputStream = contentResolver.openOutputStream(fileNameUri)!!
+                val outputStream = contentResolver.openOutputStream(fileUri)!!
 
                 // Write the logcat string to the output stream.
                 outputStream.write(logcatString.toByteArray(StandardCharsets.UTF_8))
@@ -78,19 +78,19 @@ class LogcatActivity : AppCompatActivity() {
                 // Close the output stream.
                 outputStream.close()
 
-                // Initialize the file name string from the file name URI last path segment.
-                var fileNameString = fileNameUri.lastPathSegment
+                // Initialize the file name string from the file URI last path segment.
+                var fileNameString = fileUri.lastPathSegment
 
                 // Query the exact file name if the API >= 26.
                 if (Build.VERSION.SDK_INT >= 26) {
                     // Get a cursor from the content resolver.
-                    val contentResolverCursor = contentResolver.query(fileNameUri, null, null, null)!!
+                    val contentResolverCursor = contentResolver.query(fileUri, null, null, null)!!
 
                     // Move to the fist row.
                     contentResolverCursor.moveToFirst()
 
                     // Get the file name from the cursor.
-                    fileNameString = contentResolverCursor.getString(contentResolverCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME))
+                    fileNameString = contentResolverCursor.getString(contentResolverCursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME))
 
                     // Close the cursor.
                     contentResolverCursor.close()