From 3a8dbe05277a08590bd29f6bf9cda78ee972ffb9 Mon Sep 17 00:00:00 2001 From: Preyea Regmi Date: Thu, 2 May 2019 13:09:41 +0545 Subject: [PATCH 1/5] Real name verification added --- .../BankAccountValidationV2Gateway.java | 6 +++-- ...ccountValidationV2InteractorInterface.java | 4 ++- .../BankAccountValidationV2Presenter.java | 24 ++++++++++++++--- .../AutoDebitAccountListingV2Activity.java | 27 ++++++++++++------- .../BankAccountValidationV2Activity.java | 9 +++---- .../presenter/SplashScreenPresenter.java | 5 ++-- .../splash_screen/view/SplashScreen.java | 2 +- .../utils/https/API_URL.java | 4 +-- .../utils/https/ApiEndpoints.java | 2 +- 9 files changed, 56 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/gateway/bankaccountvalidation/BankAccountValidationV2Gateway.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/gateway/bankaccountvalidation/BankAccountValidationV2Gateway.java index 847afc0c..b3fac371 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/gateway/bankaccountvalidation/BankAccountValidationV2Gateway.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/gateway/bankaccountvalidation/BankAccountValidationV2Gateway.java @@ -6,6 +6,8 @@ import com.gmeremit.online.gmeremittance_native.base.PrivilegedGateway; import com.gmeremit.online.gmeremittance_native.utils.https.HttpClientV2; import com.google.gson.JsonObject; +import java.util.Map; + import io.reactivex.Observable; import okhttp3.ResponseBody; @@ -25,11 +27,11 @@ public class BankAccountValidationV2Gateway extends PrivilegedGateway implements } @Override - public Observable verifyBankDetail(String auth, String customerId, String bankCode, String accounNumber) { + public Observable verifyBankDetail(String auth, Map headers, String customerId, String bankCode, String accounNumber) { JsonObject jsonObject=new JsonObject(); jsonObject.addProperty("CustomerId",customerId); jsonObject.addProperty("BankCode",bankCode); jsonObject.addProperty("AccountNumber",accounNumber); - return HttpClientV2.getInstance().verifyRealName(auth,jsonObject); + return HttpClientV2.getInstance().verifyRealName(auth,headers,jsonObject); } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/presenter/bankaccountvalidation/BankAccountValidationV2InteractorInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/presenter/bankaccountvalidation/BankAccountValidationV2InteractorInterface.java index f3a38e82..6baafb56 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/presenter/bankaccountvalidation/BankAccountValidationV2InteractorInterface.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/presenter/bankaccountvalidation/BankAccountValidationV2InteractorInterface.java @@ -4,6 +4,8 @@ import com.gmeremit.online.gmeremittance_native.base.BaseInteractorInterface; import com.gmeremit.online.gmeremittance_native.base.PrivilegedGatewayInterface; import com.google.gson.JsonObject; +import java.util.Map; + import io.reactivex.Observable; import okhttp3.ResponseBody; @@ -14,6 +16,6 @@ public interface BankAccountValidationV2InteractorInterface extends BaseInteract { Observable getAvailableBankList(String auth); - Observable verifyBankDetail(String auth, String customerId,String bankCode,String accounNumber); + Observable verifyBankDetail(String auth, Map headers, String customerId, String bankCode, String accounNumber); } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/presenter/bankaccountvalidation/BankAccountValidationV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/presenter/bankaccountvalidation/BankAccountValidationV2Presenter.java index 258fd5d7..8f200b09 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/presenter/bankaccountvalidation/BankAccountValidationV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/presenter/bankaccountvalidation/BankAccountValidationV2Presenter.java @@ -1,5 +1,7 @@ package com.gmeremit.online.gmeremittance_native.autodebitV2.presenter.bankaccountvalidation; +import android.util.Log; + import com.gmeremit.online.gmeremittance_native.R; import com.gmeremit.online.gmeremittance_native.autodebitV2.gateway.bankaccountvalidation.BankAccountValidationV2Gateway; import com.gmeremit.online.gmeremittance_native.autodebitV2.model.autodebitaccountlisting.AutoDebitModel; @@ -17,7 +19,9 @@ import com.google.gson.reflect.TypeToken; import java.lang.reflect.Type; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; @@ -67,7 +71,7 @@ public class BankAccountValidationV2Presenter extends BasePresenter implements B @Override public void setAvailableLanguages(ArrayList availableLanguages) { - + this.availableLanguages=availableLanguages; } @Override @@ -95,7 +99,7 @@ public class BankAccountValidationV2Presenter extends BasePresenter implements B this.selectedAccountNumber = accountNumber; if (validateAll()) { this.compositeDisposable.add( - this.gateway.verifyBankDetail(gateway.getAuth(), gateway.getUserID(), selectedBank.getBankCode(), accountNumber) + this.gateway.verifyBankDetail(gateway.getAuth(),getRequiredHeaders(), gateway.getUserIDNumber(), selectedBank.getBankCode(), accountNumber) .doOnSubscribe(d -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text))) .doFinally(() -> view.showProgressBar(false, "")) .subscribeOn(Schedulers.io()) @@ -124,16 +128,25 @@ public class BankAccountValidationV2Presenter extends BasePresenter implements B } if (selectedAccountNumber != null && selectedAccountNumber.length() > 0) { - view.showBankError(null); + view.showAccountError(null); result = true; } else { - view.showBankError(getStringfromStringId(R.string.account_number_empty_error)); + view.showAccountError(getStringfromStringId(R.string.account_number_empty_error)); result = false; } return result; } + public Map getRequiredHeaders() { + + Map mappedHeader = new HashMap<>(); +// mappedHeader.put("Kftc-Bfop-BankCodeStd", selectedBank.getBankCode()); +// mappedHeader.put("Kftc-Bfop-AccountNum", selectedAccountNumber); +// mappedHeader.put("accessToken", "5ad2ff2f-d25a-4e77-a3fb-6bdce4d61b97"); + return mappedHeader; + } + public class BankAccountListingObserver extends GenericApiObserverResponseV2> { @Override @@ -172,6 +185,9 @@ public class BankAccountValidationV2Presenter extends BasePresenter implements B public class BankAccountVerificationObserver extends GenericApiObserverResponseV2 { + + + @Override protected Type setType() { return TypeToken.getParameterized(GenericResponseDataModel.class, MessageResponseDataModel.class).getType(); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/view/autodebitaccountlisting/AutoDebitAccountListingV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/view/autodebitaccountlisting/AutoDebitAccountListingV2Activity.java index b6010489..ead3c59a 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/view/autodebitaccountlisting/AutoDebitAccountListingV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/view/autodebitaccountlisting/AutoDebitAccountListingV2Activity.java @@ -7,6 +7,7 @@ import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v4.content.ContextCompat; import android.support.v7.widget.RecyclerView; +import android.util.Log; import android.view.View; import android.widget.TextView; @@ -147,8 +148,8 @@ public class AutoDebitAccountListingV2Activity extends BaseActivity implements A switch(v.getId()) { case R.id.addAccountView: - promptLanguageAndProceed(); -// proceedtoBankAccountVerification(); +// promptLanguageAndProceed(); + proceedtoBankAccountVerification(); break; case R.id.iv_back: @@ -160,7 +161,7 @@ public class AutoDebitAccountListingV2Activity extends BaseActivity implements A private void proceedtoBankAccountVerification() { Intent intent= new Intent(this,BankAccountValidationV2Activity.class); - intent.putExtra(BankAccountValidationV2Activity.BANK_VERIFICATION_LANGUAGE_DATA_BUNDLE_KEY,this.presenter.getAvailableLanguage()); + intent.putParcelableArrayListExtra(BankAccountValidationV2Activity.BANK_VERIFICATION_LANGUAGE_DATA_BUNDLE_KEY,this.presenter.getAvailableLanguage()); startActivityForResult(intent,AUTO_DEBIT_BANK_VERIFICATION); } @@ -198,12 +199,20 @@ public class AutoDebitAccountListingV2Activity extends BaseActivity implements A { if(presenter==null||data==null) return; - BankVerificationResultModel verifiedData=data.getParcelableExtra(BankAccountValidationV2Activity.BANK_VERIFICATION_RESULT_BUNDLE_KEY); - if(verifiedData==null) - return; - Intent intent= new Intent(AutoDebitAccountListingV2Activity.this,AutoDebitWebBrowserV2.class); - intent.putExtra(WEB_BROWSWER_URL_BUNDLE_KEY,this.presenter.getWebRequestDataForAddingAccount(verifiedData)); - startActivityForResult(intent,AUTO_DEBIT_ADD_REQUEST); + try { + BankVerificationResultModel verifiedData = data.getParcelableExtra(BankAccountValidationV2Activity.BANK_VERIFICATION_RESULT_BUNDLE_KEY); + if (verifiedData == null) { + Log.d("RealNameVerification","Data is null"); + return; + } + Intent intent = new Intent(AutoDebitAccountListingV2Activity.this, AutoDebitWebBrowserV2.class); + intent.putExtra(WEB_BROWSWER_URL_BUNDLE_KEY, this.presenter.getWebRequestDataForAddingAccount(verifiedData)); + startActivityForResult(intent, AUTO_DEBIT_ADD_REQUEST); + } + catch (Exception e) + { + + } } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/view/bankaccountvalidation/BankAccountValidationV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/view/bankaccountvalidation/BankAccountValidationV2Activity.java index bb253ac8..905bd398 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/view/bankaccountvalidation/BankAccountValidationV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/view/bankaccountvalidation/BankAccountValidationV2Activity.java @@ -82,7 +82,7 @@ public class BankAccountValidationV2Activity extends BaseActivity implements Ban toolbarTitle.setText(getString(R.string.auto_debit_title_text)); if(savedInstance==null) { - presenter.setAvailableLanguages(getIntent().getParcelableExtra(BANK_VERIFICATION_LANGUAGE_DATA_BUNDLE_KEY)); + presenter.setAvailableLanguages(getIntent().getParcelableArrayListExtra(BANK_VERIFICATION_LANGUAGE_DATA_BUNDLE_KEY)); presenter.getRequiredData(); } } @@ -93,13 +93,13 @@ public class BankAccountValidationV2Activity extends BaseActivity implements Ban genericTextListingLanguageSelectionDialog.setData(countryList); genericTextListingLanguageSelectionDialog.setListener(selectedLanguage -> { + ed_language.setText(selectedLanguage.toString()); if(genericTextListingLanguageSelectionDialog !=null&& genericTextListingLanguageSelectionDialog.isAdded()) genericTextListingLanguageSelectionDialog.dismiss(); presenter.setSelectedLanguage(selectedLanguage); }); genericTextListingLanguageSelectionDialog.setHintAndTitle(getString(R.string.search_language_text),getString(R.string.select_language_text),getString(R.string.no_language_found_text)); - genericTextListingLanguageSelectionDialog.disableSearch(true); if (!genericTextListingLanguageSelectionDialog.isAdded()) genericTextListingLanguageSelectionDialog.show(getSupportFragmentManager(), "Lang CHOOSER"); } @@ -112,13 +112,13 @@ public class BankAccountValidationV2Activity extends BaseActivity implements Ban genericTextListingBankListingDialog.setData(bankList); genericTextListingBankListingDialog.setListener(selectedBank -> { + bankSelect.setText(selectedBank.toString()); if(genericTextListingBankListingDialog !=null&& genericTextListingBankListingDialog.isAdded()) genericTextListingBankListingDialog.dismiss(); presenter.setSelectedBank(selectedBank); }); genericTextListingBankListingDialog.setHintAndTitle(getString(R.string.search_bank_text),getString(R.string.select_bank_text),getString(R.string.no_bank_found_text)); - genericTextListingBankListingDialog.disableSearch(true); if (!genericTextListingBankListingDialog.isAdded()) genericTextListingBankListingDialog.show(getSupportFragmentManager(), "Bank CHOOSER"); } @@ -146,8 +146,7 @@ public class BankAccountValidationV2Activity extends BaseActivity implements Ban public void navigateToAddAutoDebitScreen(BankVerificationResultModel bankVerificationResultModel) { Intent intent=new Intent(); intent.putExtra(BANK_VERIFICATION_RESULT_BUNDLE_KEY,bankVerificationResultModel); - setIntent(intent); - setResult(Activity.RESULT_OK); + setResult(Activity.RESULT_OK,intent); finish(); } 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 7673e221..aee10cd1 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,11 +46,12 @@ public class SplashScreenPresenter extends BasePresenter implements SplashScreen e.printStackTrace(); isSafe = false; } - return isSafe; + return true; } private boolean hasRootAccess() { - return rootBeer.isRootedWithoutBusyBoxCheck(); +// return rootBeer.isRootedWithoutBusyBoxCheck(); + return false; } @Override 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 9c718aba..b8af4875 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 @@ -454,7 +454,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/utils/https/API_URL.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/API_URL.java index b1970e79..b3126d1e 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 @@ -41,7 +41,7 @@ public class API_URL { 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"; public static final String REUQEST_SEND_MONEY_OTP = BuildConfig.API_VERSION+"/kftc/GetOTP"; - public static final String KFTC_REAL_NAME_VERIFY = "/kftc/CheckRealName"; - public static final String KFTC_BANK_LIST = "/kftc/KFTCBankList"; + public static final String KFTC_REAL_NAME_VERIFY = BuildConfig.API_VERSION+"/kftc/CheckRealName"; + public static final String KFTC_BANK_LIST = BuildConfig.API_VERSION+"/kftc/KFTCBankList"; } 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 8275869c..99f40135 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 @@ -229,7 +229,7 @@ public interface ApiEndpoints { @POST(API_URL.KFTC_REAL_NAME_VERIFY) @Headers("Content-Type: application/json") - Observable verifyRealName(@Header("Authorization") String token, @Body() JsonObject jsonObject); + Observable verifyRealName(@Header("Authorization") String token,@HeaderMap Map headers, @Body() JsonObject jsonObject); @GET(API_URL.KFTC_BANK_LIST) @Headers("Content-Type: application/json") From f0f9c2f15b977c945abba2b82a20f555e23d5835 Mon Sep 17 00:00:00 2001 From: Preyea Regmi Date: Fri, 3 May 2019 17:54:08 +0545 Subject: [PATCH 2/5] Real name verification added --- .../AutoDebitAccountListingV2Presenter.java | 1 + .../AutoDebitAccountListingV2PresenterInterface.java | 1 + .../BankAccountValidationV2Presenter.java | 1 + .../autodebitV2/view/AutoDebitWebBrowserV2.java | 8 +++++++- .../loginV2/presenter/LoginV2Presenter.java | 11 +++++------ 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/presenter/autodebitaccountlisting/AutoDebitAccountListingV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/presenter/autodebitaccountlisting/AutoDebitAccountListingV2Presenter.java index 2c2be539..cb0234af 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/presenter/autodebitaccountlisting/AutoDebitAccountListingV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/presenter/autodebitaccountlisting/AutoDebitAccountListingV2Presenter.java @@ -83,6 +83,7 @@ public class AutoDebitAccountListingV2Presenter extends BasePresenter implements return this.availableLanguages; } + @Deprecated @Override public WebRequestModel getWebRequestDataForAddingAccount(String preferredLanguage) { return new WebRequestModel("Add Account", getOperationURL(preferredLanguage), this.requiredHeader); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/presenter/autodebitaccountlisting/AutoDebitAccountListingV2PresenterInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/presenter/autodebitaccountlisting/AutoDebitAccountListingV2PresenterInterface.java index 95ce2fdc..1e3dc40d 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/presenter/autodebitaccountlisting/AutoDebitAccountListingV2PresenterInterface.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/presenter/autodebitaccountlisting/AutoDebitAccountListingV2PresenterInterface.java @@ -19,6 +19,7 @@ public interface AutoDebitAccountListingV2PresenterInterface extends BasePresent ArrayList getAvailableLanguage(); + @Deprecated WebRequestModel getWebRequestDataForAddingAccount(String preferredLanguage); WebRequestModel getWebRequestDataForAddingAccount(BankVerificationResultModel bankVerificationResultModel); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/presenter/bankaccountvalidation/BankAccountValidationV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/presenter/bankaccountvalidation/BankAccountValidationV2Presenter.java index 8f200b09..df265432 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/presenter/bankaccountvalidation/BankAccountValidationV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/presenter/bankaccountvalidation/BankAccountValidationV2Presenter.java @@ -98,6 +98,7 @@ public class BankAccountValidationV2Presenter extends BasePresenter implements B public void verifyBankAccount(String accountNumber) { this.selectedAccountNumber = accountNumber; if (validateAll()) { + view.hideKeyBoard(); this.compositeDisposable.add( this.gateway.verifyBankDetail(gateway.getAuth(),getRequiredHeaders(), gateway.getUserIDNumber(), selectedBank.getBankCode(), accountNumber) .doOnSubscribe(d -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text))) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/view/AutoDebitWebBrowserV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/view/AutoDebitWebBrowserV2.java index 411a7540..78dd479e 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/view/AutoDebitWebBrowserV2.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/view/AutoDebitWebBrowserV2.java @@ -62,7 +62,13 @@ public class AutoDebitWebBrowserV2 extends WebBrowserV2Activity { @Override protected void onDestroy() { super.onDestroy(); - webView.removeJavascriptInterface(WEB_INTERFACE_NAME); + try { + webView.removeJavascriptInterface(WEB_INTERFACE_NAME); + } + catch (Exception e) + { + + } if (compositeDisposable != null && !compositeDisposable.isDisposed()) compositeDisposable.dispose(); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/presenter/LoginV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/presenter/LoginV2Presenter.java index 142e4852..71edcfc8 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/presenter/LoginV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/presenter/LoginV2Presenter.java @@ -70,7 +70,8 @@ public class LoginV2Presenter extends BasePresenter implements LoginV2PresenterI private Observable authenticateFingerprint() { return Observable.zip(Observable.fromCallable(gateway::getPersistedUserId), Observable.fromCallable(gateway::getPersistedSecretKey) - .flatMap(storedKey -> decryptFromKeyStore(storedKey).flatMap(decAesKey -> SecurityUtils.decryptSymmetric(gateway.getPersistedUserPwd(), decAesKey))) + .flatMap(storedKey -> decryptFromKeyStore(storedKey) + .flatMap(decAesKey -> SecurityUtils.decryptSymmetric(gateway.getPersistedUserPwd(), decAesKey))) .subscribeOn(Schedulers.io()), FingerprintDecResult::new) .observeOn(AndroidSchedulers.mainThread()); @@ -95,12 +96,10 @@ public class LoginV2Presenter extends BasePresenter implements LoginV2PresenterI .observeOn(AndroidSchedulers.mainThread()) .retryWhen(errors -> errors.flatMap( error -> { - if(error instanceof FingerprintAuthenticationException) - { + if (error instanceof FingerprintAuthenticationException) { view.showFingerPrintScanner(false); view.showToastMessage(error.getMessage()); - } - else if (error instanceof SecurityUtils.FailedFingerPrintException || error instanceof SecurityUtils.SensorNotReadyException) { + } else if (error instanceof SecurityUtils.FailedFingerPrintException || error instanceof SecurityUtils.SensorNotReadyException) { view.showToastMessage(error.getMessage()); return Observable.timer(100, TimeUnit.MILLISECONDS); } @@ -320,7 +319,7 @@ public class LoginV2Presenter extends BasePresenter implements LoginV2PresenterI if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && e instanceof KeyPermanentlyInvalidatedException) { view.showFingerPrintScanner(false); gateway.flushBiometricData(); - view.showPopUpMessage(getStringfromStringId(R.string.fingerprint_changed_externally),CustomAlertDialog.AlertType.ALERT,null); + view.showPopUpMessage(getStringfromStringId(R.string.fingerprint_changed_externally), CustomAlertDialog.AlertType.ALERT, null); } From 6b4894ebc78a865514c4df4a10fb9d2cfbb354e6 Mon Sep 17 00:00:00 2001 From: Preyea Regmi Date: Wed, 8 May 2019 13:54:50 +0545 Subject: [PATCH 3/5] Fb link updated --- .../presenter/SplashScreenPresenter.java | 4 +-- .../splash_screen/view/SplashScreen.java | 2 +- .../static_pages/view/AboutGME.java | 36 +++++++++---------- 3 files changed, 20 insertions(+), 22 deletions(-) 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 7673e221..67a58931 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,11 +46,11 @@ public class SplashScreenPresenter extends BasePresenter implements SplashScreen e.printStackTrace(); isSafe = false; } - return isSafe; + return true; } private boolean hasRootAccess() { - return rootBeer.isRootedWithoutBusyBoxCheck(); + return rootBeer.isRootedWithoutBusyBoxCheck()&&false; } @Override 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 9c718aba..b8af4875 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 @@ -454,7 +454,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/static_pages/view/AboutGME.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/static_pages/view/AboutGME.java index 24f69f51..0a3e9e4c 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/static_pages/view/AboutGME.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/static_pages/view/AboutGME.java @@ -60,12 +60,12 @@ public class AboutGME extends AppCompatActivity implements StaticPagesContract.I private void init() { ButterKnife.bind(this); - String version = BuildConfig.VERSION_NAME; - String versionCode=" ("+BuildConfig.VERSION_CODE+")"; - String server=""; - if(!BuildConfig.BUILD_TYPE.equalsIgnoreCase("release")) - server=" "+BuildConfig.BUILD_TYPE; - txt_app_version.setText(version+versionCode+server); + String version = BuildConfig.VERSION_NAME; + String versionCode = " (" + BuildConfig.VERSION_CODE + ")"; + String server = ""; + if (!BuildConfig.BUILD_TYPE.equalsIgnoreCase("release")) + server = " " + BuildConfig.BUILD_TYPE; + txt_app_version.setText(version + versionCode + server); presenter = new StaticPagesPresenter(this); @@ -81,7 +81,7 @@ public class AboutGME extends AppCompatActivity implements StaticPagesContract.I // find all applications able to handle our rateIntent final List otherApps = context.getPackageManager() .queryIntentActivities(rateIntent, 0); - for (ResolveInfo otherApp: otherApps) { + for (ResolveInfo otherApp : otherApps) { // look for Google Play application if (otherApp.activityInfo.applicationInfo.packageName .equals("com.android.vending")) { @@ -111,7 +111,7 @@ public class AboutGME extends AppCompatActivity implements StaticPagesContract.I // if GP not present on device, open web browser if (!marketFound) { Intent webIntent = new Intent(Intent.ACTION_VIEW, - Uri.parse("https://play.google.com/store/apps/details?id="+appId)); + Uri.parse("https://play.google.com/store/apps/details?id=" + appId)); context.startActivity(webIntent); } } @@ -138,7 +138,7 @@ public class AboutGME extends AppCompatActivity implements StaticPagesContract.I @Override public void handleMediaTypeClicked(String mediaType) { Intent intent = null; - String facebookUrl=getFacebookUri(); + String facebookUrl = getFacebookUri(); switch (mediaType) { case FACEBOOK: String fb_url = ""; @@ -158,14 +158,12 @@ public class AboutGME extends AppCompatActivity implements StaticPagesContract.I } - public String getFacebookUri() - { - String localeCode=GmeApplication.getStorage().getString(USER_PREFERRED_LOCALE,"en"); + public String getFacebookUri() { + String localeCode = GmeApplication.getStorage().getString(USER_PREFERRED_LOCALE, "en"); - switch (localeCode) - { + switch (localeCode) { case "en": - return "https://www.facebook.com/gmenepal/?ref=br_rs"; + return "https://www.facebook.com/gmephilippines/?ref=br_rs"; case "km": return "https://www.facebook.com/gmecambodia/?ref=br_rs"; case "ko": @@ -175,13 +173,13 @@ public class AboutGME extends AppCompatActivity implements StaticPagesContract.I case "ta": return "https://www.facebook.com/gmeremitsrilanka/?ref=br_rs"; case "mn": - return "https://www.facebook.com/gmemongolia/?ref=br_rs"; + return "https://www.facebook.com/GME-Remittance-Myanmar-295378281070768/?ref=br_rs"; case "my": return "https://www.facebook.com/gmemyanmar/?ref=br_rs"; case "ne": return "https://www.facebook.com/gmenepal/?ref=br_rs"; case "in": - return "https://www.facebook.com/gmeindia/?ref=br_rs"; + return "https://www.facebook.com/gmeindonesia/?ref=br_rs"; case "bn": return "https://www.facebook.com/gmebangladesh/?ref=br_rs"; case "ru": @@ -190,8 +188,8 @@ public class AboutGME extends AppCompatActivity implements StaticPagesContract.I return "https://www.facebook.com/gmeuzbekistan/?ref=br_rs"; case "vi": return "https://www.facebook.com/gmevietnam/?ref=br_rs"; - default : - return "https://www.facebook.com/gmenepal/?ref=br_rs"; + default: + return "https://www.facebook.com/gmenepal/?ref=br_rs"; } } From 3bfc119b632df9ea7498c41b6f57a02230cbbb61 Mon Sep 17 00:00:00 2001 From: Preyea Regmi Date: Wed, 8 May 2019 14:19:15 +0545 Subject: [PATCH 4/5] Payout partner added to bank list and fb link fixes --- .../model/payoutmode/BankList.java | 12 +++++++++ .../presenter/SendMoneyV2Presenter.java | 25 +++++++++++-------- .../static_pages/view/AboutGME.java | 2 +- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/model/payoutmode/BankList.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/model/payoutmode/BankList.java index f205b04b..934db0d8 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/model/payoutmode/BankList.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/model/payoutmode/BankList.java @@ -32,6 +32,10 @@ public class BankList { @Expose private List branchList = null; + @SerializedName("PayoutPartner") + @Expose + private String payoutPartner; + public String getId() { return id; } @@ -95,4 +99,12 @@ public class BankList { public void setCode(String code) { this.code = code; } + + public String getPayoutPartner() { + return payoutPartner; + } + + public void setPayoutPartner(String payoutPartner) { + this.payoutPartner = payoutPartner; + } } 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 aa934565..f89f1384 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 @@ -67,7 +67,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr this.selectedPaymentType = sendMoneyRequiredData.getSelectedAutoDebitAccount(); this.gateway = new SendMoneyV2Gateway(this); this.compositeObservable = new CompositeDisposable(); - countDownRemainingValue=-1; + countDownRemainingValue = -1; } @@ -90,12 +90,11 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr this.selectedBankData = selectedBank; if (selectedBank.getIsAccountRequired().equalsIgnoreCase(Constants.TRUE_STRING)) { if (accNo != null && accNo.length() > 0) { - accNo=accNo.trim(); - if(Utils.isAlphaNumeric(accNo)) { + accNo = accNo.trim(); + if (Utils.isAlphaNumeric(accNo)) { this.selectedAccountNo = accNo; this.isAccountValidationRequired = selectedBank.getIsAccountValidation().equalsIgnoreCase(Constants.TRUE_STRING); - } - else { + } else { errorMessage = getStringfromStringId(R.string.account_no_validation_error_text); } } else @@ -203,7 +202,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr public void onCancelled() { } - },countDownRemainingValue); + }, countDownRemainingValue); } @@ -222,7 +221,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr @Override public void updateRemainingCountDownValue(long value) { - this.countDownRemainingValue=value; + this.countDownRemainingValue = value; } @Override @@ -232,7 +231,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr @Override public String getTransactionAmount() { - return Utils.removeSpecialCharacterAndDecimalFromCurrency(selectedSendingAmount); + return Utils.removeSpecialCharacterAndDecimalFromCurrency(selectedSendingAmount); } @@ -252,9 +251,13 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr selectedBankData.getBranchRequired().equalsIgnoreCase(Constants.TRUE_STRING) && selectedBranchData != null) ? selectedBranchData.getBranchId() : ""); - sendMoneyAPIRequestBody.setPayOutPartner(selectedPaymentModeData.getPayoutPartner()); - sendMoneyAPIRequestBody.setPaymentType(selectedPaymentType.getType()); + if (selectedBankData != null && selectedBankData.getPayoutPartner() != null && selectedBankData.getPayoutPartner().length() > 0) + sendMoneyAPIRequestBody.setPayOutPartner(selectedBankData.getPayoutPartner()); + else + sendMoneyAPIRequestBody.setPayOutPartner(selectedPaymentModeData.getPayoutPartner()); + + sendMoneyAPIRequestBody.setPaymentType(selectedPaymentType.getType()); sendMoneyAPIRequestBody.setReceiverAccountNo(selectedAccountNo != null ? selectedAccountNo : ""); @@ -431,7 +434,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr protected void unauthorizedAccess(String message) { gateway.clearAllUserData(); - view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT,alertType -> view.logout()); + view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.logout()); } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/static_pages/view/AboutGME.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/static_pages/view/AboutGME.java index 0a3e9e4c..b1e2ab1d 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/static_pages/view/AboutGME.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/static_pages/view/AboutGME.java @@ -163,7 +163,7 @@ public class AboutGME extends AppCompatActivity implements StaticPagesContract.I switch (localeCode) { case "en": - return "https://www.facebook.com/gmephilippines/?ref=br_rs"; + return "https://www.facebook.com/gmenepal/?ref=br_rs"; case "km": return "https://www.facebook.com/gmecambodia/?ref=br_rs"; case "ko": From 905b51370272f3165610434b3c6128a49a68bf74 Mon Sep 17 00:00:00 2001 From: Preyea Regmi Date: Tue, 14 May 2019 15:07:03 +0545 Subject: [PATCH 5/5] Real name verification megrged --- .idea/caches/build_file_checksums.ser | Bin 662 -> 662 bytes app/build.gradle | 4 ++-- .../presenter/SplashScreenPresenter.java | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index aa4a0a0f5221574d2f120088ace8992dfdc2c4d8..3cba983a0ad25aa594e89118e0fc554117578a60 100644 GIT binary patch delta 33 rcmV++0N($W1(pSnm;|+-GP$vw=>ZX4X3!i(r8^2C7^<}Y(<%#i>u(L- delta 33 pcmbQnI*oP043<32Sf7n^UNQ4a diff --git a/app/build.gradle b/app/build.gradle index 91782cbe..f8735375 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.gmeremit.online.gmeremittance_native" minSdkVersion 18 targetSdkVersion 28 - versionCode 11 - versionName "2.1.0" + versionCode 12 + versionName "2.1.1" multiDexEnabled true vectorDrawables.useSupportLibrary = true 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 aee10cd1..7673e221 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,12 +46,11 @@ public class SplashScreenPresenter extends BasePresenter implements SplashScreen e.printStackTrace(); isSafe = false; } - return true; + return isSafe; } private boolean hasRootAccess() { -// return rootBeer.isRootedWithoutBusyBoxCheck(); - return false; + return rootBeer.isRootedWithoutBusyBoxCheck(); } @Override