Ready for publishing V_2.0.0

app/build.gradle

@@ -85,7 +85,8 @@ android {
             manifestPlaceholders.fileProvider = "com.gmeremit.online.gmeremittance_native.stag.fileprovider"
             applicationIdSuffix ".stag"
             signingConfig signingConfigs.debug
-            buildConfigField 'String', 'BASE_URL', '"http://gmeuat.gmeremit.com:5022/api/"'
+//            buildConfigField 'String', 'BASE_URL', '"http://gmeuat.gmeremit.com:5022/api/"'
+            buildConfigField 'String', 'BASE_URL', '"http://gmeuat.gmeremit.com:5026/api/"'
             buildConfigField 'String', 'API_VERSION', '"v1"'
             buildConfigField 'String', 'BASE_URL_SOCIAL', '"http://10.1.1.171:8080/v1/"'
             debuggable true

app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/gateway/resend/ReSendMoneyV2Gateway.java

@@ -67,7 +67,9 @@ public class ReSendMoneyV2Gateway extends PrivilegedGateway implements ReSendMon
 
     @Override
     public Observable<ResponseBody> 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);
     }
 
 

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() {

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);

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);
     }

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) {
 

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
     {

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);
     }

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() {

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();
     }
 

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<ResponseBody> requestOtp(String auth, String Uid) {
-        return HttpClientV2.getInstance().requestOTPForSendMoney(auth,Uid);
+    public Observable<ResponseBody> 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);
     }
 }

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<ResponseBody> requestOtp(String auth, String Uid);
+        Observable<ResponseBody> requestOtp(String auth, String Uid,String amount,String kftc);
     }
 }

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<MessageResponseDataModel>
     {

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);

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);
     }

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.]", "");
     }

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";
 }
 

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<ResponseBody> 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<ResponseBody> getResendRelatedData(@Header("Authorization") String token,@Path("tranId") String userId);
+    Observable<ResponseBody> getResendRelatedData(@Header("Authorization") String token,@Body() JsonObject jsonObject);
 
     @POST(API_URL.REUQEST_SEND_MONEY_OTP)
     @Headers("Content-Type: application/json")
-    Observable<ResponseBody> requestOTPForSendMoney(@Header("Authorization") String token, @Path("userId") String userId);
+    Observable<ResponseBody> requestOTPForSendMoney(@Header("Authorization") String token, @Body() JsonObject jsonObject);
 }