diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/LoginResponseJson.java b/app/src/main/java/org/ntlab/acanthus_client/entities/LoginResponseJson.java index 078e70f..2270d30 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/entities/LoginResponseJson.java +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/LoginResponseJson.java @@ -6,6 +6,9 @@ private Integer uid; private String token; + public LoginResponseJson() { + } + //----------------------------------------------------------------- // getter public Integer getUid() { diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenActivity.java index e3afb6c..f78cae3 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenActivity.java @@ -20,15 +20,13 @@ //----------------------------------------------------------------- private LoginScreenViewModel loginScreenViewModel; - private ActivityLoginScreenBinding binding; - //----------------------------------------------------------------- // ログインボタン押下時の処理 public void onClickLogin(View view) { Acanthus acanthus = (Acanthus) getApplication(); loginScreenViewModel.issueLoginToken( - acanthus, binding.editTextTextLoginEmail, binding.editTextTextLoginPassword); + acanthus, findViewById(R.id.editTextTextLoginEmail), findViewById(R.id.editTextTextLoginPassword)); } //----------------------------------------------------------------- @@ -51,8 +49,6 @@ // 初期化 private void init() { setContentView(R.layout.activity_login_screen); - binding = ActivityLoginScreenBinding.inflate(getLayoutInflater()); - startObserve(); } diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/InvitedConnectionModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/InvitedConnectionModel.java index 816d368..a3832fb 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/InvitedConnectionModel.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/InvitedConnectionModel.java @@ -43,7 +43,6 @@ .addConverterFactory(ScalarsConverterFactory.create()) .addConverterFactory(JacksonConverterFactory.create()) .build(); - checkInvited(); } //----------------------------------------------------------------- @@ -54,7 +53,7 @@ Integer uid = acanthus.getPreferenceUid(); Integer aid = acanthus.getAid(); - Call call = invitedRest.checkAccountInvited(2, aid); + Call call = invitedRest.checkAccountInvited(uid, aid); call.enqueue(new Callback() { @Override diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageViewModel.java index c457bd6..d6c387f 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageViewModel.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageViewModel.java @@ -38,6 +38,7 @@ // init public void init(Acanthus acanthus) { myPageModelContainer.init(acanthus); + myPageModelContainer.getInvitedConnectionModel().checkInvited(); mText.setValue(myPageModelContainer.getInvitedConnectionModel().getSuccessMessage()); } //-----------------------------------------------------------------