fixed sending multiple transaction if there has reversal
This commit is contained in:
parent
01043dbbca
commit
890b1c55a8
@ -6,6 +6,7 @@ import android.view.View;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.lifecycle.LiveData;
|
||||
import androidx.lifecycle.Observer;
|
||||
import androidx.navigation.NavController;
|
||||
import androidx.navigation.NavDestination;
|
||||
@ -129,43 +130,52 @@ public class ProcessingFragment extends DataBindingFragment {
|
||||
}
|
||||
|
||||
private void checkReversal() {
|
||||
sharedViewModel.getLastReversalTransaction().observe(getViewLifecycleOwner(), new Observer<PayDetail>() {
|
||||
@Override
|
||||
public void onChanged(PayDetail payDetail) {
|
||||
if(payDetail != null) {
|
||||
TradeData tradeData = new TradeData();
|
||||
tradeData.setPayDetail(payDetail);
|
||||
LogUtil.d(TAG,"Sending Reversal!");
|
||||
sharedViewModel.loadingMsg(getResourceString(R.string.txt_sending_reversal));
|
||||
observeOnce(sharedViewModel.getLastReversalTransaction(), payDetail -> {
|
||||
if (payDetail != null) {
|
||||
TradeData tradeData = new TradeData();
|
||||
tradeData.setPayDetail(payDetail);
|
||||
LogUtil.d(TAG, "Sending Reversal!");
|
||||
sharedViewModel.loadingMsg(getResourceString(R.string.txt_sending_reversal));
|
||||
|
||||
ReversalAction.getInstance().setData(tradeData).enqueue().startReversal(new ReversalListener() {
|
||||
@Override
|
||||
public void onSuccessReversal() {
|
||||
LogUtil.d(TAG,"Reversal Success!");
|
||||
payDetail.setIsNeedReversal(false);
|
||||
sharedViewModel.updatePayDetail(payDetail);
|
||||
startTransactionProcess();
|
||||
}
|
||||
ReversalAction.getInstance().setData(tradeData).enqueue().startReversal(new ReversalListener() {
|
||||
@Override
|
||||
public void onSuccessReversal() {
|
||||
LogUtil.d(TAG, "Reversal Success!");
|
||||
payDetail.setIsNeedReversal(false);
|
||||
sharedViewModel.updatePayDetail(payDetail);
|
||||
delayFunctionCall(()->startTransactionProcess());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNetworkFail(String msg) {
|
||||
LogUtil.d(TAG,"Reversal Network Fail!"+msg);
|
||||
startTransactionProcess();
|
||||
}
|
||||
@Override
|
||||
public void onNetworkFail(String msg) {
|
||||
LogUtil.d(TAG, "Reversal Network Fail!" + msg);
|
||||
startTransactionProcess();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFailReversal(String msg) {
|
||||
LogUtil.d(TAG,"Reversal Fail!"+msg);
|
||||
startTransactionProcess();
|
||||
}
|
||||
});
|
||||
} else {
|
||||
startTransactionProcess();
|
||||
}
|
||||
@Override
|
||||
public void onFailReversal(String msg) {
|
||||
LogUtil.d(TAG, "Reversal Fail!" + msg);
|
||||
startTransactionProcess();
|
||||
}
|
||||
});
|
||||
} else {
|
||||
LogUtil.d(TAG,"No reversal found!");
|
||||
startTransactionProcess();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private <T> void observeOnce(LiveData<T> liveData, Observer<T> observer) {
|
||||
liveData.observe(getViewLifecycleOwner(), new Observer<T>() {
|
||||
@Override
|
||||
public void onChanged(T t) {
|
||||
liveData.removeObserver(this);
|
||||
observer.onChanged(t);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
private boolean isEmvTrans() {
|
||||
return sharedViewModel.isEmv.getValue() != null && sharedViewModel.isEmv.getValue();
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user