From 5e3e06210bc6e2eac9b031ff16fa32f193a5e7f9 Mon Sep 17 00:00:00 2001 From: sitou Date: Wed, 25 Dec 2024 09:59:04 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8E=A5=E7=B6=9A=E5=85=88=E3=81=8C?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=B8=88=E3=81=BF=E3=82=B5=E3=83=BC=E3=83=90?= =?UTF-8?q?=E3=81=A8=E9=87=8D=E8=A4=87=E3=81=99=E3=82=8B=E3=81=A8=E3=81=8D?= =?UTF-8?q?=E3=80=81=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=AB=E3=81=9B=E3=81=9A?= =?UTF-8?q?=E6=8E=A5=E7=B6=9A=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agileworks/view/ui/login/LoginFragment.kt | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt index 7a3ada6f..b35a193a 100644 --- a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt +++ b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt @@ -179,7 +179,7 @@ class LoginFragment: Fragment() { binding.viewmodel?.setServerContext() if (checkServer()) { - loginAlert(R.string.login_server_check_alert) + whenAuthorizationSucceeds() } else { try { startAuthorization() @@ -224,7 +224,7 @@ class LoginFragment: Fragment() { // Register the launcher and result handler private val barcodeLauncher = registerForActivityResult( - ScanContract() + ScanContract() ) { result: ScanIntentResult -> if (result.contents == null) { Toast.makeText(this.requireContext(), R.string.login_qr_read_cancel, Toast.LENGTH_LONG).show() @@ -238,9 +238,9 @@ class LoginFragment: Fragment() { binding.viewmodel?.loadServerContext(arrayUrl[1]) } Toast.makeText( - this.requireContext(), - resources.getString(R.string.login_qr_read_scanned, it), - Toast.LENGTH_LONG + this.requireContext(), + resources.getString(R.string.login_qr_read_scanned, it), + Toast.LENGTH_LONG ).show() } ?: run { Toast.makeText(this.requireContext(), R.string.login_qr_read_error, Toast.LENGTH_LONG).show() @@ -254,6 +254,8 @@ class LoginFragment: Fragment() { for (server in serverList) { val serverName = LoginRepository(server).loadServerUrl() if (serverName == serverHost) { + ServerRepository().setServer(server) + ServerRepository().changeServerList(server) return true } } @@ -555,9 +557,9 @@ class LoginFragment: Fragment() { // セッションID保存 var preferences = "cookie" + ServerRepository().loadServer().toString() AwApp.instance.applicationContext.getSharedPreferences(preferences, Context.MODE_PRIVATE) - .edit() - .putString("sessionId", sessionId) - .apply() + .edit() + .putString("sessionId", sessionId) + .apply() } //トークン更新に成功するとメイン画面へ whenAuthorizationSucceeds() @@ -578,11 +580,11 @@ class LoginFragment: Fragment() { companion object { // ログイン時に利用するコントロール用 View の ID 群 val LOGIN_CONTROL_IDS = listOf( - R.id.serverUrl, - R.id.server_context, - R.id.loginButton, - R.id.clientCertChoiceButton, - R.id.qrReadButton + R.id.serverUrl, + R.id.server_context, + R.id.loginButton, + R.id.clientCertChoiceButton, + R.id.qrReadButton ) private val SCHEME_PATTERN = Regex("^https?://") -- GitLab From 8ffd537e4f4feab7b892524466993dfdedafb221 Mon Sep 17 00:00:00 2001 From: sitou Date: Wed, 25 Dec 2024 14:41:57 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E3=83=AC=E3=82=A4=E3=82=A2=E3=82=A6?= =?UTF-8?q?=E3=83=88=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agileworks/view/ui/login/LoginFragment.kt | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt index b35a193a..4b048dba 100644 --- a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt +++ b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt @@ -224,7 +224,7 @@ class LoginFragment: Fragment() { // Register the launcher and result handler private val barcodeLauncher = registerForActivityResult( - ScanContract() + ScanContract() ) { result: ScanIntentResult -> if (result.contents == null) { Toast.makeText(this.requireContext(), R.string.login_qr_read_cancel, Toast.LENGTH_LONG).show() @@ -238,9 +238,9 @@ class LoginFragment: Fragment() { binding.viewmodel?.loadServerContext(arrayUrl[1]) } Toast.makeText( - this.requireContext(), - resources.getString(R.string.login_qr_read_scanned, it), - Toast.LENGTH_LONG + this.requireContext(), + resources.getString(R.string.login_qr_read_scanned, it), + Toast.LENGTH_LONG ).show() } ?: run { Toast.makeText(this.requireContext(), R.string.login_qr_read_error, Toast.LENGTH_LONG).show() @@ -557,9 +557,9 @@ class LoginFragment: Fragment() { // セッションID保存 var preferences = "cookie" + ServerRepository().loadServer().toString() AwApp.instance.applicationContext.getSharedPreferences(preferences, Context.MODE_PRIVATE) - .edit() - .putString("sessionId", sessionId) - .apply() + .edit() + .putString("sessionId", sessionId) + .apply() } //トークン更新に成功するとメイン画面へ whenAuthorizationSucceeds() @@ -580,11 +580,11 @@ class LoginFragment: Fragment() { companion object { // ログイン時に利用するコントロール用 View の ID 群 val LOGIN_CONTROL_IDS = listOf( - R.id.serverUrl, - R.id.server_context, - R.id.loginButton, - R.id.clientCertChoiceButton, - R.id.qrReadButton + R.id.serverUrl, + R.id.server_context, + R.id.loginButton, + R.id.clientCertChoiceButton, + R.id.qrReadButton ) private val SCHEME_PATTERN = Regex("^https?://") -- GitLab