From 070e0ac792d34c52033a5aad1e85d6f321cdc726 Mon Sep 17 00:00:00 2001 From: Maxence G Date: Tue, 25 May 2021 18:51:00 +0200 Subject: [PATCH] Fix lintFormat + remove synchronized --- .../java/org/moire/ultrasonic/util/Util.java | 2 +- .../ultrasonic/activity/NavigationActivity.kt | 3 +- .../org/moire/ultrasonic/data/AppDatabase.kt | 16 ++++-- .../di/AppPermanentStorageModule.kt | 4 +- .../ultrasonic/fragment/EditServerFragment.kt | 51 ++++++++++++------- 5 files changed, 50 insertions(+), 26 deletions(-) diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/util/Util.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/Util.java index da3e98af..35086202 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/util/Util.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/Util.java @@ -365,7 +365,7 @@ public class Util * @param value Is true or false * @return The corresponding mark. */ - public static synchronized String boolToMark(boolean value) + public static String boolToMark(boolean value) { if (value) return "✔️"; 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 2cff4a3f..2a1f97c0 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt @@ -370,8 +370,7 @@ class NavigationActivity : AppCompatActivity() { } private fun setMenuForServerSetting() { - if (isOffline()) - { + if (isOffline()) { chatMenuItem?.isVisible = false bookmarksMenuItem?.isVisible = false sharesMenuItem?.isVisible = false diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/AppDatabase.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/AppDatabase.kt index 2a882cd9..a29f895f 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/AppDatabase.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/AppDatabase.kt @@ -27,9 +27,17 @@ val MIGRATION_1_2: Migration = object : Migration(1, 2) { val MIGRATION_2_3: Migration = object : Migration(2, 3) { override fun migrate(database: SupportSQLiteDatabase) { - database.execSQL("ALTER TABLE ServerSetting ADD COLUMN chatSupport INTEGER NOT NULL DEFAULT(1)") - database.execSQL("ALTER TABLE ServerSetting ADD COLUMN bookmarkSupport INTEGER NOT NULL DEFAULT(1)") - database.execSQL("ALTER TABLE ServerSetting ADD COLUMN shareSupport INTEGER NOT NULL DEFAULT(1)") - database.execSQL("ALTER TABLE ServerSetting ADD COLUMN podcastSupport INTEGER NOT NULL DEFAULT(1)") + database.execSQL( + "ALTER TABLE ServerSetting ADD COLUMN chatSupport INTEGER NOT NULL DEFAULT(1)" + ) + database.execSQL( + "ALTER TABLE ServerSetting ADD COLUMN bookmarkSupport INTEGER NOT NULL DEFAULT(1)" + ) + database.execSQL( + "ALTER TABLE ServerSetting ADD COLUMN shareSupport INTEGER NOT NULL DEFAULT(1)" + ) + database.execSQL( + "ALTER TABLE ServerSetting ADD COLUMN podcastSupport INTEGER NOT NULL DEFAULT(1)" + ) } } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/AppPermanentStorageModule.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/AppPermanentStorageModule.kt index fd07d52f..31d63ffd 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/AppPermanentStorageModule.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/AppPermanentStorageModule.kt @@ -25,8 +25,8 @@ val appPermanentStorage = module { AppDatabase::class.java, "ultrasonic-database" ) - .addMigrations(MIGRATION_1_2) - .addMigrations(MIGRATION_2_3) + .addMigrations(MIGRATION_1_2) + .addMigrations(MIGRATION_2_3) .fallbackToDestructiveMigrationOnDowngrade() .build() } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EditServerFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EditServerFragment.kt index 3bb409f6..c7d009fa 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EditServerFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EditServerFragment.kt @@ -303,7 +303,8 @@ class EditServerFragment : Fragment(), OnBackPressedHandler { @Throws(Throwable::class) override fun doInBackground(): String { - var progressString = """ + var progressString = + """ |%s - ${activity.resources.getString(R.string.button_bar_chat)} |%s - ${activity.resources.getString(R.string.button_bar_bookmarks)} |%s - ${activity.resources.getString(R.string.button_bar_shares)} @@ -345,30 +346,42 @@ class EditServerFragment : Fragment(), OnBackPressedHandler { true } catch (e: Throwable) { false } - updateProgress(String.format(progressString, + updateProgress( + String.format( + progressString, Util.boolToMark(currentServerSetting!!.chatSupport), - "⌛", "⌛", "⌛")) + "⌛", "⌛", "⌛" + ) + ) currentServerSetting!!.bookmarkSupport = try { subsonicApiClient.api.getBookmarks().execute() true } catch (e: Throwable) { false } - updateProgress(String.format(progressString, + updateProgress( + String.format( + progressString, Util.boolToMark(currentServerSetting!!.chatSupport), Util.boolToMark(currentServerSetting!!.bookmarkSupport), - "⌛", "⌛")) + "⌛", "⌛" + ) + ) currentServerSetting!!.shareSupport = try { subsonicApiClient.api.getShares().execute() true } catch (e: Throwable) { false } - updateProgress(String.format(progressString, + updateProgress( + String.format( + progressString, Util.boolToMark(currentServerSetting!!.chatSupport), Util.boolToMark(currentServerSetting!!.bookmarkSupport), Util.boolToMark(currentServerSetting!!.shareSupport), - "⌛")) + "⌛" + ) + ) currentServerSetting!!.podcastSupport = try { subsonicApiClient.api.getPodcasts().execute() @@ -376,27 +389,31 @@ class EditServerFragment : Fragment(), OnBackPressedHandler { } catch (e: Throwable) { false } // Finalize String before displaying it to Dialog - progressString = String.format(progressString, - Util.boolToMark(currentServerSetting!!.chatSupport), - Util.boolToMark(currentServerSetting!!.bookmarkSupport), - Util.boolToMark(currentServerSetting!!.shareSupport), - Util.boolToMark(currentServerSetting!!.podcastSupport)) + progressString = String.format( + progressString, + Util.boolToMark(currentServerSetting!!.chatSupport), + Util.boolToMark(currentServerSetting!!.bookmarkSupport), + Util.boolToMark(currentServerSetting!!.shareSupport), + Util.boolToMark(currentServerSetting!!.podcastSupport) + ) updateProgress(progressString) val licenseResponse = subsonicApiClient.api.getLicense().execute() ApiCallResponseChecker.checkResponseSuccessful(licenseResponse) if (!licenseResponse.body()!!.license.valid) { - progressString += "\n${activity.resources.getString(R.string.settings_testing_unlicensed)}" + progressString += "\n" + + activity.resources.getString(R.string.settings_testing_unlicensed) } return progressString } override fun done(responseString: String) { Util.showDialog( - activity, - android.R.drawable.ic_dialog_info, - R.string.settings_testing_ok, - responseString) + activity, + android.R.drawable.ic_dialog_info, + R.string.settings_testing_ok, + responseString + ) } override fun error(error: Throwable) {