X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FSaveWebpageDialog.java;h=7e4250a06958327b13d34b5a7de4e9a20a9a6e80;hp=1c24e0bedc6ca95f4414c74ae3c92bd92001c205;hb=a87ea266a0df9aca50f9bc8a58066a4c962ea515;hpb=5d3cafb4a4fbb2bf851d36f973cc1e8b23ecebab diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveWebpageDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveWebpageDialog.java index 1c24e0be..7e4250a0 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveWebpageDialog.java +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveWebpageDialog.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019 Soren Stoutner . + * Copyright © 2019-2020 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -49,11 +49,9 @@ import androidx.preference.PreferenceManager; import com.stoutner.privacybrowser.R; import com.stoutner.privacybrowser.activities.MainWebViewActivity; -public class SaveWebpageDialog extends DialogFragment { - // Define the save type constants. - public static final int ARCHIVE = 0; - public static final int IMAGE = 1; +import java.io.File; +public class SaveWebpageDialog extends DialogFragment { // Define the save webpage listener. private SaveWebpageListener saveWebpageListener; @@ -88,7 +86,7 @@ public class SaveWebpageDialog extends DialogFragment { return saveWebpageDialog; } - // `@SuppressLing("InflateParams")` removes the warning about using null as the parent view group when inflating the alert dialog. + // `@SuppressLint("InflateParams")` removes the warning about using null as the parent view group when inflating the alert dialog. @SuppressLint("InflateParams") @Override @NonNull @@ -127,11 +125,11 @@ public class SaveWebpageDialog extends DialogFragment { // Set the icon according to the save type. switch (saveType) { - case ARCHIVE: + case StoragePermissionDialog.SAVE_ARCHIVE: dialogBuilder.setIcon(R.drawable.dom_storage_cleared_dark); break; - case IMAGE: + case StoragePermissionDialog.SAVE_IMAGE: dialogBuilder.setIcon(R.drawable.images_enabled_dark); break; } @@ -141,11 +139,11 @@ public class SaveWebpageDialog extends DialogFragment { // Set the icon according to the save type. switch (saveType) { - case ARCHIVE: + case StoragePermissionDialog.SAVE_ARCHIVE: dialogBuilder.setIcon(R.drawable.dom_storage_cleared_light); break; - case IMAGE: + case StoragePermissionDialog.SAVE_IMAGE: dialogBuilder.setIcon(R.drawable.images_enabled_light); break; } @@ -153,11 +151,11 @@ public class SaveWebpageDialog extends DialogFragment { // Set the title according to the type. switch (saveType) { - case ARCHIVE: + case StoragePermissionDialog.SAVE_ARCHIVE: dialogBuilder.setTitle(R.string.save_archive); break; - case IMAGE: + case StoragePermissionDialog.SAVE_IMAGE: dialogBuilder.setTitle(R.string.save_image); break; } @@ -177,7 +175,7 @@ public class SaveWebpageDialog extends DialogFragment { // Create an alert dialog from the builder. AlertDialog alertDialog = dialogBuilder.create(); - // Remove the incorrect lint warning below that `getWindow()` might be null. + // Remove the incorrect lint warning below that the window might be null. assert alertDialog.getWindow() != null; // Disable screenshots if not allowed. @@ -191,19 +189,54 @@ public class SaveWebpageDialog 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 default file name string. String defaultFileName = ""; // Set the default file name according to the type. switch (saveType) { - case ARCHIVE: + case StoragePermissionDialog.SAVE_ARCHIVE: defaultFileName = getString(R.string.webpage_mht); break; - case IMAGE: + case StoragePermissionDialog.SAVE_IMAGE: defaultFileName = getString(R.string.webpage_png); break; } @@ -215,6 +248,9 @@ public class SaveWebpageDialog 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() + "/" + defaultFileName; + + // 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) + "/" + defaultFileName; @@ -223,24 +259,8 @@ public class SaveWebpageDialog 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()); - } - }); + // Move the cursor to the end of the default file path. + fileNameEditText.setSelection(defaultFilePath.length()); // Handle clicks on the browse button. browseButton.setOnClickListener((View view) -> { @@ -252,11 +272,11 @@ public class SaveWebpageDialog extends DialogFragment { // Set the initial file name according to the type. switch (saveType) { - case ARCHIVE: + case StoragePermissionDialog.SAVE_ARCHIVE: browseIntent.putExtra(Intent.EXTRA_TITLE, getString(R.string.webpage_mht)); break; - case IMAGE: + case StoragePermissionDialog.OPEN: browseIntent.putExtra(Intent.EXTRA_TITLE, getString(R.string.webpage_png)); break; } @@ -273,11 +293,6 @@ public class SaveWebpageDialog extends DialogFragment { activity.startActivityForResult(browseIntent, MainWebViewActivity.BROWSE_SAVE_WEBPAGE_REQUEST_CODE); }); - // 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; }