release: 2.3 Hotfix 1 リリース (#43)

* Fix: 従量制プランに対応 (#39) * chore: リリース準備 * fix: ギガプラン暫定対応 (#42)
pakutoma · May 1, 2021 · 0d801c5 · 0d801c5
1 parent d188fb5
commit 0d801c5
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 17 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         applicationId "pakutoma.iijmiocouponwidget"
         minSdkVersion 21
-        versionCode 7
-        versionName "2.3"
+        versionCode 8
+        versionName "2.3 Hotfix 1"
         targetSdkVersion 30
     }
     buildTypes {

diff --git a/app/src/main/java/pakutoma/iijmiocouponwidget/utility/CouponAPI.kt b/app/src/main/java/pakutoma/iijmiocouponwidget/utility/CouponAPI.kt
@@ -96,6 +96,8 @@ class CouponAPI constructor(developerID: String, accessToken: String) {
                 -> convertNormalData(it)
                 "Eco Minimum", "Eco Standard", "Pay as you go"
                 -> convertEcoData(it)
+                null // TODO: remove null if api returns "giga plan"
+                -> convertNormalData(it)
                 else
                 -> throw UndefinedPlanException("Undefined plan name")
             }
@@ -104,7 +106,7 @@ class CouponAPI constructor(developerID: String, accessToken: String) {
 
     private fun convertNormalData(normalInfo: CouponInfoFromJson): PlanInfo {
         val serviceCode = normalInfo.hddServiceCode
-        val plan = normalInfo.plan
+        val plan = normalInfo.plan ?: "unknown plan"
         val lineInfoList = ArrayList<LineInfo>()
         lineInfoList.addAll(normalInfo.hdoInfo?.map {
             LineInfo(
@@ -133,7 +135,7 @@ class CouponAPI constructor(developerID: String, accessToken: String) {
 
     private fun convertEcoData(ecoInfo: CouponInfoFromJson): PlanInfo {
         val serviceCode = ecoInfo.hddServiceCode
-        val plan = ecoInfo.plan
+        val plan = ecoInfo.plan ?: "unknown plan"
         val remains = ecoInfo.remains!!
         val lineInfoList = ArrayList<LineInfo>()
         lineInfoList.addAll(ecoInfo.hduInfo?.map {

diff --git a/app/src/main/java/pakutoma/iijmiocouponwidget/utility/CouponDataJsonClasses.kt b/app/src/main/java/pakutoma/iijmiocouponwidget/utility/CouponDataJsonClasses.kt
@@ -12,7 +12,7 @@ data class CouponDataFromJson(
 
 data class CouponInfoFromJson(
         val hddServiceCode: String,
-        val plan: String,
+        val plan: String?,
         val hdoInfo: List<HdoInfoFromJson>?,
         val hduInfo: List<HduInfoFromJson>?,
         val coupon: List<CouponFromJson>?,

diff --git a/app/src/test/java/pakutoma/iijmiocouponwidget/utility/CouponAPITest.kt b/app/src/test/java/pakutoma/iijmiocouponwidget/utility/CouponAPITest.kt
@@ -9,7 +9,7 @@ import org.junit.Assert.*
  * Created by PAKUTOMA on 2018/02/21.
  */
 class CouponAPITest {
-    private val accessToken = "HfXcx3zYSrG3ukkQtZjsQATkqX191aw1553251721"
+    private val accessToken = "fGVZ6pBQwQ8lEXiReGX26tIh2DEtaVy1619862654"
     private val developerID = "IilCI1xrAgqKrXV9Zt4"
     @Test
     fun fetchCouponInfo() {

diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.6.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Mar 21 15:51:22 JST 2019
+#Sun Oct 04 16:31:46 JST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip