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=9e27f529a980e90a32c3e6a114cc53b039afda04;hp=b49958ebe7a8f898d1973fc747b3167c20e4c08d;hb=a87ea266a0df9aca50f9bc8a58066a4c962ea515;hpb=c8b275d902c769c7f5153b60d6828631aaa76820

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 b49958eb..9e27f529 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveLogcatDialog.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveLogcatDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2016-2019 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2020 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
@@ -48,6 +48,8 @@ import androidx.fragment.app.DialogFragment;  // The AndroidX dialog fragment is
 
 import com.stoutner.privacybrowser.R;
 
+import java.io.File;
+
 public class SaveLogcatDialog extends DialogFragment {
     // Define the save logcat listener.
     private SaveLogcatListener saveLogcatListener;
@@ -135,9 +137,44 @@ public class SaveLogcatDialog extends DialogFragment {
         // Get handles for the layout items.
         EditText fileNameEditText = alertDialog.findViewById(R.id.file_name_edittext);
         Button browseButton = alertDialog.findViewById(R.id.browse_button);
+        TextView fileExistsWarningTextView = alertDialog.findViewById(R.id.file_exists_warning_textview);
         TextView storagePermissionTextView = alertDialog.findViewById(R.id.storage_permission_textview);
         Button saveButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
 
+        // Update the status of the save button when the file name changes.
+        fileNameEditText.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                // Do nothing.
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                // Do nothing.
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                // Get the current file name.
+                String fileNameString = fileNameEditText.getText().toString();
+
+                // Convert the file name string to a file.
+                File file = new File(fileNameString);
+
+                // Check to see if the file exists.
+                if (file.exists()) {
+                    // Show the file exists warning.
+                    fileExistsWarningTextView.setVisibility(View.VISIBLE);
+                } else {
+                    // Hide the file exists warning.
+                    fileExistsWarningTextView.setVisibility(View.GONE);
+                }
+
+                // Enable the save button if the file name is populated.
+                saveButton.setEnabled(!fileNameString.isEmpty());
+            }
+        });
+
         // Create a string for the default file path.
         String defaultFilePath;
 
@@ -151,6 +188,9 @@ public class SaveLogcatDialog extends DialogFragment {
         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);
+
+            // Hide the storage permission text view.
+            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);
@@ -159,25 +199,6 @@ public class SaveLogcatDialog extends DialogFragment {
         // Display the default file path.
         fileNameEditText.setText(defaultFilePath);
 
-        // Update the status of the save button when the file name changes.
-        fileNameEditText.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-                // Do nothing.
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                // Do nothing.
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                // Enable the save button if a file name exists.
-                saveButton.setEnabled(!fileNameEditText.getText().toString().isEmpty());
-            }
-        });
-
         // Handle clicks on the browse button.
         browseButton.setOnClickListener((View view) -> {
             // Create the file picker intent.
@@ -201,11 +222,6 @@ public class SaveLogcatDialog extends DialogFragment {
             activity.startActivityForResult(browseIntent, 0);
         });
 
-        // Hide the storage permission text view on API < 23 as permissions on older devices are automatically granted.
-        if (Build.VERSION.SDK_INT < 23) {
-            storagePermissionTextView.setVisibility(View.GONE);
-        }
-
         // Return the alert dialog.
         return alertDialog;
     }