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

Jump to bottom

Overhauls the settings screen #3140

Merged
merged 8 commits into from
Feb 1, 2022
Merged

Overhauls the settings screen #3140

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b9b55a1
Overhauls the settings screen
nicbn Jan 26, 2022
8fba01e
Formatting
nicbn Jan 26, 2022
6dfcb9a
Applies requests
nicbn Jan 26, 2022
e9e02a5
Change fragment transition
nicbn Jan 26, 2022
9c5a27b
Removes more !!
nicbn Jan 26, 2022
71f1270
Codacy
nicbn Jan 28, 2022
aec1382
Handle theme change
nicbn Feb 1, 2022
cc060ee
Update mode even if theme is not set to system
nicbn Feb 1, 2022
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: 5 additions & 5 deletions app/src/main/java/com/amaze/filemanager/filesystem/files/CryptUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
import com.amaze.filemanager.filesystem.HybridFile;
import com.amaze.filemanager.filesystem.HybridFileParcelable;
import com.amaze.filemanager.filesystem.MakeDirectoryOperation;
import com.amaze.filemanager.ui.fragments.preference_fragments.PrefFrag;
import com.amaze.filemanager.ui.fragments.preference_fragments.PreferencesConstants;
import com.amaze.filemanager.utils.ProgressHandler;

import android.content.Context;
Expand All @@ -74,10 +74,10 @@
* service then calls the constructor which fires up the subsequent encryption/decryption process.
*
* <p>We differentiate between already encrypted files from <i>new ones</i> by encrypting the
* plaintext {@link PrefFrag#ENCRYPT_PASSWORD_MASTER} and {@link
* PrefFrag#ENCRYPT_PASSWORD_FINGERPRINT} against the path in database. At the time of decryption,
* we check for these values and either retrieve master password from preferences or fire up the
* fingerprint sensor authentication.
* plaintext {@link PreferencesConstants#ENCRYPT_PASSWORD_MASTER} and {@link
* PreferencesConstants#ENCRYPT_PASSWORD_FINGERPRINT} against the path in database. At the time of
* decryption, we check for these values and either retrieve master password from preferences or
* fire up the fingerprint sensor authentication.
*
* <p>From <i>new ones</i> we mean the ones when were encrypted after user changed preference for
* master password/fingerprint sensor from settings.
Expand Down
330 changes: 0 additions & 330 deletions app/src/main/java/com/amaze/filemanager/ui/activities/PreferencesActivity.java
View file
Open in desktop

This file was deleted.

Loading