kidshift/KidShift
3
0
Fork 0
Code Issues 9 Pull Requests Wiki Activity

非同期実行するように

Browse Source
This commit is contained in:
rca 2024-07-08 00:19:34 +09:00
parent bdb57f5412
commit 9f3f34ed72
2 changed files with 44 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/src/main/java/one/nem/kidshift/LoginActivity.java
View File

@ -61,26 +61,30 @@ public class LoginActivity extends AppCompatActivity {
String email = emailEditText.getText().toString(); // TODO: メールアドレスのバリデーション
String password = passwordEditText.getText().toString();
Call<ParentAuthResponse> call = kidShiftApiService.parentLogin(new ParentAuthRequest(email, password));
try {
Response<ParentAuthResponse> response = call.execute();
if (response.isSuccessful()) {
ParentAuthResponse parentAuthResponse = response.body();
if (parentAuthResponse == null || parentAuthResponse.getAccessToken() == null) {
CompletableFuture.runAsync(() -> {
Call<ParentAuthResponse> call = kidShiftApiService.parentLogin(new ParentAuthRequest(email, password));
try {
Response<ParentAuthResponse> response = call.execute();
if (response.isSuccessful()) {
ParentAuthResponse parentAuthResponse = response.body();
if (parentAuthResponse == null || parentAuthResponse.getAccessToken() == null) {
// エラー処理
logger.error("ParentAuthResponseがnullまたはAccessTokenがnullです");
return;
}
userSettings.getAppCommonSetting().setLoggedIn(true);
userSettings.getAppCommonSetting().setAccessToken(parentAuthResponse.getAccessToken());
} else {
logger.error("リクエストに失敗しました");
// エラー処理
logger.error("ParentAuthResponseがnullまたはAccessTokenがnullです");
return;
}
userSettings.getAppCommonSetting().setLoggedIn(true);
userSettings.getAppCommonSetting().setAccessToken(parentAuthResponse.getAccessToken());
} else {
logger.error("リクエストに失敗しました");
// エラー処理
} catch (Exception e) {
logger.error("リクエストに失敗しました: " + e.getMessage());
e.printStackTrace();
}
} catch (Exception e) {
logger.error("リクエストに失敗しました: " + e.getMessage());
e.printStackTrace();
}
}).thenRun(() -> {
startActivity(new Intent(this, MainActivity.class));
});
});
findViewById(R.id.intentRegisterButton).setOnClickListener(v -> {

40
app/src/main/java/one/nem/kidshift/RegisterActivity.java
View File

@ -10,6 +10,8 @@ import androidx.core.graphics.Insets;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
import java.util.concurrent.CompletableFuture;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
@ -58,26 +60,30 @@ public class RegisterActivity extends AppCompatActivity {
String email = emailEditText.getText().toString();
String password = passwordEditText.getText().toString();
Call<ParentAuthResponse> call = kidShiftApiService.parentRegister(new ParentAuthRequest(email, password));
try {
Response<ParentAuthResponse> response = call.execute();
if (response.isSuccessful()) {
ParentAuthResponse parentAuthResponse = response.body();
if (parentAuthResponse == null || parentAuthResponse.getAccessToken() == null) {
CompletableFuture.runAsync(() -> {
Call<ParentAuthResponse> call = kidShiftApiService.parentRegister(new ParentAuthRequest(email, password));
try {
Response<ParentAuthResponse> response = call.execute();
if (response.isSuccessful()) {
ParentAuthResponse parentAuthResponse = response.body();
if (parentAuthResponse == null || parentAuthResponse.getAccessToken() == null) {
// エラー処理
logger.error("ParentAuthResponseがnullまたはAccessTokenがnullです");
return;
}
userSettings.getAppCommonSetting().setLoggedIn(true);
userSettings.getAppCommonSetting().setAccessToken(parentAuthResponse.getAccessToken());
} else {
logger.error("リクエストに失敗しました");
// エラー処理
logger.error("ParentAuthResponseがnullまたはAccessTokenがnullです");
return;
}
userSettings.getAppCommonSetting().setLoggedIn(true);
userSettings.getAppCommonSetting().setAccessToken(parentAuthResponse.getAccessToken());
} else {
logger.error("リクエストに失敗しました");
// エラー処理
} catch (Exception e) {
logger.error("リクエストに失敗しました: " + e.getMessage());
e.printStackTrace();
}
} catch (Exception e) {
logger.error("リクエストに失敗しました: " + e.getMessage());
e.printStackTrace();
}
}).thenRun(() -> {
startActivity(new Intent(this, MainActivity.class));
});
});
findViewById(R.id.intentLoginButton).setOnClickListener(v -> {