Fixes for some warnings reported by build (#65)

cmaier · web-flow · commit 1cc11e70dfa8 · 2022-09-13T10:58:09.000+02:00
There are some fixes for warnings during build _(`./gradlew build`)_
that're easy to fix _(aka low hanging fruits)_.

For the other warnings we should create issues and fix them separately
and test the fixes thoroughly.
diff --git a/core/src/main/java/io/snabble/sdk/checkin/CheckInLocationManager.kt b/core/src/main/java/io/snabble/sdk/checkin/CheckInLocationManager.kt
@@ -57,8 +57,6 @@ class CheckInLocationManager(val application: Application) {
 
         override fun onFlushComplete(requestCode: Int) {}
 
-        override fun onStatusChanged(provider: String?, status: Int, extras: Bundle?) {}
-
         override fun onProviderEnabled(provider: String) {}
 
         override fun onProviderDisabled(provider: String) {}
@@ -127,4 +125,4 @@ class CheckInLocationManager(val application: Application) {
             locationManager.removeUpdates(locationListener)
         }
     }
-}
+}
diff --git a/core/src/main/java/io/snabble/sdk/checkout/CheckoutApi.kt b/core/src/main/java/io/snabble/sdk/checkout/CheckoutApi.kt
@@ -156,7 +156,7 @@ data class SignedCheckoutInfo(
         get() {
             try {
                 if (checkoutInfo?.has("requiredInformation") == true) {
-                    val jsonArray = checkoutInfo?.getAsJsonArray("requiredInformation")
+                    val jsonArray = checkoutInfo.getAsJsonArray("requiredInformation")
                     jsonArray?.forEach { element ->
                         val id = element.asJsonObject["id"].asString
                         val hasValue = element.asJsonObject.has("value")
@@ -173,7 +173,7 @@ data class SignedCheckoutInfo(
 
     fun getAvailablePaymentMethods(): List<PaymentMethodInfo> {
         if (checkoutInfo?.has("paymentMethods") == true) {
-            val jsonArray = checkoutInfo?.getAsJsonArray("paymentMethods")
+            val jsonArray = checkoutInfo.getAsJsonArray("paymentMethods")
             if (jsonArray != null) {
                 val type = object : TypeToken<List<PaymentMethodInfo>?>() {}.type
                 return Gson().fromJson(jsonArray, type)
@@ -338,4 +338,4 @@ data class CheckoutProcessResponse(
 
 data class Pricing(
     val price: Price? = null,
-)
+)
diff --git a/core/src/main/java/io/snabble/sdk/checkout/DefaultCheckoutApi.kt b/core/src/main/java/io/snabble/sdk/checkout/DefaultCheckoutApi.kt
@@ -238,7 +238,7 @@ class DefaultCheckoutApi(private val project: Project,
             }
         )
 
-        var url = signedCheckoutInfo?.checkoutProcessLink
+        var url = signedCheckoutInfo.checkoutProcessLink
         if (url == null) {
             paymentProcessResult?.onError()
             return
@@ -308,4 +308,4 @@ class DefaultCheckoutApi(private val project: Project,
     companion object {
         private val JSON: MediaType = "application/json".toMediaType()
     }
-}
+}
diff --git a/core/src/main/java/io/snabble/sdk/coupons/Coupon.kt b/core/src/main/java/io/snabble/sdk/coupons/Coupon.kt
@@ -3,7 +3,6 @@ package io.snabble.sdk.coupons
 import android.graphics.Color
 import android.os.Parcelable
 import android.util.DisplayMetrics
-import androidx.annotation.ColorInt
 import com.google.gson.annotations.SerializedName
 import io.snabble.sdk.ColorUtils.parseColor
 import io.snabble.sdk.Snabble
@@ -31,7 +30,7 @@ data class Coupon (
     val isValid: Boolean
     get() = when(type) {
         CouponType.DIGITAL -> image != null
-        CouponType.MANUAL -> name != null
+        CouponType.MANUAL,
         CouponType.PRINTED -> true
     }
 
diff --git a/core/src/main/java/io/snabble/sdk/coupons/Coupons.kt b/core/src/main/java/io/snabble/sdk/coupons/Coupons.kt
@@ -79,9 +79,9 @@ class Coupons (
 
                 override fun onResponse(call: Call, response: Response) {
                     if (response.isSuccessful) {
-                        val response = response.body?.string()
+                        val responseBody = response.body?.string()
                         val localizedResponse = GsonBuilder().create()
-                            .fromJson(response, CouponResponse::class.java)
+                            .fromJson(responseBody, CouponResponse::class.java)
                         postValue(localizedResponse.coupons.filter { coupon ->
                             coupon.isValid
                         })
@@ -108,4 +108,4 @@ class Coupons (
     private data class CouponResponse(
         val coupons: List<Coupon>
     )
-}
+}
diff --git a/core/src/test/java/io/snabble/sdk/TestUtils.kt b/core/src/test/java/io/snabble/sdk/TestUtils.kt
@@ -19,7 +19,7 @@ inline infix fun <reified T : Any> T.merge(other: T): T {
 }
 
 @Throws(InterruptedException::class)
-fun <T> LiveData<T>.getOrAwaitValue(): T? {
+inline fun <reified T> LiveData<T>.getOrAwaitValue(): T? {
     val data = arrayOfNulls<Any>(1)
     val latch = CountDownLatch(1)
     val observer: Observer<T> = object : Observer<T> {
@@ -34,4 +34,4 @@ fun <T> LiveData<T>.getOrAwaitValue(): T? {
         throw RuntimeException("LiveData value was never set.")
     }
     return data[0] as T?
-}
+}
diff --git a/kotlin-compose-sample/src/main/java/io/snabble/sdk/composesample/MainActivity.kt b/kotlin-compose-sample/src/main/java/io/snabble/sdk/composesample/MainActivity.kt
@@ -56,13 +56,13 @@ class MainActivity : AppCompatActivity() {
                 val navController = rememberNavController()
 
                 with(navController) {
-                    SnabbleUI.setUiAction(this@MainActivity, SnabbleUI.Event.SHOW_BARCODE_SEARCH) { _, args ->
+                    SnabbleUI.setUiAction(this@MainActivity, SnabbleUI.Event.SHOW_BARCODE_SEARCH) { _, _ ->
                         navigate(BarcodeSearch.route)
                     }
-                    SnabbleUI.setUiAction(this@MainActivity, SnabbleUI.Event.SHOW_SCANNER) { _, args ->
+                    SnabbleUI.setUiAction(this@MainActivity, SnabbleUI.Event.SHOW_SCANNER) { _, _ ->
                         navigate(Scanner.route)
                     }
-                    SnabbleUI.setUiAction(this@MainActivity, SnabbleUI.Event.SHOW_SHOPPING_CART) { _, args ->
+                    SnabbleUI.setUiAction(this@MainActivity, SnabbleUI.Event.SHOW_SHOPPING_CART) { _, _ ->
                         navigate(Cart.route)
                     }
                     SnabbleUI.setUiAction(this@MainActivity, SnabbleUI.Event.GO_BACK) { _, _ ->
@@ -150,4 +150,4 @@ class MainActivity : AppCompatActivity() {
             }
         }
     }
-}
+}
diff --git a/kotlin-customization-sample/src/main/java/io/snabble/sdk/customization/LoadingActivity.kt b/kotlin-customization-sample/src/main/java/io/snabble/sdk/customization/LoadingActivity.kt
@@ -47,7 +47,8 @@ class LoadingActivity : AppCompatActivity() {
                             .show()
                     }
                 }
+                null -> Unit
             }
         }
     }
-}
+}
diff --git a/kotlin-customization-sample/src/main/java/io/snabble/sdk/customization/MainActivity.kt b/kotlin-customization-sample/src/main/java/io/snabble/sdk/customization/MainActivity.kt
@@ -3,7 +3,9 @@ package io.snabble.sdk.customization
 import android.Manifest
 import android.content.Intent
 import android.content.pm.PackageManager
+import android.os.Build
 import android.os.Bundle
+import android.os.Parcelable
 import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
@@ -61,7 +63,7 @@ class MainActivity : AppCompatActivity() {
             println("Nav to ${resources.getResourceName(destination.id)}")
             // apply deeplink arguments to bundle
             if (arguments?.containsKey(NavController.KEY_DEEP_LINK_INTENT) == true) {
-                (arguments.get(NavController.KEY_DEEP_LINK_INTENT) as? Intent)?.data?.let { deeplink ->
+                arguments.parcelable<Intent>(NavController.KEY_DEEP_LINK_INTENT)?.data?.let { deeplink ->
                     deeplink.queryParameterNames.forEach { key ->
                         val value = deeplink.getQueryParameter(key)
                         when {
@@ -158,4 +160,9 @@ class MainActivity : AppCompatActivity() {
         super.onPause()
         Snabble.checkInManager.stopUpdating()
     }
-}
+}
+
+private inline fun <reified T : Parcelable> Bundle.parcelable(key: String): T? = when {
+    Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> getParcelable(key, T::class.java)
+    else -> @Suppress("DEPRECATION") getParcelable(key) as? T
+}
diff --git a/kotlin-sample/src/main/java/io/snabble/sdk/sample/MainActivity.kt b/kotlin-sample/src/main/java/io/snabble/sdk/sample/MainActivity.kt
@@ -32,7 +32,7 @@ import kotlinx.coroutines.launch
 
 class MainActivity : AppCompatActivity(), PermissionSupport {
 
-    lateinit var locationPermission: ActivityResultLauncher<String>
+    private lateinit var locationPermission: ActivityResultLauncher<String>
 
     private lateinit var locationManager: CheckInLocationManager
 
diff --git a/ui/src/main/java/io/snabble/sdk/ui/BaseFragment.kt b/ui/src/main/java/io/snabble/sdk/ui/BaseFragment.kt
@@ -38,7 +38,8 @@ abstract class BaseFragment(@LayoutRes val layoutResId: Int = 0, val waitForProj
                     sdkNotInitialized.isVisible = true
                 }
                 InitializationState.UNINITIALIZED,
-                InitializationState.INITIALIZING -> {} // ignore
+                InitializationState.INITIALIZING,
+                null -> Unit // ignore
             }
         }
     }
@@ -97,4 +98,4 @@ abstract class BaseFragment(@LayoutRes val layoutResId: Int = 0, val waitForProj
     open fun onActualViewCreated(view: View, savedInstanceState: Bundle?) {
 
     }
-}
+}
diff --git a/ui/src/main/java/io/snabble/sdk/ui/cart/PaymentSelectionDialogFragment.kt b/ui/src/main/java/io/snabble/sdk/ui/cart/PaymentSelectionDialogFragment.kt
@@ -33,7 +33,7 @@ class PaymentSelectionDialogFragment : BottomSheetDialogFragment() {
 
             if (args.containsKey(ARG_ENTRIES)) {
                 val selectedEntry = args.getSerializable(ARG_SELECTED_ENTRY) as PaymentSelectionHelper.Entry?
-                (args.getSerializable(ARG_ENTRIES) as? ArrayList<PaymentSelectionHelper.Entry>)?.let { entries ->
+                (args.getSerializable(ARG_ENTRIES) as? ArrayList<*>)?.mapNotNull { it as? PaymentSelectionHelper.Entry }?.let { entries ->
                     val hasAnyAddedMethods = entries.any { it.isAdded }
                     entries.forEach { entry ->
                         val v = View.inflate(requireContext(), R.layout.snabble_item_payment_select, null)
@@ -105,4 +105,4 @@ class PaymentSelectionDialogFragment : BottomSheetDialogFragment() {
         const val ARG_SHOW_OFFLINE_HINT = "showOfflineHint"
         const val ARG_SELECTED_ENTRY = "selectedEntry"
     }
-}
+}
diff --git a/ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutActivity.kt b/ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutActivity.kt
@@ -59,7 +59,7 @@ class CheckoutActivity : FragmentActivity() {
             Snabble.setup(application)
         }
 
-        Snabble.initializationState.observe(this) {
+        Snabble.initializationState.observe(this) initObserver@ {
             when (it) {
                 InitializationState.INITIALIZED -> {
                     Snabble.checkedInProject.observe(this) { project ->
@@ -101,7 +101,8 @@ class CheckoutActivity : FragmentActivity() {
                     }
                 }
                 InitializationState.UNINITIALIZED,
-                InitializationState.INITIALIZING -> {} // ignore
+                InitializationState.INITIALIZING,
+                null -> Unit // ignore
                 InitializationState.ERROR -> {
                     finishWithError("The snabble SDK is not initialized")
                 }
@@ -187,4 +188,4 @@ class CheckoutActivity : FragmentActivity() {
             setPopUpTo(currentNavigationId ?: 0, true)
         }.build())
     }
-}
+}
diff --git a/ui/src/main/java/io/snabble/sdk/ui/utils/ViewExt.kt b/ui/src/main/java/io/snabble/sdk/ui/utils/ViewExt.kt
@@ -93,7 +93,7 @@ fun ImageView.resolveImageOrHide(data: String?) {
     isVisible = data.isNotNullOrBlank()
 
     if (data.isNotNullOrBlank()) {
-        if (data!!.startsWith("http")) {
+        if (data.startsWith("http")) {
             Picasso.get().load(data).into(this)
         } else {
             val imageId = context.getImageId(data)
@@ -179,4 +179,4 @@ inline val View.margin: Sides
             set(value) { params?.bottomMargin = value }
     }
 
-fun ImageView.loadImage(url: String?) = url?.let { Picasso.get().load(url).into(this) }
+fun ImageView.loadImage(url: String?) = url?.let { Picasso.get().load(url).into(this) }

Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,6 @@ class CheckInLocationManager(val application: Application) {`
`57`	`57`
`58`	`58`	`override fun onFlushComplete(requestCode: Int) {}`
`59`	`59`
`60`		`- override fun onStatusChanged(provider: String?, status: Int, extras: Bundle?) {}`
`61`		`-`
`62`	`60`	`override fun onProviderEnabled(provider: String) {}`
`63`	`61`
`64`	`62`	`override fun onProviderDisabled(provider: String) {}`
`@@ -127,4 +125,4 @@ class CheckInLocationManager(val application: Application) {`
`127`	`125`	`locationManager.removeUpdates(locationListener)`
`128`	`126`	`}`
`129`	`127`	`}`
`130`		`-}`
	`128`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ class DefaultCheckoutApi(private val project: Project,`
`238`	`238`	`}`
`239`	`239`	`)`
`240`	`240`
`241`		`- var url = signedCheckoutInfo?.checkoutProcessLink`
	`241`	`+ var url = signedCheckoutInfo.checkoutProcessLink`
`242`	`242`	`if (url == null) {`
`243`	`243`	`paymentProcessResult?.onError()`
`244`	`244`	`return`
`@@ -308,4 +308,4 @@ class DefaultCheckoutApi(private val project: Project,`
`308`	`308`	`companion object {`
`309`	`309`	`private val JSON: MediaType = "application/json".toMediaType()`
`310`	`310`	`}`
`311`		`-}`
	`311`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ inline infix fun <reified T : Any> T.merge(other: T): T {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`@Throws(InterruptedException::class)`
`22`		`-fun <T> LiveData<T>.getOrAwaitValue(): T? {`
	`22`	`+inline fun <reified T> LiveData<T>.getOrAwaitValue(): T? {`
`23`	`23`	`val data = arrayOfNulls<Any>(1)`
`24`	`24`	`val latch = CountDownLatch(1)`
`25`	`25`	`val observer: Observer<T> = object : Observer<T> {`
`@@ -34,4 +34,4 @@ fun <T> LiveData<T>.getOrAwaitValue(): T? {`
`34`	`34`	`throw RuntimeException("LiveData value was never set.")`
`35`	`35`	`}`
`36`	`36`	`return data[0] as T?`
`37`		`-}`
	`37`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -56,13 +56,13 @@ class MainActivity : AppCompatActivity() {`
`56`	`56`	`val navController = rememberNavController()`
`57`	`57`
`58`	`58`	`with(navController) {`
`59`		`- SnabbleUI.setUiAction(this@MainActivity, SnabbleUI.Event.SHOW_BARCODE_SEARCH) { _, args ->`
	`59`	`+ SnabbleUI.setUiAction(this@MainActivity, SnabbleUI.Event.SHOW_BARCODE_SEARCH) { _, _ ->`
`60`	`60`	`navigate(BarcodeSearch.route)`
`61`	`61`	`}`
`62`		`- SnabbleUI.setUiAction(this@MainActivity, SnabbleUI.Event.SHOW_SCANNER) { _, args ->`
	`62`	`+ SnabbleUI.setUiAction(this@MainActivity, SnabbleUI.Event.SHOW_SCANNER) { _, _ ->`
`63`	`63`	`navigate(Scanner.route)`
`64`	`64`	`}`
`65`		`- SnabbleUI.setUiAction(this@MainActivity, SnabbleUI.Event.SHOW_SHOPPING_CART) { _, args ->`
	`65`	`+ SnabbleUI.setUiAction(this@MainActivity, SnabbleUI.Event.SHOW_SHOPPING_CART) { _, _ ->`
`66`	`66`	`navigate(Cart.route)`
`67`	`67`	`}`
`68`	`68`	`SnabbleUI.setUiAction(this@MainActivity, SnabbleUI.Event.GO_BACK) { _, _ ->`
`@@ -150,4 +150,4 @@ class MainActivity : AppCompatActivity() {`
`150`	`150`	`}`
`151`	`151`	`}`
`152`	`152`	`}`
`153`		`-}`
	`153`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,8 @@ class LoadingActivity : AppCompatActivity() {`
`47`	`47`	`.show()`
`48`	`48`	`}`
`49`	`49`	`}`
	`50`	`+ null -> Unit`
`50`	`51`	`}`
`51`	`52`	`}`
`52`	`53`	`}`
`53`		`-}`
	`54`	`+}`