From a4b5472fc87a54ddc42538b9f36f481fe22580ab Mon Sep 17 00:00:00 2001 From: Nezumi <123229563+Nez27@users.noreply.github.com> Date: Tue, 21 Mar 2023 09:30:00 +0700 Subject: [PATCH] Fix bug change default address --- .../foodify/Activity/AddressManagerActivity.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/capstone/foodify/Activity/AddressManagerActivity.java b/app/src/main/java/com/capstone/foodify/Activity/AddressManagerActivity.java index 59e7893..3ece135 100644 --- a/app/src/main/java/com/capstone/foodify/Activity/AddressManagerActivity.java +++ b/app/src/main/java/com/capstone/foodify/Activity/AddressManagerActivity.java @@ -418,16 +418,24 @@ public class AddressManagerActivity extends AppCompatActivity { customViewDialog.dismiss(); } } else { - //If this is a edit form + //If this is a edit address form if(validData(oldAddress.getAddress(), oldAddress.getWard(), oldAddress.getDistrict())){ + //Get value checkbox set default address + boolean isChecked = default_address_checkbox.isChecked(); + + //If this address is default address, set isChecked to true + if(oldAddress.getId() == Common.CURRENT_USER.getDefaultAddress()){ + isChecked = true; + } + //Change information address oldAddress.setAddress(address); oldAddress.setWard(ward); oldAddress.setDistrict(district); //Call api to change address - editAddress(Common.CURRENT_USER.getId(), oldAddress, oldAddress.getId(), default_address_checkbox.isChecked()); + editAddress(Common.CURRENT_USER.getId(), oldAddress, oldAddress.getId(), isChecked); } customViewDialog.dismiss();