diff --git a/app/src/main/java/com/example/tampopo_client/viewmodels/ChatViewModel.java b/app/src/main/java/com/example/tampopo_client/viewmodels/ChatViewModel.java index 8022d53..85a9391 100644 --- a/app/src/main/java/com/example/tampopo_client/viewmodels/ChatViewModel.java +++ b/app/src/main/java/com/example/tampopo_client/viewmodels/ChatViewModel.java @@ -124,8 +124,10 @@ try { Response response = call.execute(); if (response.isSuccessful() && response.body() != null) { + Log.d("OK","OK"); return response.body().getChatRoomId(); } else { + Log.d("Flase","Flase"); return null; } } catch (IOException e) { @@ -182,7 +184,7 @@ // 2. メッセージ送信 // =============================== public void sendMessage(String chatroomId, String senderId, String message, String token) { - Call call = chatroomResource.sendMessage(token, chatroomId, senderId, message); + Call call = chatroomResource.sendMessage(chatroomId, senderId, message, token); call.enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { diff --git a/app/src/main/java/com/example/tampopo_client/views/ChatActivity.java b/app/src/main/java/com/example/tampopo_client/views/ChatActivity.java index ee83d6a..890aaf2 100644 --- a/app/src/main/java/com/example/tampopo_client/views/ChatActivity.java +++ b/app/src/main/java/com/example/tampopo_client/views/ChatActivity.java @@ -125,6 +125,7 @@ //戻るボタン backButton.setOnClickListener(new OnClickListener() { //backButtonがクリックされたときの処理 public void onClick(View view) { //ボタンがクリックされたときに実行される処理本体 + chatViewModel.destroyChatroom(tampopo.getChatroomId(),tampopo.getUserId(),tampopo.getToken()); Intent intent = new Intent(ChatActivity.this, MainActivity.class); //ChatActivity から MainActivity に画面遷移 startActivity(intent); } diff --git a/app/src/main/java/com/example/tampopo_client/views/MainActivity.java b/app/src/main/java/com/example/tampopo_client/views/MainActivity.java index 9d7e2aa..cc87426 100644 --- a/app/src/main/java/com/example/tampopo_client/views/MainActivity.java +++ b/app/src/main/java/com/example/tampopo_client/views/MainActivity.java @@ -123,10 +123,12 @@ @Override public void onChanged(String chatRoomId) { tampopo.setChatroomId(chatRoomId); + chatViewModel.setChatRoomId(chatRoomId); } }); + MutableLiveData> friendsLiveData = activityViewModel.getFriendUserIdsLiveData(); friendsLiveData.observe(this, new Observer>() {