diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginQr.kt b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginQr.kt index 4104990eab8cc604adb465654e85bf87af75b579..846e256c1b5f2770bcee87d38c1f65990c741588 100644 --- a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginQr.kt +++ b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginQr.kt @@ -7,7 +7,8 @@ import com.squareup.moshi.Moshi @JsonClass(generateAdapter= true) data class Qr ( - @field:Json(name = "system_url") val url: String + @field:Json(name = "system_url") val system_url: String, + @field:Json(name = "mobile_system_url") val mobile_system_url: String ) object LoginQr { @@ -17,7 +18,11 @@ object LoginQr { .build().adapter(Qr::class.java) return try { val qr = adapter.fromJson(json) - qr?.url + if(qr?.mobile_system_url.isNullOrEmpty()) { + qr?.system_url + } else { + qr?.mobile_system_url + } } catch (e: Exception) { val m = Throwable().stackTrace[0] Log.e("Qr json parse: ", "${m}: ${e}")