Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Option for delete permanently on single click #4290

Open
wants to merge 5 commits into
base: release/4.0
Choose a base branch
from
Open

Option for delete permanently on single click #4290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f24f89b
added delete permanently to the preferences in settings
yashwanthgajji Nov 30, 2024
b809edc
permanently delete logic
yashwanthgajji Dec 1, 2024
1be7ec0
spotless changes
yashwanthgajji Dec 6, 2024
ab9310a
corrected functionality
yashwanthgajji Dec 17, 2024
6607702
strings corrected
yashwanthgajji Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion app/src/main/java/com/amaze/filemanager/ui/dialogs/GeneralDialogCreation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,14 +209,22 @@ public static void deleteFilesDialog(
sharedPreferences.getBoolean(
PreferencesConstants.PREFERENCE_DELETE_CONFIRMATION,
PreferencesConstants.DEFAULT_PREFERENCE_DELETE_CONFIRMATION);
boolean deletePermanently =
sharedPreferences.getBoolean(
PreferencesConstants.PREFERENCE_DELETE_PERMANENTLY_WITHOUT_CONFIRMATION,
PreferencesConstants.DEFAULT_PREFERENCE_DELETE_PERMANENTLY_WITHOUT_CONFIRMATION);
View dialogView = LayoutInflater.from(context).inflate(R.layout.dialog_delete, null);
TextView deleteDisclaimerTextView = dialogView.findViewById(R.id.dialog_delete_disclaimer);
final AppCompatCheckBox deletePermanentlyCheckbox =
dialogView.findViewById(R.id.delete_permanently_checkbox);
if (positions.get(0).generateBaseFile().isLocal()) {
// FIXME: make sure dialog is not shown for zero items
// allow trash bin delete only for local files for now
deletePermanentlyCheckbox.setVisibility(View.VISIBLE);
if (deletePermanently) {
deletePermanentlyCheckbox.setVisibility(View.GONE);
} else {
deletePermanentlyCheckbox.setVisibility(View.VISIBLE);
}
} else {
deleteDisclaimerTextView.setText(context.getString(R.string.dialog_delete_disclaimer));
}
Expand Down
2 changes: 2 additions & 0 deletions .../main/java/com/amaze/filemanager/ui/fragments/preferencefragments/PreferencesConstants.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ object PreferencesConstants {
const val PREFERENCE_ZIP_EXTRACT_PATH = "extractpath"
const val PREFERENCE_TEXTEDITOR_NEWSTACK = "texteditor_newstack"
const val PREFERENCE_DELETE_CONFIRMATION = "delete_confirmation"
const val PREFERENCE_DELETE_PERMANENTLY_WITHOUT_CONFIRMATION = "delete_permanently_without_confirmation"
const val PREFERENCE_DISABLE_PLAYER_INTENT_FILTERS = "disable_player_intent_filters"
const val PREFERENCE_TRASH_BIN_RETENTION_NUM_OF_FILES = "retention_num_of_files"
const val PREFERENCE_TRASH_BIN_RETENTION_DAYS = "retention_days"
Expand Down Expand Up @@ -122,4 +123,5 @@ object PreferencesConstants {
const val KEY_TRASH_BIN_CLEANUP_INTERVAL_HOURS = "trash_bin_cleanup_interval_hours"

const val DEFAULT_PREFERENCE_DELETE_CONFIRMATION = true
const val DEFAULT_PREFERENCE_DELETE_PERMANENTLY_WITHOUT_CONFIRMATION = false
}
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,6 +800,8 @@ You only need to do this once, until the next time you select a new location for
<string name="error_cannot_get_package_info">Unable to get package info from file \"%s\". Either the specified file is not an APK, or the package file is corrupt.</string>
<string name="preference_delete_confirmation">Delete confirmation</string>
<string name="preference_delete_confirmation_summary">Ask for confirmation before deleting files. Disabling this is highly discouraged!</string>
<string name="preference_delete_permanently_without_confirmation">Delete permanently (Disable Trashbin)</string>
<string name="preference_delete_permanently_without_confirmation_summary">Delete files permanently without moving to trashbin. Enabling this is highly discouraged!</string>
<string name="protocol_ssh" translatable="false">SSH/SFTP</string>
<string name="protocol_ftp" translatable="false">FTP</string>
<string name="protocol_ftps">Secure FTP</string>
Expand Down
7 changes: 7 additions & 0 deletions app/src/main/res/xml/behavior_prefs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@
app:key="delete_confirmation"
app:summary="@string/preference_delete_confirmation_summary"
app:title="@string/preference_delete_confirmation" />
<com.amaze.filemanager.ui.views.preference.CheckBox
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:defaultValue="false"
app:key="delete_permanently_without_confirmation"
app:summary="@string/preference_delete_permanently_without_confirmation_summary"
app:title="@string/preference_delete_permanently_without_confirmation" />
<Preference
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand Down
Loading