Merge branch 'develop' into remove-mediastore

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "gradle" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

dependencies.gradle

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

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