Various minor code style changes

Author: phw

app/src/main/java/org/musicbrainz/picard/barcodescanner/util/Preferences.kt

@@ -22,6 +22,7 @@ package org.musicbrainz.picard.barcodescanner.util
 import android.content.Context
 import android.content.SharedPreferences
 import org.musicbrainz.picard.barcodescanner.R
+import androidx.core.content.edit
 
 class Preferences(private val mContext: Context) {
     private val mSettings: SharedPreferences = mContext.getSharedPreferences(
@@ -40,10 +41,10 @@ class Preferences(private val mContext: Context) {
     val port = mSettings.getInt(Constants.PREFERENCE_PICARD_PORT, defaultPort)
 
     fun setIpAddressAndPort(ipAddress: String?, port: Int) {
-        val editor = mSettings.edit()
-        editor.putString(Constants.PREFERENCE_PICARD_IP_ADDRESS, ipAddress)
-        editor.putInt(Constants.PREFERENCE_PICARD_PORT, port)
-        editor.apply()
+        mSettings.edit {
+            putString(Constants.PREFERENCE_PICARD_IP_ADDRESS, ipAddress)
+            putInt(Constants.PREFERENCE_PICARD_PORT, port)
+        }
     }
 
     val connectionConfigured: Boolean

app/src/main/java/org/musicbrainz/picard/barcodescanner/webservice/MusicBrainzClient.kt

@@ -35,7 +35,7 @@ class MusicBrainzClient {
 
     private val instance: MusicBrainzApi by lazy {
         val retrofit = Retrofit.Builder()
-            .baseUrl(baseUrl)
+            .baseUrl(BASE_URL)
             .addConverterFactory(GsonConverterFactory.create(
                 GsonBuilder().setStrictness(Strictness.LENIENT).create()))
             .client(okHttpClient)
@@ -45,14 +45,14 @@ class MusicBrainzClient {
     }
 
     companion object {
-        private const val baseUrl = "https://musicbrainz.org/ws/2/"
-        private const val userAgent = "picard-android-barcodescanner/1.5"
+        private const val BASE_URL = "https://musicbrainz.org/ws/2/"
+        private const val USER_AGENT = "picard-android-barcodescanner/1.5"
         private val okHttpClient = HttpClient.newBuilder()
             .addInterceptor { chain ->
                 val original = chain.request()
 
                 val requestBuilder = original.newBuilder()
-                    .header("User-Agent", userAgent)
+                    .header("User-Agent", USER_AGENT)
                     .addHeader("Accept", "application/json")
                     .method(original.method, original.body)
 

app/src/main/java/org/musicbrainz/picard/barcodescanner/webservice/PicardClient.kt

@@ -20,13 +20,15 @@
  */
 package org.musicbrainz.picard.barcodescanner.webservice
 
+import android.annotation.SuppressLint
 import org.musicbrainz.picard.barcodescanner.data.PicardPingResult
 import org.musicbrainz.picard.barcodescanner.util.WebServiceUtils
 import retrofit2.Retrofit
 import retrofit2.converter.scalars.ScalarsConverterFactory
 import java.lang.Exception
 import java.util.concurrent.TimeUnit
 
+@SuppressLint("DefaultLocale")
 class PicardClient(private val mIpAddress: String, private val mPort: Int) {
 
     suspend fun openRelease(releaseId: String): Boolean {
@@ -41,10 +43,10 @@ class PicardClient(private val mIpAddress: String, private val mPort: Int) {
     suspend fun ping(): PicardPingResult {
         return try {
             val result = instance.ping()
-            val match = pingResponseRegex.matchEntire((result))
+            val match = PING_RESPONSE_REGEX.matchEntire((result))
             when {
                 match != null -> PicardPingResult(true, getAppName(match.groupValues[1]))
-                result == legacyPingResponse -> PicardPingResult(true, getAppName())
+                result == LEGACY_PING_RESPONSE -> PicardPingResult(true, getAppName())
                 else -> PicardPingResult(false, "")
             }
         } catch (e: Exception) {
@@ -53,12 +55,12 @@ class PicardClient(private val mIpAddress: String, private val mPort: Int) {
     }
 
     private fun getAppName(version: String? = null): String {
-        return picardAppName.format(version).trimEnd()
+        return PICARD_APP_NAME.format(version).trimEnd()
     }
 
     private val instance: PicardApi by lazy {
         val retrofit = Retrofit.Builder()
-            .baseUrl(String.format(baseUrl, mIpAddress, mPort))
+            .baseUrl(String.format(BASE_URL, mIpAddress, mPort))
             .addConverterFactory(ScalarsConverterFactory.create())
             .client(okHttpClient)
             .build()
@@ -67,10 +69,10 @@ class PicardClient(private val mIpAddress: String, private val mPort: Int) {
     }
 
     companion object {
-        private const val baseUrl = "http://%s:%d/"
-        private val pingResponseRegex = Regex("MusicBrainz-Picard/(.*)")
-        private const val legacyPingResponse = "Nothing to see here"
-        private const val picardAppName = "MusicBrainz Picard %s"
+        private const val BASE_URL = "http://%s:%d/"
+        private val PING_RESPONSE_REGEX = Regex("MusicBrainz-Picard/(.*)")
+        private const val LEGACY_PING_RESPONSE = "Nothing to see here"
+        private const val PICARD_APP_NAME = "MusicBrainz Picard %s"
         private val okHttpClient = HttpClient.newBuilder()
             .connectTimeout(1000, TimeUnit.MILLISECONDS)
             .build()