From ac3661e24af7b5249f42e5a3116167d0fc800596 Mon Sep 17 00:00:00 2001 From: PatelVatsalB21 Date: Thu, 25 Mar 2021 23:24:27 +0530 Subject: [PATCH] fix 313: Network check added to Create Customer and Group activities. --- .../CreateCustomerActivity.java | 23 +++++++++++-------- .../groups/creategroup/CreateGroupActivity.kt | 15 ++++++++---- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/customeractivity/CreateCustomerActivity.java b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/customeractivity/CreateCustomerActivity.java index 27210085..234c2b10 100644 --- a/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/customeractivity/CreateCustomerActivity.java +++ b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/customeractivity/CreateCustomerActivity.java @@ -20,6 +20,7 @@ import org.apache.fineract.ui.online.customers.createcustomer.OnNavigationBarListener; import org.apache.fineract.ui.online.customers.customerdetails.CustomerDetailsActivity; import org.apache.fineract.utils.ConstantKeys; +import org.apache.fineract.utils.NetworkUtil; import java.util.List; @@ -103,15 +104,19 @@ protected void onRestoreInstanceState(Bundle savedInstanceState) { @Override public void onCompleted(View completeButton) { - stepperLayout.setNextButtonEnabled(false); - customer.setType(Customer.Type.PERSON.name()); - switch (customerAction) { - case CREATE: - createCustomerPresenter.createCustomer(customer); - break; - case EDIT: - createCustomerPresenter.updateCustomer(customerIdentifier, customer); - break; + if (NetworkUtil.isConnected(CreateCustomerActivity.this)) { + stepperLayout.setNextButtonEnabled(false); + customer.setType(Customer.Type.PERSON.name()); + switch (customerAction) { + case CREATE: + createCustomerPresenter.createCustomer(customer); + break; + case EDIT: + createCustomerPresenter.updateCustomer(customerIdentifier, customer); + break; + } + } else { + Toaster.show(completeButton, getString(R.string.no_internet_connection)); } } diff --git a/app/src/main/java/org/apache/fineract/ui/online/groups/creategroup/CreateGroupActivity.kt b/app/src/main/java/org/apache/fineract/ui/online/groups/creategroup/CreateGroupActivity.kt index 00e5a8a7..37326ccd 100644 --- a/app/src/main/java/org/apache/fineract/ui/online/groups/creategroup/CreateGroupActivity.kt +++ b/app/src/main/java/org/apache/fineract/ui/online/groups/creategroup/CreateGroupActivity.kt @@ -15,10 +15,11 @@ import org.apache.fineract.data.models.customer.Address import org.apache.fineract.ui.base.FineractBaseActivity import org.apache.fineract.ui.base.Toaster import org.apache.fineract.ui.online.groups.GroupAction -import org.apache.fineract.ui.online.groups.grouplist.GroupViewModelFactory import org.apache.fineract.ui.online.groups.grouplist.GroupViewModel +import org.apache.fineract.ui.online.groups.grouplist.GroupViewModelFactory import org.apache.fineract.utils.Constants import org.apache.fineract.utils.DateUtils +import org.apache.fineract.utils.NetworkUtil import javax.inject.Inject /* @@ -96,11 +97,15 @@ class CreateGroupActivity : FineractBaseActivity(), StepperLayout.StepperListene } override fun onCompleted(completeButton: View?) { - when (groupAction) { - GroupAction.EDIT -> group.identifier?.let { - viewModel.updateGroup(it, group) + if (NetworkUtil.isConnected(this)) { + when (groupAction) { + GroupAction.EDIT -> group.identifier?.let { + viewModel.updateGroup(it, group) + } + GroupAction.CREATE -> viewModel.createGroup(group) } - GroupAction.CREATE -> viewModel.createGroup(group) + } else { + Toaster.show(completeButton, getString(R.string.no_internet_connection)) } }