Merge branch 'develop' into dependabot/gradle/versions.mockito-3.8.0

This commit is contained in:
Nite 2021-05-06 08:39:28 +02:00 committed by GitHub
commit ce7e95f59e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions

View File

@ -40,7 +40,7 @@ ext.versions = [
apacheCodecs : "1.10",
testRunner : "1.0.1",
robolectric : "4.4",
dexter : "6.1.2",
dexter : "6.2.2",
timber : "4.7.1",
fastScroll : "2.0.1",
]

View File

@ -447,6 +447,8 @@ public class SettingsFragment extends PreferenceFragmentCompat
sharingDefaultExpiration.setSummary(sharingDefaultExpiration.getText());
sharingDefaultDescription.setSummary(sharingDefaultDescription.getText());
sharingDefaultGreeting.setSummary(sharingDefaultGreeting.getText());
cacheLocation.setSummary(settings.getString(Constants.PREFERENCES_KEY_CACHE_LOCATION,
FileUtil.getDefaultMusicDirectory(getActivity()).getPath()));
if (!mediaButtonsEnabled.isChecked()) {
lockScreenEnabled.setChecked(false);