From 1f0f6b3e512bd37513855d5bb35d855af29f4a5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Tue, 29 Sep 2020 21:02:49 +0200 Subject: [PATCH 1/2] Fix string pair list type converter (#971) --- app/build.gradle | 2 +- .../wulkanowy/data/db/adapters/PairAdapterFactory.kt | 8 ++++---- .../java/io/github/wulkanowy/data/db/ConvertersTest.kt | 5 +++++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index cee711d20..927f2e50d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -127,7 +127,7 @@ configurations.all { } dependencies { - implementation "io.github.wulkanowy:sdk:0.21.1" + implementation "io.github.wulkanowy:sdk:7577fc9" coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10' diff --git a/app/src/main/java/io/github/wulkanowy/data/db/adapters/PairAdapterFactory.kt b/app/src/main/java/io/github/wulkanowy/data/db/adapters/PairAdapterFactory.kt index 60ae37c9d..4a9b168dd 100644 --- a/app/src/main/java/io/github/wulkanowy/data/db/adapters/PairAdapterFactory.kt +++ b/app/src/main/java/io/github/wulkanowy/data/db/adapters/PairAdapterFactory.kt @@ -56,11 +56,11 @@ object PairAdapterFactory : JsonAdapter.Factory { private fun deserializeGsonPair(reader: JsonReader): List>? { val list = listAdapter.fromJson(reader) ?: return null - require(list.size == 2 || list.isEmpty()) { - "pair with more or less than two elements: $list" - } - return list.map { + require(it.size == 2) { + "pair with more or less than two elements: $list" + } + it["first"].orEmpty() to it["second"].orEmpty() } } diff --git a/app/src/test/java/io/github/wulkanowy/data/db/ConvertersTest.kt b/app/src/test/java/io/github/wulkanowy/data/db/ConvertersTest.kt index 50741b7ab..3b0d7c841 100644 --- a/app/src/test/java/io/github/wulkanowy/data/db/ConvertersTest.kt +++ b/app/src/test/java/io/github/wulkanowy/data/db/ConvertersTest.kt @@ -7,19 +7,24 @@ class ConvertersTest { @Test fun stringPairListToJson() { + assertEquals(Converters().stringPairListToJson(listOf("aaa" to "bbb", "ccc" to "ddd", "eee" to "fff")), "[{\"first\":\"aaa\",\"second\":\"bbb\"},{\"first\":\"ccc\",\"second\":\"ddd\"},{\"first\":\"eee\",\"second\":\"fff\"}]") assertEquals(Converters().stringPairListToJson(listOf("aaa" to "bbb", "ccc" to "ddd")), "[{\"first\":\"aaa\",\"second\":\"bbb\"},{\"first\":\"ccc\",\"second\":\"ddd\"}]") + assertEquals(Converters().stringPairListToJson(listOf("aaa" to "bbb")), "[{\"first\":\"aaa\",\"second\":\"bbb\"}]") assertEquals(Converters().stringPairListToJson(listOf()), "[]") } @Test fun jsonToStringPairList() { + assertEquals(Converters().jsonToStringPairList("[{\"first\":\"aaa\",\"second\":\"bbb\"},{\"first\":\"ccc\",\"second\":\"ddd\"},{\"first\":\"eee\",\"second\":\"fff\"}]"), listOf("aaa" to "bbb", "ccc" to "ddd", "eee" to "fff")) assertEquals(Converters().jsonToStringPairList("[{\"first\":\"aaa\",\"second\":\"bbb\"},{\"first\":\"ccc\",\"second\":\"ddd\"}]"), listOf("aaa" to "bbb", "ccc" to "ddd")) + assertEquals(Converters().jsonToStringPairList("[{\"first\":\"aaa\",\"second\":\"bbb\"}]"), listOf("aaa" to "bbb")) assertEquals(Converters().jsonToStringPairList("[]"), listOf>()) } @Test fun jsonToStringPairList_0210() { assertEquals(Converters().jsonToStringPairList("{\"aaa\":\"bbb\",\"ccc\":\"ddd\"}"), listOf("aaa" to "bbb", "ccc" to "ddd")) + assertEquals(Converters().jsonToStringPairList("{\"aaa\":\"bbb\"}"), listOf("aaa" to "bbb")) assertEquals(Converters().jsonToStringPairList("{}"), listOf>()) } } From 8a1a712d6d46b551b3093ca170ff80ee53663970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Tue, 29 Sep 2020 21:10:05 +0200 Subject: [PATCH 2/2] Version 0.21.2 --- .travis.yml | 2 +- app/build.gradle | 6 +++--- app/src/main/play/release-notes/pl-PL/default.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index a36c34cfe..24280c5f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ cache: branches: only: - develop - - 0.21.1 + - 0.21.2 android: licenses: diff --git a/app/build.gradle b/app/build.gradle index 927f2e50d..566094662 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ android { testApplicationId "io.github.tests.wulkanowy" minSdkVersion 17 targetSdkVersion 29 - versionCode 71 - versionName "0.21.1" + versionCode 72 + versionName "0.21.2" multiDexEnabled true resValue "string", "app_name", "Wulkanowy" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -127,7 +127,7 @@ configurations.all { } dependencies { - implementation "io.github.wulkanowy:sdk:7577fc9" + implementation "io.github.wulkanowy:sdk:0.21.2" coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10' diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt index 271eac7fd..7553e2cb7 100644 --- a/app/src/main/play/release-notes/pl-PL/default.txt +++ b/app/src/main/play/release-notes/pl-PL/default.txt @@ -1,4 +1,4 @@ -Wersja 0.21.1 +Wersja 0.21.2 - naprawiliśmy logowanie do tarnowskiego dziennika - naprawiliśmy wyświetlanie podsumowania punktów klasy - dodaliśmy skróty aplikacji