IME-LONDON
/
Android_London
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Error fixed

master
preyearegmi 6 years ago
parent
d3dc35ddba
commit
ce6c5f86f1
3 changed files with 85 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      .idea/caches/build_file_checksums.ser
  2. 45
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java
  3. 45
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeSendMoneyFragment.java

BIN
.idea/caches/build_file_checksums.ser
View File

45
app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java
View File

@ -396,19 +396,64 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
} else } else
showPopUpMessage(exchangeCalculationApiResponse.getMsg(), CustomAlertDialog.AlertType.FAILED, null); showPopUpMessage(exchangeCalculationApiResponse.getMsg(), CustomAlertDialog.AlertType.FAILED, null);
} }
else
{
scheduleTaskLater(()->{
showProgressBar(false, "");
if (exchangeCalculationApiResponse.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {
ExchangeCalculationModel data = exchangeCalculationApiResponse.getData();
selectedTransferFeeAmount = data.getScCharge();
selectedExRate = data.getExRateDisplay();
selectedExRateWithoutTrunc = data.getExRate();
selectedRecipientAmount = data.getpAmt();
selectedSendAmount = data.getCollAmt();
selectedsendingCurrency = data.getCollCurr();
selectedExRateId = data.getExrateId();
selectedTransferAmount=data.getsAmt();
String transferDisplay = " - " + Utils.formatCurrency(selectedTransferFeeAmount) + " " + selectedsendingCurrency + " (Transfer Fee Included)";
String exRateDisplay = " " + selectedExRate + " (Current Exchange Rate)";
showTransferfeeAndExRate(true, transferDisplay, exRateDisplay);
showSendAndRecieveAmount(selectedSendAmount, selectedRecipientAmount);
updateButtonToCalculate(false);
} else
showPopUpMessage(exchangeCalculationApiResponse.getMsg(), CustomAlertDialog.AlertType.FAILED, null);
});
}
} }
@Override @Override
public void onFailed(String message) { public void onFailed(String message) {
if(isUIReady()) {
showProgressBar(false, "");
showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, null);
}
else
{
scheduleTaskLater(()->{
showProgressBar(false, ""); showProgressBar(false, "");
showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, null); showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, null);
});
}
} }
@Override @Override
protected void onConnectionNotEstablished(String message) { protected void onConnectionNotEstablished(String message) {
if(isUIReady()) {
showProgressBar(false, ""); showProgressBar(false, "");
showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET, null); showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET, null);
} }
else
{
scheduleTaskLater(()->{
showProgressBar(false, "");
showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET, null);
});
}
}
} }
public class AmountDetailRelatedDataObserver extends GenericApiObserverResponse<AmountDetailRelatedDataModel> { public class AmountDetailRelatedDataObserver extends GenericApiObserverResponse<AmountDetailRelatedDataModel> {

45
app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeSendMoneyFragment.java
View File

@ -24,6 +24,7 @@ import android.widget.TextView;
import com.gmeremit.online.gmeremittance_native.R; import com.gmeremit.online.gmeremittance_native.R;
import com.gmeremit.online.gmeremittance_native.base.BaseFragment; import com.gmeremit.online.gmeremittance_native.base.BaseFragment;
import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog;
import com.gmeremit.online.gmeremittance_native.exchange_rate.view.SelectedRedBorderDecoration; import com.gmeremit.online.gmeremittance_native.exchange_rate.view.SelectedRedBorderDecoration;
import com.gmeremit.online.gmeremittance_native.sendmoneyV2.adapter.SendMoneyPayoutModeRvAdapter; import com.gmeremit.online.gmeremittance_native.sendmoneyV2.adapter.SendMoneyPayoutModeRvAdapter;
import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.payoutmode.AccountValidationApiResponse; import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.payoutmode.AccountValidationApiResponse;
@ -413,15 +414,20 @@ public class PayoutModeSendMoneyFragment extends BaseFragment implements SendMon
if (payoutModeApiResponse.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) { if (payoutModeApiResponse.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {
apiResponseData = payoutModeApiResponse.getData(); apiResponseData = payoutModeApiResponse.getData();
setDataToPaymentMode(payoutModeApiResponse.getData().getPayoutMode()); setDataToPaymentMode(payoutModeApiResponse.getData().getPayoutMode());
} else
showToastMessage(payoutModeApiResponse.getMsg());
} else {
// showToastMessage(payoutModeApiResponse.getMsg());
showPopUpMessage(payoutModeApiResponse.getMsg(), CustomAlertDialog.AlertType.FAILED,null);
}
} else { } else {
scheduleTaskLater(() -> { scheduleTaskLater(() -> {
showProgressBar(false, ""); showProgressBar(false, "");
if (payoutModeApiResponse.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) if (payoutModeApiResponse.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2))
setDataToPaymentMode(payoutModeApiResponse.getData().getPayoutMode()); setDataToPaymentMode(payoutModeApiResponse.getData().getPayoutMode());
else else
showToastMessage(payoutModeApiResponse.getMsg());
{
// showToastMessage(payoutModeApiResponse.getMsg());
showPopUpMessage(payoutModeApiResponse.getMsg(), CustomAlertDialog.AlertType.FAILED,null);
}
}); });
} }
} }
@ -430,9 +436,13 @@ public class PayoutModeSendMoneyFragment extends BaseFragment implements SendMon
public void onFailed(String message) { public void onFailed(String message) {
if (isUIReady()) { if (isUIReady()) {
showProgressBar(false, ""); showProgressBar(false, "");
showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED,null);
} else { } else {
scheduleTaskLater(() -> { scheduleTaskLater(() -> {
showProgressBar(false, ""); showProgressBar(false, "");
showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED,null);
}); });
} }
} }
@ -440,10 +450,14 @@ public class PayoutModeSendMoneyFragment extends BaseFragment implements SendMon
@Override @Override
protected void onConnectionNotEstablished(String message) { protected void onConnectionNotEstablished(String message) {
if (isUIReady()) { if (isUIReady()) {
showProgressBar(false, "");
showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET,null);
} else { } else {
scheduleTaskLater(() -> { scheduleTaskLater(() -> {
showProgressBar(false, ""); showProgressBar(false, "");
showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET,null);
}); });
} }
} }
@ -459,13 +473,21 @@ public class PayoutModeSendMoneyFragment extends BaseFragment implements SendMon
if (accountValidationApiResponse.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) if (accountValidationApiResponse.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2))
((SendMoneyActionListener) getActivity()).showAmountDetailPage(); ((SendMoneyActionListener) getActivity()).showAmountDetailPage();
else else
showToastMessage(accountValidationApiResponse.getMsg());
{
// showToastMessage(accountValidationApiResponse.getMsg());
showPopUpMessage(accountValidationApiResponse.getMsg(), CustomAlertDialog.AlertType.FAILED,null);
}
} else { } else {
scheduleTaskLater(() -> { scheduleTaskLater(() -> {
if (accountValidationApiResponse.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) if (accountValidationApiResponse.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2))
((SendMoneyActionListener) getActivity()).showAmountDetailPage(); ((SendMoneyActionListener) getActivity()).showAmountDetailPage();
else else
showToastMessage(accountValidationApiResponse.getMsg());
{
// showToastMessage(accountValidationApiResponse.getMsg());
showPopUpMessage(accountValidationApiResponse.getMsg(), CustomAlertDialog.AlertType.FAILED,null);
}
}); });
} }
} }
@ -473,11 +495,14 @@ public class PayoutModeSendMoneyFragment extends BaseFragment implements SendMon
@Override @Override
public void onFailed(String message) { public void onFailed(String message) {
if (isUIReady()) { if (isUIReady()) {
showToastMessage(message);
// showToastMessage(message);
showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED,null);
} else { } else {
scheduleTaskLater(() -> { scheduleTaskLater(() -> {
showToastMessage(message);
// showToastMessage(message);
showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED,null);
}); });
} }
} }
@ -485,10 +510,12 @@ public class PayoutModeSendMoneyFragment extends BaseFragment implements SendMon
@Override @Override
protected void onConnectionNotEstablished(String message) { protected void onConnectionNotEstablished(String message) {
if (isUIReady()) { if (isUIReady()) {
showToastMessage(message);
// showToastMessage(message);
showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET,null);
} else { } else {
scheduleTaskLater(() -> { scheduleTaskLater(() -> {
showToastMessage(message);
// showToastMessage(message);
showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET,null);
}); });
} }
} }

Write Preview
Loading…
Cancel
Save