Skip to content

[stable-34.1.x] remove visibility of debug functionality #17393

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

Open
backportbot wants to merge 1 commit into
base: stable-34.1.x
Choose a base branch
from
+13 −12
Open

[stable-34.1.x] remove visibility of debug functionality #17393

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 13 additions & 12 deletions app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,19 +543,20 @@ private void removeE2E(PreferenceCategory preferenceCategoryMore) {
}

private void removeE2EFilesAndKeys(PreferenceCategory preferenceCategoryMore) {
if (BuildConfig.DEBUG) {
Preference removeKeysAndFilesPreference = findPreference("remove_e2e_files_and_keys");
if (removeKeysAndFilesPreference != null) {
if (!FileOperationsHelper.isEndToEndEncryptionSetup(this, user)) {
preferenceCategoryMore.removePreference(removeKeysAndFilesPreference);
} else {
removeKeysAndFilesPreference.setOnPreferenceClickListener(p -> {
showRemoveE2EKeysAndFilesAlertDialog(preferenceCategoryMore, removeKeysAndFilesPreference);
return true;
});
}
}
Preference preference = findPreference("remove_e2e_files_and_keys");
if (preference == null) {
return;
}

if (!BuildConfig.DEBUG || !FileOperationsHelper.isEndToEndEncryptionSetup(this, user)) {
preferenceCategoryMore.removePreference(preference);
return;
}

preference.setOnPreferenceClickListener(p -> {
showRemoveE2EKeysAndFilesAlertDialog(preferenceCategoryMore, preference);
return true;
});
}

private void showRemoveE2EKeysAndFilesAlertDialog(PreferenceCategory preferenceCategoryMore, Preference preference) {
Expand Down
Loading