diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/gateway/TransactionHistoryV2Gateway.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/gateway/TransactionHistoryV2Gateway.java index f32bb03e..7d430982 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/gateway/TransactionHistoryV2Gateway.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/gateway/TransactionHistoryV2Gateway.java @@ -68,8 +68,8 @@ public class TransactionHistoryV2Gateway extends PrivilegedGateway implements Tr @Override public Observable getTransactionHistory(String auth,String userId,String startDate,String endDate) { JsonObject jsonObject=new JsonObject(); - jsonObject.addProperty("StartDate",startDate); - jsonObject.addProperty("EndDate",endDate); + jsonObject.addProperty("FromDate",startDate); + jsonObject.addProperty("ToDate",endDate); return HttpClientV2.getInstance().getTransactionHistoryV2(auth,userId,jsonObject); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/presenter/TransactionHistoryV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/presenter/TransactionHistoryV2Presenter.java index 34132c15..369927ed 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/presenter/TransactionHistoryV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/presenter/TransactionHistoryV2Presenter.java @@ -18,18 +18,19 @@ import io.reactivex.disposables.CompositeDisposable; import io.reactivex.disposables.Disposable; import io.reactivex.schedulers.Schedulers; import io.reactivex.subjects.AsyncSubject; +import io.reactivex.subjects.BehaviorSubject; public class TransactionHistoryV2Presenter extends BasePresenter implements TransactionHistoryV2PresenterInterface,TransactionHistoryV2InteractorInterface { private final TransactionHistoryV2ContractInterface view; private final TransactionHistoryV2GatewayInterface gateway; - private final AsyncSubject transactionHistorySubject; + private final BehaviorSubject transactionHistorySubject; public TransactionHistoryV2Presenter(TransactionHistoryV2ContractInterface view) { this.view=view; this.gateway=new TransactionHistoryV2Gateway(this); - this.transactionHistorySubject= AsyncSubject.create(); + this.transactionHistorySubject= BehaviorSubject.create(); } @@ -66,17 +67,12 @@ public class TransactionHistoryV2Presenter extends BasePresenter implements Tran }) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(transactionHistorySubject); + .subscribe(new TransactionHistoryObserver()); } @Override public void getTransactionHistoryDummy(String startDate, String endDate) { - List allHistory=new ArrayList<>(); - allHistory.add(new TransactionHistoryItemModel("dummy","dummy","dummy","dummy","dummy","dummy","dummy","dummy","dummy","dummy","dummy")); - Log.d("TransactionSubject","Has observer"+transactionHistorySubject.hasObservers()); - Log.d("TransactionSubject","Has values"+transactionHistorySubject.hasValue()); - transactionHistorySubject.onNext(new TransactionHistory(allHistory,allHistory,allHistory)); } @Override @@ -85,6 +81,27 @@ public class TransactionHistoryV2Presenter extends BasePresenter implements Tran } + public class TransactionHistoryObserver extends GenericApiObserverResponse + { + + @Override + protected void onSuccess(TransactionHistory transactionHistory) { + if(transactionHistorySubject!=null) + transactionHistorySubject.onNext(transactionHistory); + } + + @Override + public void onFailed(String message) { + transactionHistorySubject.onError(new Throwable(message)); + } + + @Override + protected void onConnectionNotEstablished(String message) { + transactionHistorySubject.onError(new Throwable(message)); + } + } + + public class TransactionHistory { List allHistory; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionFragmentV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionFragmentV2.java index 0574e5a1..4e8a4651 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionFragmentV2.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionFragmentV2.java @@ -181,8 +181,13 @@ public class TransactionFragmentV2 extends BaseFragment implements View.OnClickL @Override protected void onSuccess(List transactionHistoryItemModels) { - data=transactionHistoryItemModels; - transactionHistoryRVAdapter.setData(transactionHistoryItemModels); + if(transactionHistoryItemModels==null||transactionHistoryItemModels.size()<1) + showTransactionNotFoundView(true); + else { + showTransactionNotFoundView(false); + data = transactionHistoryItemModels; + transactionHistoryRVAdapter.setData(transactionHistoryItemModels); + } } @Override