X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FSaveLogcatDialog.java;h=624e45532e98e81c6239c46ec745832ada65fe25;hp=9e27f529a980e90a32c3e6a114cc53b039afda04;hb=ba4a1c032dbffde044b70c804f9d3c1f1ba7b939;hpb=a87ea266a0df9aca50f9bc8a58066a4c962ea515

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveLogcatDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveLogcatDialog.java
index 9e27f529..624e4553 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveLogcatDialog.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveLogcatDialog.java
@@ -47,6 +47,7 @@ import androidx.core.content.ContextCompat;
 import androidx.fragment.app.DialogFragment;  // The AndroidX dialog fragment is required or an error is produced on API <=22.  It is also required for the browse button to work correctly.
 
 import com.stoutner.privacybrowser.R;
+import com.stoutner.privacybrowser.helpers.DownloadLocationHelper;
 
 import java.io.File;
 
@@ -83,11 +84,13 @@ public class SaveLogcatDialog extends DialogFragment {
         // Use an alert dialog builder to create the alert dialog.
         AlertDialog.Builder dialogBuilder;
 
-        // Get a handle for the activity.
+        // Get a handle for the activity and the context.
         Activity activity = getActivity();
+        Context context = getContext();
 
-        // Remove the incorrect lint warning below that the activity might be null.
+        // Remove the incorrect lint warnings.
         assert activity != null;
+        assert context != null;
 
         // Set the style according to the theme.
         if (darkTheme) {
@@ -107,7 +110,7 @@ public class SaveLogcatDialog extends DialogFragment {
         }
 
         // Set the view.  The parent view is null because it will be assigned by the alert dialog.
-        dialogBuilder.setView(activity.getLayoutInflater().inflate(R.layout.save_dialog, null));
+        dialogBuilder.setView(activity.getLayoutInflater().inflate(R.layout.save_logcat_dialog, null));
 
         // Set the cancel button listener.
         dialogBuilder.setNegativeButton(R.string.cancel, (DialogInterface dialog, int which) -> {
@@ -175,30 +178,20 @@ public class SaveLogcatDialog extends DialogFragment {
             }
         });
 
-        // Create a string for the default file path.
-        String defaultFilePath;
+        // Instantiate the download location helper.
+        DownloadLocationHelper downloadLocationHelper = new DownloadLocationHelper();
 
-        // Get a handle for the context.
-        Context context = getContext();
-
-        // Remove the incorrect lint warning below that context might be null.
-        assert context != null;
+        // Get the default file path.
+        String defaultFilePath = downloadLocationHelper.getDownloadLocation(context) + "/" + getString(R.string.privacy_browser_logcat_txt);
 
-        // Set the default file path according to the storage permission state.
-        if (ContextCompat.checkSelfPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {  // The storage permission has been granted.
-            // Set the default file path to use the external public directory.
-            defaultFilePath = Environment.getExternalStorageDirectory() + "/" + getString(R.string.privacy_browser_logcat_txt);
+        // Display the default file path.
+        fileNameEditText.setText(defaultFilePath);
 
-            // Hide the storage permission text view.
+        // Hide the storage permission text view if the permission has already been granted.
+        if (ContextCompat.checkSelfPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
             storagePermissionTextView.setVisibility(View.GONE);
-        } else {  // The storage permission has not been granted.
-            // Set the default file path to use the external private directory.
-            defaultFilePath = context.getExternalFilesDir(null) + "/" + getString(R.string.privacy_browser_logcat_txt);
         }
 
-        // Display the default file path.
-        fileNameEditText.setText(defaultFilePath);
-
         // Handle clicks on the browse button.
         browseButton.setOnClickListener((View view) -> {
             // Create the file picker intent.