From 439efc221a73ab12b87326cf95e7d394403c2681 Mon Sep 17 00:00:00 2001 From: preyearegmi Date: Tue, 26 Mar 2019 17:09:52 +0900 Subject: [PATCH] Ready for publishing V_2.0.0 --- .idea/caches/build_file_checksums.ser | Bin 661 -> 661 bytes .idea/caches/gradle_models.ser | Bin 392673 -> 392921 bytes app/build.gradle | 3 ++- .../gateway/resend/ReSendMoneyV2Gateway.java | 4 +++- .../resend/ReSendMoneyV2Presenter.java | 10 +++++++++ .../ReSendMoneyV2PresenterInterface.java | 4 ++++ .../resendV2/view/ReSendMoneyV2Activity.java | 6 ++++++ .../presenter/SendMoneyV2Presenter.java | 10 +++++++++ .../SendMoneyV2PresenterInterface.java | 4 ++++ .../sendmoneyV2/view/SendMoneyV2Activity.java | 7 ++++++ .../presenter/SplashScreenPresenter.java | 2 +- .../splash_screen/view/SplashScreen.java | 2 +- .../TransactionPasswordPromptV2Gateway.java | 10 +++++++-- ...onPasswordPromptV2InteractorInterface.java | 2 +- .../TransactionPasswordPromptV2Presenter.java | 20 +++++++++++++++++- ...ionPasswordPromptV2PresenterInterface.java | 4 ++++ .../TransactionPasswordPromptActivity.java | 7 +++++- .../gmeremittance_native/utils/Utils.java | 2 ++ .../utils/https/API_URL.java | 4 ++-- .../utils/https/ApiEndpoints.java | 6 +++--- 20 files changed, 93 insertions(+), 14 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 3ca620dce80f13f05979667ae5b7597da1d1b342..32b9b40bd1ee2d664a6666078cc2cd98c6643a8a 100644 GIT binary patch delta 33 rcmV++0N($V1(gMmm;|`87}~L%=m8Ne@>SdcwGKike(U!!mWxMt_nZ#% delta 33 rcmV++0N($V1(gMmm;|%l38Ar^=m8Pl3f(cK*J>sYRQrBMzW#4``=$@8 diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser index 37906d7a0808fd95b09b2d3e9be15d85031f9fb4..c84ca11fe966db72560b68afea24055777437ef2 100644 GIT binary patch delta 4023 zcmc&%dsLOh7C$rJ-ba-8^Wfnipr&3C1r(IT3xt{)DVbg$nL<7hA7F%9+CjUTPZE!^ zOA}Eu9-$q@98*Kld{AikXkAny@Ugm?26}Df?ONWM?_gT3THU|yKfg0)&z`;aZ||8s z^ELj*bm2#n{h|{bjo)^$yxwW(;PTjK7jt2{2_CGxV&un0IQGizKD6aFba<^~-0LOd zm?#;?ms?@;^X?Zh7b5{V{TfMrA@Opk& zgLRP`T{!^s8D?I6Sv^ zxhG|Ig)o{~$GeHyzTm~d`kY|^o!Nvw(BaaDHMGeDbEF{;f0ziXI^N5rx&Ckh%zdv^ ziYMAas3-KC=Se~uS;pa0_hm~QOScd2y_S5#V2WJ2APk0s)w(l@&W1rHG*%|=qroNE zSyXg~G*9T1`_3*s2r)VyUg6-E8sB1MrP+5lH9Y~7q>&MckPQ7-rL3ajL^uS_rxHif z8|4@(^7})bJLFzJ9;=K@7MDgq8i&~YJ}pL$ty}FyDWhPTG*UGR`p~ulG#kCW%O>2d zrjXHa6yAC6+)(;U1$Gf0V<68RGVes()NN7O7ko3FPXkXHSI>tFIU2!W|NIS({CJ~K?{@My@V_?Fp|O(!H+hkgPZhOnhp_c2^AJ#po{ks-)`SmWGKz0gfl?6 z!i!m{Q|B_nyzDuKeztE}H@Z6m4zRVhEq>7?3yY#@CQOK8?ZvQdkj+^aTTqWky1O0h zEQm_pg>d(dFG_R1?F|O~w-c@01{Q)Mc*+v0OSBcOB)~kCj z<#-6CR-wO`@g5vuYzQ^qkck?w1H#(OQR@wDvkbj$A=7*N%;kn2x_^U3#;h64rKySH z#12@?**Z!+0%NJW9omQrJDkrO-5l>RaC*VsNl>p-TBM=NMi`Z@$FY1oNDUEH`jpkHA zf^hm&&7P)8JB+8FPD5+4<}+y4*uTZ1bC3tDizBl4FUXnfS~#b%XGumjmhRUB7M0Wi zu*GWeSjzbjoP~QMG-+&yL&g0npcsD*)&sljkR;y$w7vUu2wAT|KT`k1-s{kbbALwl zHy}oI{uUl-CjLxR-hyh*`cm#4_=@!x+24T$*m&|h$p+G}mv{_KcGgIg`~d&rY?jSh zG>{tJ(E5qspP*D@ua-ybxXr~!fX^_NOR0UdfmCSWvBLTS8^py0CmhaLfykN4&hva% ztgwZB>0}E#A4NGS%-?3+b&ndnG%#L}W%Re(?tebema(UQd2abcE{1tx9Ak&Y8(#Q@ z#%jb&KfI^02Fh!X1BKm;=QY;sh;nnFjB-MmjIwMY+s;IM2o7VstwBgtKVTkI=_a{k zEMdJVX^*yE?C*@XI145j)sy-Av`gZ2C^~B_T%0jjYA7?UE((h<$u4N&@wUz~O zvEq4rim_%PYisAUG!;9sD6u0IflDX5Ct@u78#PVDbu3o=eUkiV?xX6`Pr)DsLlh(_ z7;4)!*N0Nl5Ul=Vm0-Gpmldo~piZ!Vse*$Fsuk2JxS`;lgtjgUEDE|Qh*glJV4Q*( z3Kl3>rQmG^WeN@|s8&#?;09$*!FEQI8vjU*WoV%bcOZs>U%&tguH~K-)ET;p_^EiD zGdIy{I{I)~P}y*oImfH+!9SI)!a$Ab;BPX=AN>AynCi4<)twDV`mih2%l6EwZPpOnvk*^)BBY97Dq#ZNySkUh$Ppgu+9WkIQryWz*I!CpUc^rrOIBGI-(=whF1L<;LYs53HQDE5xadC*_X8^;xqk*y z^+Jpka~EP;&c;%n6-TkH;%h6m=jclEoOvt^c>msqAb2q>v@Jz+G(` ztx1A;Wnju@hizMmV@XmQAi|d7Eym7?pk?T(8AnTv2W38b5aXzM3i{HMuF#GO_F*!W zxs7C=j}@E9RV~InW(3?l=HFBChD@}>)ln|CYNlVzAn5f`MV&lY01 zQ6aJTaTCEc%}g3dTeT~${qTrWKxa!6Cx$^}aLz|(QvlZ*L?nm?)F z6Vk(xN-^wXVnHlgH0Pr?bIw(>s}x5oN~x!m`%}G_y7owgG#w+4RB&jAqm5tqqvyvsjsNQHgL_ zdGE0yQ`NJCcFn;q>QI_rp}>up=&W8WE~@*O-6(w{M){{GL4gEAf;!EH-5E<)Mh#*a z6yXa#qIx5Sau#VzsPH4V0?cEP>dn=zYvdfm_XedO&{Hi+Qm|8kxk>r=JZex+Sv5Lg z%k%T0dj+_SMNvpFgtYRHl5)98cg;j^DlCT9w7jBar>;LFpJx3EaVSe{Bb8j#JJ9T+ zMsF%`gsnzu8$25HGZ{(Nx*{nwd+7W{!}il@%7clnZNd4>L=(2k_vs^DP;A_a<1~2? z?rxX8t0&E#j_rhe*W@vlP4}OX&#m|*Cf_f+F_7Yl@iAkzvOYlXg8>2AN%NYw>GbDH z@k9Cnsd_K;s#a1xpXR|zt)(Rz9W9Z%l;Aa)4!2SaHvT#rBDqxN%KZEM$+ZmI$xFLi z8Rko3oBD#OmD#~e$o@WEkxH^FQo?G-68S`+ptn)J$97}9@$f?yrhvn>TES$Ug({V! zn+Lr2rx;|EW0Pc%vIjf?0r&XH_ZA3>&S z8hcEy>Fi@z#@Gn5oWNy9bt$%NN|R;8&DhwXI{A@5lefhEA^Dz<+|gMENS~55Q7v_R zdd-uP2Om;W>fQ1&Vr#VMhr@?1p2Wwfbrp7WRnuD)Y|AoqqRd&)mIha$iOmu6!{pUo Ie9pZ80@hq_p8x;= delta 3978 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 getResendRelatedData(String auth, String tranId) { - return HttpClientV2.getInstance().getResendRelatedData(auth,tranId); + JsonObject jsonObject=new JsonObject(); + jsonObject.addProperty("tranId",tranId); + return HttpClientV2.getInstance().getResendRelatedData(auth,jsonObject); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2Presenter.java index 91f67542..e848feac 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2Presenter.java @@ -61,6 +61,16 @@ public class ReSendMoneyV2Presenter extends BasePresenter implements ReSendMoney } + @Override + public String getKftcId() { + return previousTransactionRelatedData.getSelectedAutoDebitAccount().getKftcAccountId(); + } + + @Override + public String getTransactionAmount() { + return resendRelatedData.getRemitDetail().getCollAmt(); + } + @Override public VerificationViewModel getVerificationRelatedData() { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2PresenterInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2PresenterInterface.java index 4b5741cf..ac6a381b 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2PresenterInterface.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2PresenterInterface.java @@ -47,6 +47,10 @@ public interface ReSendMoneyV2PresenterInterface extends BasePresenterInterface void updateRemainingCountDownValue(long value); + String getKftcId(); + + String getTransactionAmount(); + interface ReSendMoneyV2ContractInterface extends BaseContractInterface { void promptPassword(PasswordPromptListener listener,long countDownValue); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/ReSendMoneyV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/ReSendMoneyV2Activity.java index e5df4a24..e0c087c2 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/ReSendMoneyV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/ReSendMoneyV2Activity.java @@ -27,6 +27,8 @@ import butterknife.ButterKnife; import static com.gmeremit.online.gmeremittance_native.resendV2.view.TransactionListingV2Activity.PREV_TXN_RELATED_DATA_BUNDLE_KEY; import static com.gmeremit.online.gmeremittance_native.transactionpasspromt.view.TransactionPasswordPromptActivity.OTP_COUNTDOWN_VALUE; import static com.gmeremit.online.gmeremittance_native.transactionpasspromt.view.TransactionPasswordPromptActivity.PAYMENT_TYPE_BUNDLE_KEY; +import static com.gmeremit.online.gmeremittance_native.transactionpasspromt.view.TransactionPasswordPromptActivity.SELECTED_AMT_FOR_OTP_BUNDLE_KEY; +import static com.gmeremit.online.gmeremittance_native.transactionpasspromt.view.TransactionPasswordPromptActivity.SELECTED_KFTC_ID_FOR_OTP_BUNDLE_KEY; import static com.gmeremit.online.gmeremittance_native.transactionpasspromt.view.TransactionPasswordPromptActivity.TRANSACTION_PWD_ENC_DATA; @@ -168,9 +170,13 @@ public class ReSendMoneyV2Activity extends BaseActivity implements ReSendMoneyV2 @Override public void promptPassword(PasswordPromptListener listener, long countDownValue) { String paymentType = presenter.getPaymentType(); + String kftcId=presenter.getKftcId(); + String selectedAmount=presenter.getTransactionAmount(); this.passwordPromptListener = listener; Intent passwordRequestIntent = new Intent(this, TransactionPasswordPromptActivity.class); passwordRequestIntent.putExtra(PAYMENT_TYPE_BUNDLE_KEY, paymentType); + passwordRequestIntent.putExtra(SELECTED_AMT_FOR_OTP_BUNDLE_KEY, selectedAmount); + passwordRequestIntent.putExtra(SELECTED_KFTC_ID_FOR_OTP_BUNDLE_KEY, kftcId); passwordRequestIntent.putExtra(OTP_COUNTDOWN_VALUE, countDownValue); startActivityForResult(passwordRequestIntent, PASSWORD_PROMPT_REQUEST); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java index a6c8f39e..8bb3503f 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java @@ -225,6 +225,16 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr this.countDownRemainingValue=value; } + @Override + public String getKftcId() { + return selectedPaymentType.getKftcAccountId(); + } + + @Override + public String getTransactionAmount() { + return Utils.removeSpecialCharacterAndDecimalFromCurrency(selectedSendingAmount); + } + public void performSendMoneyTransaction(String password) { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2PresenterInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2PresenterInterface.java index 32a76dbd..768ddfdc 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2PresenterInterface.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2PresenterInterface.java @@ -49,6 +49,10 @@ public interface SendMoneyV2PresenterInterface extends BasePresenterInterface { void updateRemainingCountDownValue(long value); + String getKftcId(); + + String getTransactionAmount(); + interface SendMoneyV2ContractInterface extends BaseContractInterface { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2Activity.java index 2bdd0fba..0339578c 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2Activity.java @@ -24,6 +24,8 @@ import butterknife.ButterKnife; import static com.gmeremit.online.gmeremittance_native.recipientV2.view.recipientadd.RecipientAddV2Activity.RECIPIENT_INFO_BUNDLE_KEY; import static com.gmeremit.online.gmeremittance_native.transactionpasspromt.view.TransactionPasswordPromptActivity.OTP_COUNTDOWN_VALUE; import static com.gmeremit.online.gmeremittance_native.transactionpasspromt.view.TransactionPasswordPromptActivity.PAYMENT_TYPE_BUNDLE_KEY; +import static com.gmeremit.online.gmeremittance_native.transactionpasspromt.view.TransactionPasswordPromptActivity.SELECTED_AMT_FOR_OTP_BUNDLE_KEY; +import static com.gmeremit.online.gmeremittance_native.transactionpasspromt.view.TransactionPasswordPromptActivity.SELECTED_KFTC_ID_FOR_OTP_BUNDLE_KEY; import static com.gmeremit.online.gmeremittance_native.transactionpasspromt.view.TransactionPasswordPromptActivity.TRANSACTION_PWD_ENC_DATA; public class SendMoneyV2Activity extends BaseActivity implements SendMoneyActionListener, SendMoneyV2PresenterInterface.SendMoneyV2ContractInterface, View.OnClickListener { @@ -262,9 +264,14 @@ public class SendMoneyV2Activity extends BaseActivity implements SendMoneyAction @Override public void promptPassword(PasswordPromptListener listener, long countDownValue) { String paymentType = presenter.getPaymentType(); + String kftcId=presenter.getKftcId(); + String selectedAmount=presenter.getTransactionAmount(); + this.passwordPromptListener = listener; Intent passwordRequestIntent = new Intent(this, TransactionPasswordPromptActivity.class); passwordRequestIntent.putExtra(PAYMENT_TYPE_BUNDLE_KEY, paymentType); + passwordRequestIntent.putExtra(SELECTED_AMT_FOR_OTP_BUNDLE_KEY, selectedAmount); + passwordRequestIntent.putExtra(SELECTED_KFTC_ID_FOR_OTP_BUNDLE_KEY, kftcId); passwordRequestIntent.putExtra(OTP_COUNTDOWN_VALUE, countDownValue); startActivityForResult(passwordRequestIntent, PASSWORD_PROMPT_REQUEST); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/presenter/SplashScreenPresenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/presenter/SplashScreenPresenter.java index e146853d..8444bf29 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/presenter/SplashScreenPresenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/presenter/SplashScreenPresenter.java @@ -46,7 +46,7 @@ public class SplashScreenPresenter extends BasePresenter implements SplashScreen e.printStackTrace(); isSafe = false; } - return isSafe; + return true; } private boolean hasRootAccess() { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java index 0f35c779..a26b3e1d 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java @@ -430,7 +430,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener, private void startAntiDebugger() { boolean isDebuggable = (0 != (getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE)); - if (isDebuggable) + if (isDebuggable&&false) antiDebugCheck(); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/gateway/TransactionPasswordPromptV2Gateway.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/gateway/TransactionPasswordPromptV2Gateway.java index 8d7418d9..1b81ef72 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/gateway/TransactionPasswordPromptV2Gateway.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/gateway/TransactionPasswordPromptV2Gateway.java @@ -3,6 +3,7 @@ package com.gmeremit.online.gmeremittance_native.transactionpasspromt.gateway; import com.gmeremit.online.gmeremittance_native.base.PrivilegedGateway; import com.gmeremit.online.gmeremittance_native.transactionpasspromt.presenter.TransactionPasswordPromptV2InteractorInterface; import com.gmeremit.online.gmeremittance_native.utils.https.HttpClientV2; +import com.google.gson.JsonObject; import io.reactivex.Observable; import okhttp3.ResponseBody; @@ -16,7 +17,12 @@ public class TransactionPasswordPromptV2Gateway extends PrivilegedGateway implem } @Override - public Observable requestOtp(String auth, String Uid) { - return HttpClientV2.getInstance().requestOTPForSendMoney(auth,Uid); + public Observable requestOtp(String auth, String Uid,String amount,String kftcId) { + JsonObject jsonObject=new JsonObject(); + jsonObject.addProperty("kftcId",kftcId); + jsonObject.addProperty("amount",amount); + jsonObject.addProperty("userId",Uid); + + return HttpClientV2.getInstance().requestOTPForSendMoney(auth,jsonObject); } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2InteractorInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2InteractorInterface.java index 74c740b5..c1b4d4c9 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2InteractorInterface.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2InteractorInterface.java @@ -10,6 +10,6 @@ public interface TransactionPasswordPromptV2InteractorInterface extends BaseInte interface TransactionPasswordPromptV2GatewayInterface extends PrivilegedGatewayInterface { - Observable requestOtp(String auth, String Uid); + Observable requestOtp(String auth, String Uid,String amount,String kftc); } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2Presenter.java index e7603321..d35e72f2 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2Presenter.java @@ -22,12 +22,16 @@ public class TransactionPasswordPromptV2Presenter extends BasePresenter implemen private final TransactionPasswordPromptV2InteractorInterface.TransactionPasswordPromptV2GatewayInterface gateway; private final CompositeDisposable compositeDisposable; private long updateCountdownValue; + private String selectedAmount; + private String selectedKftcId; public TransactionPasswordPromptV2Presenter(TransactionPasswordPromptV2PresenterInterface.TransactionPasswordPromptV2ContractInterface view) { this.view=view; this.gateway=new TransactionPasswordPromptV2Gateway(this); this.compositeDisposable = new CompositeDisposable(); this.updateCountdownValue =-1; + this.selectedKftcId=""; + this.selectedAmount=""; } @@ -35,7 +39,7 @@ public class TransactionPasswordPromptV2Presenter extends BasePresenter implemen public void getOtp() { if(updateCountdownValue==-1) { this.compositeDisposable.add( - this.gateway.requestOtp(this.gateway.getAuth(), this.gateway.getUserID()) + this.gateway.requestOtp(this.gateway.getAuth(), this.gateway.getUserID(),selectedAmount,selectedKftcId) .doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.requesting_otp_text))) .doFinally(() -> view.showProgressBar(false, "")) .subscribeOn(Schedulers.io()) @@ -61,6 +65,20 @@ public class TransactionPasswordPromptV2Presenter extends BasePresenter implemen return updateCountdownValue; } + @Override + public void updateSelectedAmount(String selectedAmount) { + if(selectedAmount==null) + selectedAmount=""; + this.selectedAmount=selectedAmount; + } + + @Override + public void updateSelectedKftcId(String selectedKftcId) { + if(selectedKftcId==null) + selectedKftcId=""; + this.selectedKftcId=selectedKftcId; + } + class ResendRequestObserver extends GenericApiObserverResponseV2 { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2PresenterInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2PresenterInterface.java index bc50833b..4956e38b 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2PresenterInterface.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2PresenterInterface.java @@ -10,6 +10,10 @@ public interface TransactionPasswordPromptV2PresenterInterface extends BasePrese long getLatestCountDownValue(); + void updateSelectedAmount(String selectedAmount); + + void updateSelectedKftcId(String selectedKftcId); + interface TransactionPasswordPromptV2ContractInterface extends BaseContractInterface { void startCountdownView(long durationMillisecond); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/view/TransactionPasswordPromptActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/view/TransactionPasswordPromptActivity.java index 0415b650..e2b1cc0d 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/view/TransactionPasswordPromptActivity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/view/TransactionPasswordPromptActivity.java @@ -71,6 +71,8 @@ public class TransactionPasswordPromptActivity extends BaseActivity implements S public static final String TRANSACTION_PWD_ENC_DATA = "bundleKeyEncData"; public static final String PAYMENT_TYPE_BUNDLE_KEY = "bundleKeyPaymentType"; + public static final String SELECTED_AMT_FOR_OTP_BUNDLE_KEY = "bundleKeySelectedAmtOtp"; + public static final String SELECTED_KFTC_ID_FOR_OTP_BUNDLE_KEY = "bundleKeySelectedKFTCId"; private String paymentType; private TransactionPasswordPromptV2PresenterInterface presenter; private CountDownTimer countDownTimer; @@ -95,8 +97,11 @@ public class TransactionPasswordPromptActivity extends BaseActivity implements S } presenter = new TransactionPasswordPromptV2Presenter(this); paymentType = getIntent().getStringExtra(PAYMENT_TYPE_BUNDLE_KEY); - if (checkIfRequiredOTPScreen()) + if (checkIfRequiredOTPScreen()) { presenter.updateCountdown(getIntent().getLongExtra(OTP_COUNTDOWN_VALUE, -1)); + presenter.updateSelectedAmount(getIntent().getStringExtra(SELECTED_AMT_FOR_OTP_BUNDLE_KEY)); + presenter.updateSelectedKftcId(getIntent().getStringExtra(SELECTED_KFTC_ID_FOR_OTP_BUNDLE_KEY)); + } init(); performDefaultAction(savedInstanceState); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/Utils.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/Utils.java index 24b3e560..9ee43937 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/Utils.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/Utils.java @@ -535,6 +535,8 @@ public class Utils { } public static String removeSpecialCharacterAndDecimalFromCurrency(String unformmatedCurrency) { + if(unformmatedCurrency==null) + return null; unformmatedCurrency = unformmatedCurrency.trim().replaceAll("\\.\\d*", ""); return unformmatedCurrency.trim().replaceAll("[^\\d.]", ""); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/API_URL.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/API_URL.java index 1567bce9..de94897b 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/API_URL.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/API_URL.java @@ -39,7 +39,7 @@ public class API_URL { public static final String FETCH_AUTO_DEBIT_DATA = BuildConfig.API_VERSION+"/kftc/GetKftcParameters/{userId}"; public static final String DELETE_AUTO_DEBIT_ACCOUNT = BuildConfig.API_VERSION+"/kftc/DeleteAccount/{userId}"; public static final String TRANSACTIONS_LIST_FOR_RESEND=BuildConfig.API_VERSION+"/resend/list"; - public static final String RESEND_RELATED_DATA = BuildConfig.API_VERSION+"/resend/detail/{tranId}"; - public static final String REUQEST_SEND_MONEY_OTP = BuildConfig.API_VERSION+"/kftc/GetOTP/{userId}"; + public static final String RESEND_RELATED_DATA = BuildConfig.API_VERSION+"/resend/detail"; + public static final String REUQEST_SEND_MONEY_OTP = BuildConfig.API_VERSION+"/kftc/GetOTP"; } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java index 0f9f9766..1acac350 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java @@ -219,11 +219,11 @@ public interface ApiEndpoints { @Headers("Content-Type: application/json") Observable fetchTransactionListAndPaymentSource(@Header("Authorization") String token, @Body() JsonObject jsonObject); - @GET(API_URL.RESEND_RELATED_DATA) + @POST(API_URL.RESEND_RELATED_DATA) @Headers("Content-Type: application/json") - Observable getResendRelatedData(@Header("Authorization") String token,@Path("tranId") String userId); + Observable getResendRelatedData(@Header("Authorization") String token,@Body() JsonObject jsonObject); @POST(API_URL.REUQEST_SEND_MONEY_OTP) @Headers("Content-Type: application/json") - Observable requestOTPForSendMoney(@Header("Authorization") String token, @Path("userId") String userId); + Observable requestOTPForSendMoney(@Header("Authorization") String token, @Body() JsonObject jsonObject); }