Merge branch 'develop' into dependabot/gradle/org.robolectric-robolectric-4.5.1

This commit is contained in:
Nite 2021-05-06 09:23:40 +02:00 committed by GitHub
commit 457a908d72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions

View File

@ -10,7 +10,7 @@ ext.versions = [
ktlint : "0.37.1",
ktlintGradle : "9.2.1",
detekt : "1.16.0",
jacoco : "0.8.5",
jacoco : "0.8.7",
preferences : "1.1.1",
media : "1.3.0",
@ -34,13 +34,13 @@ ext.versions = [
junit4 : "4.12",
junit5 : "5.3.1",
mockito : "3.5.5",
mockito : "3.8.0",
mockitoKotlin : "1.5.0",
kluent : "1.35",
apacheCodecs : "1.10",
testRunner : "1.0.1",
robolectric : "4.5.1",
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);