X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Factivities%2FLogcatActivity.java;h=f270cd24db670e42caa0b6ec3eb136ff50bdb111;hp=46c0a88a837c86987748dd8938da3cf2589c963f;hb=c1c9a0bf83ecef671356d554bb6e4927392b1cc8;hpb=877ee4a6ba4d034bbd9843e037f6c70635c0a5b0

diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.java
index 46c0a88a..f270cd24 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.java
@@ -28,10 +28,8 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.media.MediaScannerConnection;
-import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.os.Environment;
 import android.preference.PreferenceManager;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -49,9 +47,11 @@ import androidx.fragment.app.DialogFragment;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.google.android.material.snackbar.Snackbar;
+
 import com.stoutner.privacybrowser.R;
 import com.stoutner.privacybrowser.dialogs.StoragePermissionDialog;
 import com.stoutner.privacybrowser.dialogs.SaveLogcatDialog;
+import com.stoutner.privacybrowser.helpers.FileNameHelper;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -166,7 +166,7 @@ public class LogcatActivity extends AppCompatActivity implements SaveLogcatDialo
                 return true;
 
             case R.id.save:
-                // Get a handle for the save alert dialog.
+                // Instantiate the save alert dialog.
                 DialogFragment saveDialogFragment = new SaveLogcatDialog();
 
                 // Show the save alert dialog.
@@ -233,7 +233,7 @@ public class LogcatActivity extends AppCompatActivity implements SaveLogcatDialo
                     // Show the storage permission alert dialog.  The permission will be requested when the dialog is closed.
                     storagePermissionDialogFragment.show(getSupportFragmentManager(), getString(R.string.storage_permission));
                 } else {  // Show the permission request directly.
-                    // Request the storage permission.  The logcat will be saved when it finishes.
+                    // Request the write external storage permission.  The logcat will be saved when it finishes.
                     ActivityCompat.requestPermissions(this, new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE}, 0);
 
                 }
@@ -325,63 +325,14 @@ public class LogcatActivity extends AppCompatActivity implements SaveLogcatDialo
                 // Get a handle for the file name edit text.
                 EditText fileNameEditText = saveDialog.findViewById(R.id.file_name_edittext);
 
-                // Get the file name URI.
-                Uri fileNameUri = data.getData();
-
-                // Remove the incorrect lint warning that the file name URI might be null.
-                assert fileNameUri != null;
-
-                // Get the raw file name path.
-                String rawFileNamePath = fileNameUri.getPath();
-
-                // Remove the incorrect lint warning that the file name path might be null.
-                assert rawFileNamePath != null;
-
-                // Check to see if the file name Path includes a valid storage location.
-                if (rawFileNamePath.contains(":")) {  // The path is valid.
-                    // Split the path into the initial content uri and the final path information.
-                    String fileNameContentPath = rawFileNamePath.substring(0, rawFileNamePath.indexOf(":"));
-                    String fileNameFinalPath = rawFileNamePath.substring(rawFileNamePath.indexOf(":") + 1);
-
-                    // Create the file name path string.
-                    String fileNamePath;
-
-                    // Check to see if the current file name final patch is a complete, valid path
-                    if (fileNameFinalPath.startsWith("/storage/emulated/")) {  // The existing file name final path is a complete, valid path.
-                        // Use the provided file name path as is.
-                        fileNamePath = fileNameFinalPath;
-                    } else { // The existing file name final path is not a complete, valid path.
-                        // Construct the file name path.
-                        switch (fileNameContentPath) {
-                            // The documents home has a special content path.
-                            case "/document/home":
-                                fileNamePath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS) + "/" + fileNameFinalPath;
-                                break;
-
-                            // Everything else for the primary user should be in `/document/primary`.
-                            case "/document/primary":
-                                fileNamePath = Environment.getExternalStorageDirectory() + "/" + fileNameFinalPath;
-                                break;
-
-                            // Just in case, catch everything else and place it in the external storage directory.
-                            default:
-                                fileNamePath = Environment.getExternalStorageDirectory() + "/" + fileNameFinalPath;
-                                break;
-                        }
-                    }
-
-                    // Set the file name path as the text of the file name edit text.
-                    fileNameEditText.setText(fileNamePath);
-                } else {  // The path is invalid.
-                    // Close the alert dialog.
-                    saveDialog.dismiss();
-
-                    // Get a handle for the logcat text view.
-                    TextView logcatTextView = findViewById(R.id.logcat_textview);
-
-                    // Display a snackbar with the error message.
-                    Snackbar.make(logcatTextView, rawFileNamePath + " " + getString(R.string.invalid_location), Snackbar.LENGTH_INDEFINITE).show();
-                }
+                // Instantiate the file name helper.
+                FileNameHelper fileNameHelper = new FileNameHelper();
+
+                // Convert the file name URI to a file name path.
+                String fileNamePath = fileNameHelper.convertUriToFileNamePath(data.getData());
+
+                // Set the file name path as the text of the file name edit text.
+                fileNameEditText.setText(fileNamePath);
             }
         }
     }