From 6feac04118ca08fb39983e0abb4e5206d4d07103 Mon Sep 17 00:00:00 2001
From: Matthias Urhahn <matthias.urhahn@sap.com>
Date: Thu, 18 Mar 2021 11:42:18 +0100
Subject: [PATCH] Fix a few code smells (DEV) (#2639)
---
.../appconfig/sources/local/AppConfigStorage.kt | 6 ++----
.../coronawarnapp/util/lists/modular/ModularAdapter.kt | 9 +++++++--
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/sources/local/AppConfigStorage.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/sources/local/AppConfigStorage.kt
index 498b6ed9a..2a3677d7e 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/sources/local/AppConfigStorage.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/sources/local/AppConfigStorage.kt
@@ -81,10 +81,8 @@ class AppConfigStorage @Inject constructor(
Timber.v("Overwriting %d from %s", configFile.length(), configFile.lastModified())
}
- if (legacyConfigFile.exists()) {
- if (legacyConfigFile.delete()) {
- Timber.i("Legacy config file deleted, superseeded.")
- }
+ if (legacyConfigFile.exists() && legacyConfigFile.delete()) {
+ Timber.i("Legacy config file deleted, superseeded.")
}
if (value == null) {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/lists/modular/ModularAdapter.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/lists/modular/ModularAdapter.kt
index 347550c7e..fc2cd5894 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/lists/modular/ModularAdapter.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/lists/modular/ModularAdapter.kt
@@ -70,8 +70,13 @@ abstract class ModularAdapter<VH : ModularAdapter.VH> : BaseAdapter<VH>() {
}
interface Binder<T : VH> : Module {
- fun onBindModularVH(adapter: ModularAdapter<T>, vh: T, pos: Int, payloads: MutableList<Any>) {}
- fun onPostBind(adapter: ModularAdapter<T>, vh: T, pos: Int) {}
+ fun onBindModularVH(adapter: ModularAdapter<T>, vh: T, pos: Int, payloads: MutableList<Any>) {
+ // NOOP
+ }
+
+ fun onPostBind(adapter: ModularAdapter<T>, vh: T, pos: Int) {
+ // NOOP
+ }
}
interface Typing : Module {
--
GitLab