From a6e76e9d53ce81fb5a28d8c762bd390f11f10860 Mon Sep 17 00:00:00 2001 From: tzugen Date: Tue, 2 Nov 2021 09:07:38 +0100 Subject: [PATCH] Ktlint --- .../org/moire/ultrasonic/activity/NavigationActivity.kt | 1 - .../org/moire/ultrasonic/fragment/SettingsFragment.kt | 8 +++----- .../src/main/kotlin/org/moire/ultrasonic/util/FileUtil.kt | 2 -- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt index 2af515b4..1b5a92e9 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt @@ -45,7 +45,6 @@ import org.moire.ultrasonic.service.MediaPlayerController import org.moire.ultrasonic.service.MediaPlayerLifecycleSupport import org.moire.ultrasonic.subsonic.ImageLoaderProvider import org.moire.ultrasonic.util.Constants -import org.moire.ultrasonic.util.FileUtil import org.moire.ultrasonic.util.NowPlayingEventDistributor import org.moire.ultrasonic.util.NowPlayingEventListener import org.moire.ultrasonic.util.ServerColor diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SettingsFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SettingsFragment.kt index d3836e0b..d481d11c 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SettingsFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SettingsFragment.kt @@ -20,6 +20,8 @@ import androidx.preference.ListPreference import androidx.preference.Preference import androidx.preference.PreferenceCategory import androidx.preference.PreferenceFragmentCompat +import java.io.File +import kotlin.math.ceil import org.koin.core.component.KoinComponent import org.koin.java.KoinJavaComponent.get import org.koin.java.KoinJavaComponent.inject @@ -49,8 +51,6 @@ import org.moire.ultrasonic.util.TimeSpanPreference import org.moire.ultrasonic.util.TimeSpanPreferenceDialogFragmentCompat import org.moire.ultrasonic.util.Util.toast import timber.log.Timber -import java.io.File -import kotlin.math.ceil /** * Shows main app settings. @@ -177,12 +177,10 @@ class SettingsFragment : contentResolver.takePersistableUriPermission(uri, RW_FLAG) setCacheLocation(uri) - } } } - override fun onResume() { super.onResume() val preferences = preferences @@ -475,7 +473,7 @@ class SettingsFragment : companion object { const val SELECT_CACHE_ACTIVITY = 161161 const val RW_FLAG = Intent.FLAG_GRANT_READ_URI_PERMISSION or - Intent.FLAG_GRANT_WRITE_URI_PERMISSION + Intent.FLAG_GRANT_WRITE_URI_PERMISSION const val PERSISTABLE_FLAG = Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION } } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/FileUtil.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/FileUtil.kt index 2f10ebe7..c384309c 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/FileUtil.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/FileUtil.kt @@ -25,10 +25,8 @@ import java.util.Locale import java.util.SortedSet import java.util.TreeSet import java.util.regex.Pattern -import org.koin.java.KoinJavaComponent.inject import org.moire.ultrasonic.app.UApp import org.moire.ultrasonic.domain.MusicDirectory -import org.moire.ultrasonic.service.MediaPlayerController import timber.log.Timber object FileUtil {