third-party-mirrors/ultrasonic
1
0
Fork 0
mirror of https://gitlab.com/ultrasonic/ultrasonic.git synced 2025-04-24 04:40:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into dependabot/gradle/org.jacoco-org.jacoco.core-0.8.7

Browse Source
This commit is contained in:
Nite 2021-05-06 09:02:07 +02:00 committed by GitHub
commit 115b8c3183
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
dependencies.gradle
ultrasonic/src/main/java/org/moire/ultrasonic/fragment
SettingsFragment.java

4
dependencies.gradle

@ -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.4",
dexter : "6.1.2",
dexter : "6.2.2",
timber : "4.7.1",
fastScroll : "2.0.1",
]

2
ultrasonic/src/main/java/org/moire/ultrasonic/fragment/SettingsFragment.java

@ -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);