From 0cecffcb411db0af9cd1ee6188d735b630d70d88 Mon Sep 17 00:00:00 2001 From: "jeremy.ducourthial" Date: Wed, 28 Feb 2024 19:59:19 +0100 Subject: [PATCH] =?UTF-8?q?fix=20:=20bug=20lors=20de=20la=20cr=C3=A9ation?= =?UTF-8?q?=20d'un=20lobby?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/mathseduc/ConnexionPlayerActivity.kt | 2 +- .../java/com/example/mathseduc/CreateLobbyActivity.kt | 8 ++++---- .../src/main/java/com/example/mathseduc/MultiActivity.kt | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Android/app/src/main/java/com/example/mathseduc/ConnexionPlayerActivity.kt b/Android/app/src/main/java/com/example/mathseduc/ConnexionPlayerActivity.kt index f6a4d91..9348695 100644 --- a/Android/app/src/main/java/com/example/mathseduc/ConnexionPlayerActivity.kt +++ b/Android/app/src/main/java/com/example/mathseduc/ConnexionPlayerActivity.kt @@ -30,7 +30,7 @@ class ConnexionPlayerActivity : AppCompatActivity() { MainActivity.idPlayerConnected = isAuthenticated - Toast.makeText(this, "Connexion réussi, bienvenue $nickname !!", Toast.LENGTH_SHORT).show() + Toast.makeText(this, "Connexion réussi, bienvenue $nickname !", Toast.LENGTH_SHORT).show() } else { // Show an error toast Toast.makeText(this, "Connexion échoué. Veuillez réessayer.", Toast.LENGTH_SHORT).show() diff --git a/Android/app/src/main/java/com/example/mathseduc/CreateLobbyActivity.kt b/Android/app/src/main/java/com/example/mathseduc/CreateLobbyActivity.kt index 9aa09f1..8980582 100644 --- a/Android/app/src/main/java/com/example/mathseduc/CreateLobbyActivity.kt +++ b/Android/app/src/main/java/com/example/mathseduc/CreateLobbyActivity.kt @@ -61,16 +61,16 @@ class CreateLobbyActivity : AppCompatActivity() { // Vérifier si la création du lobby a réussi if (idLobbyCreatedSuccessfully != -1) { - val intent = Intent(this, ServerDetailsActivity::class.java) - intent.putExtra("serverName", lobbyName) - intent.putExtra("lobbyId", idLobbyCreatedSuccessfully.toString()) - val formDataBuilder = MultipartBody.Builder().setType(MultipartBody.FORM) formDataBuilder.addFormDataPart("idplayer", MainActivity.idPlayerConnected.toString()) formDataBuilder.addFormDataPart("idlobby", idLobbyCreatedSuccessfully.toString()) formDataBuilder.addFormDataPart("playertime", "0") ControllerUtiliser.createUtiliserByIdLobby(formDataBuilder) + + val intent = Intent(this, ServerDetailsActivity::class.java) + intent.putExtra("serverName", lobbyName) + intent.putExtra("lobbyId", idLobbyCreatedSuccessfully) startActivity(intent) } else { Toast.makeText(this, "Échec de la création du lobby. Veuillez réessayer.", Toast.LENGTH_SHORT).show() diff --git a/Android/app/src/main/java/com/example/mathseduc/MultiActivity.kt b/Android/app/src/main/java/com/example/mathseduc/MultiActivity.kt index 21a9dec..3d68480 100644 --- a/Android/app/src/main/java/com/example/mathseduc/MultiActivity.kt +++ b/Android/app/src/main/java/com/example/mathseduc/MultiActivity.kt @@ -35,16 +35,16 @@ class MultiActivity : AppCompatActivity() { listView.adapter = adapter listView.setOnItemClickListener { _, _, position, _ -> - val intent = Intent(this, ServerDetailsActivity::class.java) - intent.putExtra("serverName", serverList[position].name) - intent.putExtra("lobbyId", serverList[position].id) - val formDataBuilder = MultipartBody.Builder().setType(MultipartBody.FORM) formDataBuilder.addFormDataPart("idplayer", MainActivity.idPlayerConnected.toString()) formDataBuilder.addFormDataPart("idlobby", serverList[position].id.toString()) formDataBuilder.addFormDataPart("playertime", "0") ControllerUtiliser.createUtiliserByIdLobby(formDataBuilder) + + val intent = Intent(this, ServerDetailsActivity::class.java) + intent.putExtra("serverName", serverList[position].name) + intent.putExtra("lobbyId", serverList[position].id) startActivity(intent) } } else {