IME-LONDON
/
Android_London
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'external/dev' into new_design

new_design
Mohan Shiwakoti 1 year ago
parent
fefd9d54c7 b3c694b2fa
commit
84f7db15c6
20 changed files with 135 additions and 96 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 66
      app/build.gradle
  2. 17
      app/src/main/java/com/remit/jmecustomer/features/changetxnpin/presenter/ChangePinV2Presenter.java
  3. 7
      app/src/main/java/com/remit/jmecustomer/features/changetxnpin/view/ChangeTxnPinActivity.java
  4. 57
      app/src/main/java/com/remit/jmecustomer/features/home/presenter/HomeNotificationHandler.java
  5. 1
      app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/gateway/KYCV3Gateway.java
  6. 31
      app/src/main/java/com/remit/jmecustomer/features/newkyc/existingCustomer/presenter/ExistingKYCV4PresenterInterface.java
  7. 10
      app/src/main/java/com/remit/jmecustomer/features/newkyc/existingCustomer/presenter/ExistingKYCV4ViewModel.java
  8. 5
      app/src/main/java/com/remit/jmecustomer/features/newkyc/existingCustomer/view/documents/ExistingKYCIDTypeFragment.java
  9. 2
      app/src/main/java/com/remit/jmecustomer/features/newkyc/existingCustomer/view/termsAndConditions/ExistingKycTermsAndConditionFragment.java
  10. 2
      app/src/main/java/com/remit/jmecustomer/features/newkyc/newCustomer/presenter/KYCV4PresenterInterface.java
  11. 10
      app/src/main/java/com/remit/jmecustomer/features/newkyc/newCustomer/presenter/KYCV4ViewModel.java
  12. 4
      app/src/main/java/com/remit/jmecustomer/features/newkyc/newCustomer/view/documents/KYCIDTypeFragment.java
  13. 2
      app/src/main/java/com/remit/jmecustomer/features/newkyc/newCustomer/view/termsAndCondition/NewKycTermsAndConditionFragment.java
  14. 2
      app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/utils/EditTextConfigurationFactory.java
  15. 2
      app/src/main/res/values-bn/strings.xml
  16. 2
      app/src/main/res/values-ja/strings.xml
  17. 2
      app/src/main/res/values-ne/strings.xml
  18. 2
      app/src/main/res/values-si/strings.xml
  19. 3
      app/src/main/res/values-vi/strings.xml
  20. 4
      app/src/main/res/values/strings.xml

66
app/build.gradle
View File

@ -1,4 +1,3 @@
apply plugin: 'com.android.application'
apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.firebase.crashlytics'
@ -6,17 +5,14 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'
android {
compileSdkVersion 31
defaultConfig {
applicationId "com.remit.jmecustomer"
minSdkVersion 24
targetSdkVersion 31
versionCode 13
versionName "1.0"
versionCode 14
versionName "1.1"
multiDexEnabled true
vectorDrawables.useSupportLibrary = true
manifestPlaceholders = [fileProvider: "com.remit.jmecustomer.fileprovider"]
@ -76,11 +72,12 @@ android {
buildConfigField 'String', 'SecretKey', '"VkYp3s6v"'
// TrustDock
buildConfigField 'String', 'TrustDockAuthorizationId', '"gC8ULGtvqiwkMqTx4NzQexLL"'
buildConfigField 'String', 'ResidenceCardWithNFCPlanId', '"b1da18ee-fabe-42f0-b7f6-0d375e1f505d"'
buildConfigField 'String', 'SelfieVerificationPlanId', '"ee46f7fd-3988-49cd-a972-1056e498302f"'
buildConfigField 'String', 'ResidenceCardWithoutNFCPlanId', '"9390019a-d41f-42a8-b044-0f41a9825847"'
buildConfigField 'String', 'DrivingLicenseWithoutNFCPlanId', '"f8d1f271-7c95-43bf-bdf8-f84ebe96671d"'
buildConfigField 'String', 'TrustDockVerificationUrl', '"https://api.trustdock.io/v2/verifications?Authorization="'
buildConfigField 'String', 'TrustDockNativeAppSdkToken', '"KYyzZzDyneU6P9CTe8ZaveyK"'
buildConfigField 'String', 'ResidenceCardWithNFCPlanId', '"17f3f05f-f436-41f0-8b1c-434ee2b5e6ec"'
buildConfigField 'String', 'SelfieVerificationPlanId', '"295735e5-022b-44b8-8c35-59604c425daa"'
buildConfigField 'String', 'ResidenceCardWithoutNFCPlanId', '"039cfef5-0248-44c4-8464-25baef241f05"'
buildConfigField 'String', 'DrivingLicenseWithNFCPlanId', '"6eaba29b-3f40-469d-9a7e-afb33252b10e"'
buildConfigField 'String', 'TrustDockVerificationUrl', '"https://api.trustdock.io/v2/verifications"'
//
debuggable false
minifyEnabled true
@ -129,7 +126,7 @@ android {
}
jme {
signingConfig signingConfigs.debug
// buildConfigField 'String', 'BASE_URL', '"http://202.166.220.36:8083/api/"'
// buildConfigField 'String', 'BASE_URL', '"http://202.166.220.36:8083/api/"'
buildConfigField 'String', 'BASE_URL', '"https://sandboxapi.japanremit.com:8083/api/"'
buildConfigField 'String', 'API_VERSION', '"v1"'
buildConfigField 'String', 'BASE_URL_SOCIAL', '"http://10.1.1.171:8080/v1/"'
@ -138,19 +135,21 @@ android {
buildConfigField 'String', 'SecretKey', '"QRK2UM0Q"'
// TrustDock
// UAT
buildConfigField 'String', 'TrustDockAuthorizationId', '"SC5ra2f1GDqMaAVZX289bpuH"'
buildConfigField 'String', 'ResidenceCardWithNFCPlanId', '"b1da18ee-fabe-42f0-b7f6-0d375e1f505d"'
buildConfigField 'String', 'SelfieVerificationPlanId', '"ee46f7fd-3988-49cd-a972-1056e498302f"'
buildConfigField 'String', 'ResidenceCardWithoutNFCPlanId', '"9390019a-d41f-42a8-b044-0f41a9825847"'
buildConfigField 'String', 'DrivingLicenseWithNFCPlanId', '"f8d1f271-7c95-43bf-bdf8-f84ebe96671d"'
buildConfigField 'String', 'TrustDockVerificationUrl', '"https://api.test.trustdock.io/v2/verifications?Authorization="'
// buildConfigField 'String', 'TrustDockAuthorizationId', '"SC5ra2f1GDqMaAVZX289bpuH"'
// buildConfigField 'String', 'TrustDockNativeAppSdkToken', '"rbTme8F4whfAZBuSQcN5gUXr"'
// buildConfigField 'String', 'ResidenceCardWithNFCPlanId', '"b1da18ee-fabe-42f0-b7f6-0d375e1f505d"'
// buildConfigField 'String', 'SelfieVerificationPlanId', '"ee46f7fd-3988-49cd-a972-1056e498302f"'
// buildConfigField 'String', 'ResidenceCardWithoutNFCPlanId', '"9390019a-d41f-42a8-b044-0f41a9825847"'
// buildConfigField 'String', 'DrivingLicenseWithNFCPlanId', '"f8d1f271-7c95-43bf-bdf8-f84ebe96671d"'
// buildConfigField 'String', 'TrustDockVerificationUrl', '"https://api.test.trustdock.io/v2/verifications"'
// PROD
// buildConfigField 'String', 'TrustDockAuthorizationId', '"gC8ULGtvqiwkMqTx4NzQexLL"'
// buildConfigField 'String', 'ResidenceCardWithNFCPlanId', '"17f3f05f-f436-41f0-8b1c-434ee2b5e6ec"'
// buildConfigField 'String', 'SelfieVerificationPlanId', '"295735e5-022b-44b8-8c35-59604c425daa"'
// buildConfigField 'String', 'ResidenceCardWithoutNFCPlanId', '"039cfef5-0248-44c4-8464-25baef241f05"'
// buildConfigField 'String', 'DrivingLicenseWithNFCPlanId', '"6eaba29b-3f40-469d-9a7e-afb33252b10e"'
// buildConfigField 'String', 'TrustDockVerificationUrl', '"https://api.trustdock.io/v2/verifications?Authorization="'
buildConfigField 'String', 'TrustDockAuthorizationId', '"gC8ULGtvqiwkMqTx4NzQexLL"'
buildConfigField 'String', 'TrustDockNativeAppSdkToken', '"KYyzZzDyneU6P9CTe8ZaveyK"'
buildConfigField 'String', 'ResidenceCardWithNFCPlanId', '"17f3f05f-f436-41f0-8b1c-434ee2b5e6ec"'
buildConfigField 'String', 'SelfieVerificationPlanId', '"295735e5-022b-44b8-8c35-59604c425daa"'
buildConfigField 'String', 'ResidenceCardWithoutNFCPlanId', '"039cfef5-0248-44c4-8464-25baef241f05"'
buildConfigField 'String', 'DrivingLicenseWithNFCPlanId', '"6eaba29b-3f40-469d-9a7e-afb33252b10e"'
buildConfigField 'String', 'TrustDockVerificationUrl', '"https://api.trustdock.io/v2/verifications"'
//
debuggable true
minifyEnabled false
@ -245,14 +244,12 @@ dependencies {
implementation 'androidx.biometric:biometric:1.1.0'
implementation 'io.trustdock.sdk:verification-sandbox-full:2.7.2'
//implementation 'io.trustdock.sdk:verification-sandbox-full:2.7.2'
implementation 'io.trustdock.sdk:verification-full:2.7.4'
implementation 'com.google.android.flexbox:flexbox:3.0.0'
implementation 'me.relex:circleindicator:2.1.4'
// if persistence is not needed (Data retained in memory lost on app close)
debugImplementation 'com.ashokvarma.android:gander-imdb:3.1.0'
releaseImplementation 'com.ashokvarma.android:gander-no-op:3.1.0'
@ -261,11 +258,18 @@ dependencies {
allprojects {
repositories {
maven {
url "https://native-app-sdk-repository.test.trustdock.io/android/release/content/repositories"
//PROD
url "https://native-app-sdk-repository.trustdock.io/android/release/content/repositories"
credentials {
username = "japanremit-1039"
password = "sHRf5Sf7S3r5Q4Hz"
password = "9sAWcB6ce3GSumTT"
}
//UAT
// url "https://native-app-sdk-repository.test.trustdock.io/android/release/content/repositories"
// credentials {
// username = "japanremit-1039"
// password = "sHRf5Sf7S3r5Q4Hz"
// }
}
maven { url 'https://raw.githubusercontent.com/iProov/android/master/maven/' }
}

17
app/src/main/java/com/remit/jmecustomer/features/changetxnpin/presenter/ChangePinV2Presenter.java
View File

@ -1,7 +1,9 @@
package com.remit.jmecustomer.features.changetxnpin.presenter;
import com.remit.jmecustomer.R;
import com.remit.jmecustomer.RemitApplication;
import com.remit.jmecustomer.base.BaseViewModel;
import com.remit.jmecustomer.base.PrefKeys;
import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog;
import com.remit.jmecustomer.common.model.FormInputStateDTO;
import com.remit.jmecustomer.utils.Constants;
@ -44,11 +46,11 @@ public class ChangePinV2Presenter extends BaseViewModel implements ChangePinV2In
private void bindView(ChangePinLiveData.ChangePinViewBindings viewBindings) {
viewEventCompositeDisposable.add(
Observable.combineLatest(
viewBindings.getCurrentPinInputLiveData().map(this.changePinValidator::isCurrentPinValid),
viewBindings.getNewPinInputLiveData().map(this.changePinValidator::isNewPinValid),
viewBindings.getConfirmPinInputLiveData().map(this.changePinValidator::isConfirmPinValid),
(isCurrentPassValid, isNewPasswordValid, isConfirmPasswordValid) ->
isCurrentPassValid && isNewPasswordValid && isConfirmPasswordValid)
viewBindings.getCurrentPinInputLiveData().map(this.changePinValidator::isCurrentPinValid),
viewBindings.getNewPinInputLiveData().map(this.changePinValidator::isNewPinValid),
viewBindings.getConfirmPinInputLiveData().map(this.changePinValidator::isConfirmPinValid),
(isCurrentPassValid, isNewPasswordValid, isConfirmPasswordValid) ->
isCurrentPassValid && isNewPasswordValid && isConfirmPasswordValid)
.subscribeWith(new DisposableObserver<Boolean>() {
@Override
public void onNext(Boolean result) {
@ -91,12 +93,13 @@ public class ChangePinV2Presenter extends BaseViewModel implements ChangePinV2In
@Override
public boolean validateAllChangePinForm() {
String hasUpdatedCredentials = RemitApplication.getStorage().getString(PrefKeys.HAS_UPDATED_CREDENTIALS, "0");
if (
changePinValidator.isCurrentPinValid(changePinValidator.currentPin)
(hasUpdatedCredentials.equalsIgnoreCase("5") || changePinValidator.isCurrentPinValid(changePinValidator.currentPin))
&& changePinValidator.isNewPinValid(changePinValidator.newPin)
&& changePinValidator.isConfirmPinValid(changePinValidator.confirmPin)
) {
return true;
return true;
}
return false;
}

7
app/src/main/java/com/remit/jmecustomer/features/changetxnpin/view/ChangeTxnPinActivity.java
View File

@ -10,6 +10,8 @@ import androidx.lifecycle.ViewModelProvider;
import com.google.android.material.textfield.TextInputEditText;
import com.google.android.material.textfield.TextInputLayout;
import com.jakewharton.rxbinding3.widget.RxTextView;
import com.remit.jmecustomer.RemitApplication;
import com.remit.jmecustomer.base.PrefKeys;
import com.remit.jmecustomer.features.changetxnpin.presenter.ChangePinLiveData;
import com.remit.jmecustomer.features.changetxnpin.presenter.ChangePinV2Presenter;
import com.remit.jmecustomer.features.changetxnpin.presenter.ChangePinV2PresenterInterface;
@ -128,6 +130,11 @@ public class ChangeTxnPinActivity extends BaseActivity implements ChangePinV2Pre
toolbarTitle.setText(getResources().getString(R.string.changepin_text));
iv_cancel.setVisibility(View.INVISIBLE);
}
String hasUpdatedCredentials = RemitApplication.getStorage().getString(PrefKeys.HAS_UPDATED_CREDENTIALS, "0");
if(hasUpdatedCredentials.equalsIgnoreCase("5")){
currentPin_TxtInputLayout.setVisibility(View.GONE);
toolbarTitle.setText(getResources().getString(R.string.setup_new_pin_title));
}
}
@OnClick(R.id.iv_back)

57
app/src/main/java/com/remit/jmecustomer/features/home/presenter/HomeNotificationHandler.java
View File

@ -1,5 +1,6 @@
package com.remit.jmecustomer.features.home.presenter;
import com.remit.jmecustomer.base.PrefKeys;
import com.remit.jmecustomer.features.home.view.HomeFragmentV2;
import com.remit.jmecustomer.R;
import com.remit.jmecustomer.RemitApplication;
@ -53,49 +54,51 @@ public class HomeNotificationHandler {
this.stringExtractor = stringExtractor;
}
public static HomeNotificationViewDTO generateNotificationFromType(RemitApplication.StringExtractor stringExtractor, HomeNoticeViewTypeEnum type, String redirectTo,String residenceType) {
return new HomeNotificationHandler(stringExtractor).generateHomeNotificationViewExplicitlyFromType(type, redirectTo,residenceType);
public static HomeNotificationViewDTO generateNotificationFromType(RemitApplication.StringExtractor stringExtractor, HomeNoticeViewTypeEnum type, String redirectTo, String residenceType) {
return new HomeNotificationHandler(stringExtractor).generateHomeNotificationViewExplicitlyFromType(type, redirectTo, residenceType);
}
private HomeNotificationViewDTO generateHomeNotificationViewExplicitlyFromType(HomeNoticeViewTypeEnum type, String redirectTo,String residenceType) {
private HomeNotificationViewDTO generateHomeNotificationViewExplicitlyFromType(HomeNoticeViewTypeEnum type, String redirectTo, String residenceType) {
switch (type) {
case KYC_NOT_SUBMITTED:
HomeNotificationViewDTO kycNotSubmittedNotificationViewDTO = new HomeNotificationViewDTO(stringExtractor.getStringFromStringId(R.string.kyc_fill_text), stringExtractor.getStringFromStringId(R.string.complete_your_registration_text), isExistingCustomer, HomeNoticeViewTypeEnum.KYC_NOT_SUBMITTED, hasUpdatedDefaultCredentials, redirectTo,residenceType);
HomeNotificationViewDTO kycNotSubmittedNotificationViewDTO = new HomeNotificationViewDTO(stringExtractor.getStringFromStringId(R.string.kyc_fill_text), stringExtractor.getStringFromStringId(R.string.complete_your_registration_text), isExistingCustomer, HomeNoticeViewTypeEnum.KYC_NOT_SUBMITTED, hasUpdatedDefaultCredentials, redirectTo, residenceType);
kycNotSubmittedNotificationViewDTO.setFocused(true);
return kycNotSubmittedNotificationViewDTO;
case TERMSNOTACCEPTED:
HomeNotificationViewDTO termsNotAcceptedNotificationViewDTO = new HomeNotificationViewDTO(stringExtractor.getStringFromStringId(R.string.terms_and_condition_title_text), stringExtractor.getStringFromStringId(R.string.terms_not_accepted_text), isExistingCustomer, HomeNoticeViewTypeEnum.TERMSNOTACCEPTED, hasUpdatedDefaultCredentials, redirectTo,residenceType);
HomeNotificationViewDTO termsNotAcceptedNotificationViewDTO = new HomeNotificationViewDTO(stringExtractor.getStringFromStringId(R.string.terms_and_condition_title_text), stringExtractor.getStringFromStringId(R.string.terms_not_accepted_text), isExistingCustomer, HomeNoticeViewTypeEnum.TERMSNOTACCEPTED, hasUpdatedDefaultCredentials, redirectTo, residenceType);
termsNotAcceptedNotificationViewDTO.setFocused(true);
return termsNotAcceptedNotificationViewDTO;
case KYC_NOT_VERIFIED:
return new HomeNotificationViewDTO(stringExtractor.getStringFromStringId(R.string.kyc_verify_pending_text), stringExtractor.getStringFromStringId(R.string.verification_in_aproval_process_text), isExistingCustomer, HomeNoticeViewTypeEnum.KYC_NOT_VERIFIED, hasUpdatedDefaultCredentials, redirectTo,residenceType);
return new HomeNotificationViewDTO(stringExtractor.getStringFromStringId(R.string.kyc_verify_pending_text), stringExtractor.getStringFromStringId(R.string.verification_in_aproval_process_text), isExistingCustomer, HomeNoticeViewTypeEnum.KYC_NOT_VERIFIED, hasUpdatedDefaultCredentials, redirectTo, residenceType);
case CHANGE_TXN_PIN:
HomeNotificationViewDTO changeTxnPinNotificationViewDTO = new HomeNotificationViewDTO(stringExtractor.getStringFromStringId(R.string.change_txn_pin), stringExtractor.getStringFromStringId(R.string.change_txn_pin_detail), isExistingCustomer, HomeNoticeViewTypeEnum.CHANGE_TXN_PIN, hasUpdatedDefaultCredentials, redirectTo,residenceType);
case CHANGE_TXN_PIN: {
String hasUpdatedCredentials = RemitApplication.getStorage().getString(PrefKeys.HAS_UPDATED_CREDENTIALS, "0");
HomeNotificationViewDTO changeTxnPinNotificationViewDTO = new HomeNotificationViewDTO(stringExtractor.getStringFromStringId(hasUpdatedCredentials.equalsIgnoreCase("5") ? R.string.setup_new_pin_title : R.string.change_txn_pin), stringExtractor.getStringFromStringId(R.string.change_txn_pin_detail), isExistingCustomer, HomeNoticeViewTypeEnum.CHANGE_TXN_PIN, hasUpdatedDefaultCredentials, redirectTo, residenceType);
changeTxnPinNotificationViewDTO.setFocused(true);
return changeTxnPinNotificationViewDTO;
case CHANGE_PIN:
HomeNotificationViewDTO changePinNotificationViewDTO = new HomeNotificationViewDTO(stringExtractor.getStringFromStringId(R.string.change_txn_pin), stringExtractor.getStringFromStringId(R.string.change_txn_pin_detail1), isExistingCustomer, HomeNoticeViewTypeEnum.CHANGE_PIN, hasUpdatedDefaultCredentials, redirectTo,residenceType);
}
case CHANGE_PIN: {
String hasUpdatedCredentials = RemitApplication.getStorage().getString(PrefKeys.HAS_UPDATED_CREDENTIALS, "0");
HomeNotificationViewDTO changePinNotificationViewDTO = new HomeNotificationViewDTO(stringExtractor.getStringFromStringId(hasUpdatedCredentials.equalsIgnoreCase("5") ? R.string.setup_new_pin_title : R.string.change_txn_pin), stringExtractor.getStringFromStringId(hasUpdatedCredentials.equalsIgnoreCase("5") ? R.string.setup_new_pin_body : R.string.change_txn_pin_detail1), isExistingCustomer, HomeNoticeViewTypeEnum.CHANGE_PIN, hasUpdatedDefaultCredentials, redirectTo, residenceType);
changePinNotificationViewDTO.setFocused(true);
return changePinNotificationViewDTO;
}
case CHANGE_TXN_PIN_N_PASS:
HomeNotificationViewDTO changeTxnPinNPassNotificationViewDTO = new HomeNotificationViewDTO(stringExtractor.getStringFromStringId(R.string.change_txn_pin_n_pass), stringExtractor.getStringFromStringId(R.string.change_txn_pin_n_pass_detail), isExistingCustomer, HomeNoticeViewTypeEnum.CHANGE_TXN_PIN_N_PASS, hasUpdatedDefaultCredentials, redirectTo,residenceType);
HomeNotificationViewDTO changeTxnPinNPassNotificationViewDTO = new HomeNotificationViewDTO(stringExtractor.getStringFromStringId(R.string.change_txn_pin_n_pass), stringExtractor.getStringFromStringId(R.string.change_txn_pin_n_pass_detail), isExistingCustomer, HomeNoticeViewTypeEnum.CHANGE_TXN_PIN_N_PASS, hasUpdatedDefaultCredentials, redirectTo, residenceType);
changeTxnPinNPassNotificationViewDTO.setFocused(true);
return changeTxnPinNPassNotificationViewDTO;
case CHANGE_TXN_PASS:
HomeNotificationViewDTO changeTxnPassNotificationViewDTO = new HomeNotificationViewDTO(stringExtractor.getStringFromStringId(R.string.change_password_text), stringExtractor.getStringFromStringId(R.string.change_txn_pass_detail), isExistingCustomer, HomeNoticeViewTypeEnum.CHANGE_TXN_PASS, hasUpdatedDefaultCredentials, redirectTo,residenceType);
HomeNotificationViewDTO changeTxnPassNotificationViewDTO = new HomeNotificationViewDTO(stringExtractor.getStringFromStringId(R.string.change_password_text), stringExtractor.getStringFromStringId(R.string.change_txn_pass_detail), isExistingCustomer, HomeNoticeViewTypeEnum.CHANGE_TXN_PASS, hasUpdatedDefaultCredentials, redirectTo, residenceType);
changeTxnPassNotificationViewDTO.setFocused(true);
return changeTxnPassNotificationViewDTO;
case EMAIL_NOT_VERIFIED:
HomeNotificationViewDTO emailNotVerifiedDto = new HomeNotificationViewDTO(stringExtractor.getStringFromStringId(R.string.verify_email_text), stringExtractor.getStringFromStringId(R.string.verify_email_detail_text), isExistingCustomer, HomeNoticeViewTypeEnum.EMAIL_NOT_VERIFIED, hasUpdatedDefaultCredentials, redirectTo,residenceType);
HomeNotificationViewDTO emailNotVerifiedDto = new HomeNotificationViewDTO(stringExtractor.getStringFromStringId(R.string.verify_email_text), stringExtractor.getStringFromStringId(R.string.verify_email_detail_text), isExistingCustomer, HomeNoticeViewTypeEnum.EMAIL_NOT_VERIFIED, hasUpdatedDefaultCredentials, redirectTo, residenceType);
emailNotVerifiedDto.setFocused(true);
return emailNotVerifiedDto;
@ -106,27 +109,29 @@ public class HomeNotificationHandler {
}
public HomeNotificationViewDTO generateAppropriateHomeNotificationViewDTO(String redirectTo,String residenceType) {
return generateAppropriateRegistrationRelatedNotification(redirectTo,residenceType);
public HomeNotificationViewDTO generateAppropriateHomeNotificationViewDTO(String redirectTo, String residenceType) {
return generateAppropriateRegistrationRelatedNotification(redirectTo, residenceType);
}
private HomeNotificationViewDTO generateAppropriateRegistrationRelatedNotification(String redirectTo,String residenceType) {
private HomeNotificationViewDTO generateAppropriateRegistrationRelatedNotification(String redirectTo, String residenceType) {
if (!isEmailVerified)
return generateHomeNotificationViewExplicitlyFromType(HomeNoticeViewTypeEnum.EMAIL_NOT_VERIFIED,redirectTo,residenceType);
return generateHomeNotificationViewExplicitlyFromType(HomeNoticeViewTypeEnum.EMAIL_NOT_VERIFIED, redirectTo, residenceType);
else if (!kycSubmit)
return generateHomeNotificationViewExplicitlyFromType(HomeNoticeViewTypeEnum.KYC_NOT_SUBMITTED,redirectTo,residenceType);
return generateHomeNotificationViewExplicitlyFromType(HomeNoticeViewTypeEnum.KYC_NOT_SUBMITTED, redirectTo, residenceType);
else if (!isTermsAccepted)
return generateHomeNotificationViewExplicitlyFromType(HomeNoticeViewTypeEnum.TERMSNOTACCEPTED,redirectTo,residenceType);
return generateHomeNotificationViewExplicitlyFromType(HomeNoticeViewTypeEnum.TERMSNOTACCEPTED, redirectTo, residenceType);
else if (!isVerified)
return generateHomeNotificationViewExplicitlyFromType(HomeNoticeViewTypeEnum.KYC_NOT_VERIFIED,redirectTo,residenceType);
return generateHomeNotificationViewExplicitlyFromType(HomeNoticeViewTypeEnum.KYC_NOT_VERIFIED, redirectTo, residenceType);
else if (hasUpdatedDefaultCredentials.equals("1"))
return generateHomeNotificationViewExplicitlyFromType(HomeNoticeViewTypeEnum.CHANGE_TXN_PIN,redirectTo,residenceType);
return generateHomeNotificationViewExplicitlyFromType(HomeNoticeViewTypeEnum.CHANGE_TXN_PIN, redirectTo, residenceType);
else if (hasUpdatedDefaultCredentials.equals("2"))
return generateHomeNotificationViewExplicitlyFromType(HomeNoticeViewTypeEnum.CHANGE_TXN_PIN_N_PASS,redirectTo,residenceType);
return generateHomeNotificationViewExplicitlyFromType(HomeNoticeViewTypeEnum.CHANGE_TXN_PIN_N_PASS, redirectTo, residenceType);
else if (hasUpdatedDefaultCredentials.equals("3"))
return generateHomeNotificationViewExplicitlyFromType(HomeNoticeViewTypeEnum.CHANGE_TXN_PASS,redirectTo,residenceType);
return generateHomeNotificationViewExplicitlyFromType(HomeNoticeViewTypeEnum.CHANGE_TXN_PASS, redirectTo, residenceType);
else if (hasUpdatedDefaultCredentials.equals("4"))
return generateHomeNotificationViewExplicitlyFromType(HomeNoticeViewTypeEnum.CHANGE_PIN,redirectTo,residenceType);
return generateHomeNotificationViewExplicitlyFromType(HomeNoticeViewTypeEnum.CHANGE_PIN, redirectTo, residenceType);
else if (hasUpdatedDefaultCredentials.equals("5"))
return generateHomeNotificationViewExplicitlyFromType(HomeNoticeViewTypeEnum.CHANGE_PIN, redirectTo, residenceType);
else
return null;
}

1
app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/gateway/KYCV3Gateway.java
View File

@ -73,6 +73,7 @@ public class KYCV3Gateway extends PrivilegedGateway implements KYCV3GatewayInter
map.put("otherIdType", createStringUploadValue(personalInfoDTO.getOtherIdType()));
map.put("additionalIdType", createStringUploadValue(personalInfoDTO.getAdditionalIdType()));
map.put("purposeOfRegistration", createStringUploadValue(personalInfoDTO.getPurposeOfRegistration()));
map.put("RegistrationType", createStringUploadValue("MKYC"));
}
File faceImageFile = null;

31
app/src/main/java/com/remit/jmecustomer/features/newkyc/existingCustomer/presenter/ExistingKYCV4PresenterInterface.java
View File

@ -13,14 +13,15 @@ import java.util.List;
public interface ExistingKYCV4PresenterInterface extends BasePresenterInterface {
ExistingCustomerDetailViewLiveData getCustomerRelatedViewEvents(ExistingCustomerDetailViewLiveData.CustomerDetailViewBinding viewBindings);
ExistingKYCIDTypeViewLiveData getKYCIdTypeViewEvents(ExistingKYCIDTypeViewLiveData.KYCIDTypeViewBindings viewBindings);
void getKycRelatedData(boolean isKYCSubmitted);
void setNewToken(String newToken);
void termsAndConditionAccept();
void termsAndConditionAccept(Boolean agree);
boolean getBackAdditionalRequired();
@ -28,14 +29,18 @@ public interface ExistingKYCV4PresenterInterface extends BasePresenterInterface
boolean validateAllDetailForm();
List<ExistingIDTextDTO> getOccupationList();
List<ExistingIDTextDTO> getSourceOfFundList();
List<ExistingIDTextDTO> getMonthlyIncomeList();
List<ExistingIDTextDTO> getBusinessTypeList();
List<ExistingIDTextDTO> getPurposeOfRegistrationList();
List<ExistingIDTextDTO> getIdTypeList();
List<ExistingIDTextDTO> getVisaStatusList();
void sendFullKYCDataUpdate();
@ -44,35 +49,29 @@ public interface ExistingKYCV4PresenterInterface extends BasePresenterInterface
void kycSubmitSucessForPopUp();
interface KYCV3ViewContractInterface extends BaseContractInterface
{
KYCV3CustomerDetailViewContractInterface getCustomerDetailViewContract();
interface KYCV3ViewContractInterface extends BaseContractInterface {
KYCV3CustomerDetailViewContractInterface getCustomerDetailViewContract();
void onTermsPostSuccess();
/**
* Lazy load kyc related form when all related data are available.
*/
void lazyLoadForms();
void showDocumentDetailForm();
void showTermsAndCondition();
void promptToInputAnswer(String question, AnswerInputDialog.AnswerInputDialogListener listener);
void showTermsAndCondition();
void promptToInputAnswer(String question, AnswerInputDialog.AnswerInputDialogListener listener);
interface KYCV3CustomerDetailViewContractInterface extends BaseContractInterface
{
}
interface KYCV3CustomerDetailViewContractInterface extends BaseContractInterface {
}
}

10
app/src/main/java/com/remit/jmecustomer/features/newkyc/existingCustomer/presenter/ExistingKYCV4ViewModel.java
View File

@ -428,9 +428,9 @@ public class ExistingKYCV4ViewModel extends BaseViewModel implements ExistingKYC
}
@Override
public void termsAndConditionAccept() {
public void termsAndConditionAccept(Boolean agree) {
this.compositeDisposable.add(
this.gateway.agreeToUserTermsAndConditions(this.gateway.getBasicAuth(view.getContext()), this.gateway.getUserID(), "Y")
this.gateway.agreeToUserTermsAndConditions(this.gateway.getBasicAuth(view.getContext()), this.gateway.getUserID(), agree ? "Y" : "N")
.doOnSubscribe(sub -> view.showProgressBar(true, ""))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
@ -1017,7 +1017,7 @@ public class ExistingKYCV4ViewModel extends BaseViewModel implements ExistingKYC
public void requestWithSomeHttpHeaders(List<TrustdockPlan> plan) {
RequestQueue queue = Volley.newRequestQueue(view.getContext());
String url = BuildConfig.TrustDockVerificationUrl + BuildConfig.TrustDockAuthorizationId;
String url = BuildConfig.TrustDockVerificationUrl;
JsonObjectRequest getRequest = new JsonObjectRequest(Request.Method.POST, url, null,
new Response.Listener<JSONObject>() {
@Override
@ -1025,7 +1025,7 @@ public class ExistingKYCV4ViewModel extends BaseViewModel implements ExistingKYC
try {
String publicKey = response.getString("public_id");
//setupPlans()
String nativeAppSdkToken = "rbTme8F4whfAZBuSQcN5gUXr";
String nativeAppSdkToken = BuildConfig.TrustDockNativeAppSdkToken;
TrustdockVerificationParams param = new TrustdockVerificationParams(
publicKey,
nativeAppSdkToken,
@ -1048,7 +1048,7 @@ public class ExistingKYCV4ViewModel extends BaseViewModel implements ExistingKYC
@Override
public Map<String, String> getHeaders() throws AuthFailureError {
Map<String, String> params = new HashMap<String, String>();
params.put("Authorization", "Bearer SC5ra2f1GDqMaAVZX289bpuH");
params.put("Authorization", "Bearer " + BuildConfig.TrustDockAuthorizationId);
return params;
}
};

5
app/src/main/java/com/remit/jmecustomer/features/newkyc/existingCustomer/view/documents/ExistingKYCIDTypeFragment.java
View File

@ -279,7 +279,10 @@ public class ExistingKYCIDTypeFragment extends BaseFragment {
String selectedNationality = RemitApplication.getStorage().getString(PrefKeys.SELECTED_NATIONALITY, "");
if (isNoNFC && selectedNationality.equalsIgnoreCase(FOREIGNER_TYPE))
openTrustDockSDK(true);
else startActivity(new Intent(getContext(), HomeActivityV2.class));
else {
kycv4ViewModel.termsAndConditionAccept(false);
startActivity(new Intent(getContext(), HomeActivityV2.class));
}
dialog.dismiss();
}
});

2
app/src/main/java/com/remit/jmecustomer/features/newkyc/existingCustomer/view/termsAndConditions/ExistingKycTermsAndConditionFragment.java
View File

@ -30,7 +30,7 @@ public class ExistingKycTermsAndConditionFragment extends WebBrowserFragmentV2 {
@Override
protected void proceedButtonClicked() {
kycv3ViewModel.termsAndConditionAccept();
kycv3ViewModel.termsAndConditionAccept(true);
}
@Override

2
app/src/main/java/com/remit/jmecustomer/features/newkyc/newCustomer/presenter/KYCV4PresenterInterface.java
View File

@ -51,7 +51,7 @@ public interface KYCV4PresenterInterface extends BasePresenterInterface {
void kycSubmitSuccessForPopUp();
void termsAndConditionAccept();
void termsAndConditionAccept(Boolean agree);
interface KYCV3ViewContractInterface extends BaseContractInterface {

10
app/src/main/java/com/remit/jmecustomer/features/newkyc/newCustomer/presenter/KYCV4ViewModel.java
View File

@ -740,9 +740,9 @@ public class KYCV4ViewModel extends BaseViewModel implements KYCV4PresenterInter
}
@Override
public void termsAndConditionAccept() {
public void termsAndConditionAccept(Boolean agree) {
this.compositeDisposable.add(
this.gateway.agreeToUserTermsAndConditions(this.gateway.getBasicAuth(view.getContext()), this.gateway.getUserID(), "Y")
this.gateway.agreeToUserTermsAndConditions(this.gateway.getBasicAuth(view.getContext()), this.gateway.getUserID(), agree ? "Y" : "N")
.doOnSubscribe(sub -> view.showProgressBar(true, ""))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
@ -1295,7 +1295,7 @@ public class KYCV4ViewModel extends BaseViewModel implements KYCV4PresenterInter
public void requestWithSomeHttpHeaders(List<TrustdockPlan> plan) {
RequestQueue queue = Volley.newRequestQueue(view.getContext());
String url = BuildConfig.TrustDockVerificationUrl + BuildConfig.TrustDockAuthorizationId;
String url = BuildConfig.TrustDockVerificationUrl;
JsonObjectRequest getRequest = new JsonObjectRequest(Request.Method.POST, url, null,
new Response.Listener<JSONObject>() {
@Override
@ -1304,7 +1304,7 @@ public class KYCV4ViewModel extends BaseViewModel implements KYCV4PresenterInter
String publicKey = response.getString("public_id");
trustDockId = response.getString("id");
//setupPlans()
String nativeAppSdkToken = "rbTme8F4whfAZBuSQcN5gUXr";
String nativeAppSdkToken = BuildConfig.TrustDockNativeAppSdkToken;
TrustdockVerificationParams param = new TrustdockVerificationParams(
publicKey,
nativeAppSdkToken,
@ -1327,7 +1327,7 @@ public class KYCV4ViewModel extends BaseViewModel implements KYCV4PresenterInter
@Override
public Map<String, String> getHeaders() throws AuthFailureError {
Map<String, String> params = new HashMap<String, String>();
params.put("Authorization", "Bearer SC5ra2f1GDqMaAVZX289bpuH");
params.put("Authorization", "Bearer " + BuildConfig.TrustDockAuthorizationId);
return params;
}
};

4
app/src/main/java/com/remit/jmecustomer/features/newkyc/newCustomer/view/documents/KYCIDTypeFragment.java
View File

@ -309,8 +309,10 @@ public class KYCIDTypeFragment extends BaseFragment implements KYCV4PresenterInt
String selectedNationality = RemitApplication.getStorage().getString(PrefKeys.SELECTED_NATIONALITY, "");
if (isNoNFC && selectedNationality.equalsIgnoreCase(FOREIGNER_TYPE))
openTrustDockSDK(true);
else
else {
kycv4ViewModel.termsAndConditionAccept(false);
startActivity(new Intent(getContext(), HomeActivityV2.class));
}
dialog.dismiss();
}
});

2
app/src/main/java/com/remit/jmecustomer/features/newkyc/newCustomer/view/termsAndCondition/NewKycTermsAndConditionFragment.java
View File

@ -39,7 +39,7 @@ public class NewKycTermsAndConditionFragment extends WebBrowserFragmentV2 {
}
@Override
protected void proceedButtonClicked() {
kycv4ViewModel.termsAndConditionAccept();
kycv4ViewModel.termsAndConditionAccept(true);
}
@Override

2
app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/utils/EditTextConfigurationFactory.java
View File

@ -25,7 +25,7 @@ public class EditTextConfigurationFactory {
return new EditTextConfiguration(InputType.TYPE_CLASS_TEXT, isLocalKeyboardAllowed, "^[\\x00-\\x7A]+$", maxLength);
case "ANW":
return new EditTextConfiguration(InputType.TYPE_CLASS_TEXT, isLocalKeyboardAllowed, "^[a-zA-Z0-9]*$\n", maxLength);
return new EditTextConfiguration(InputType.TYPE_CLASS_TEXT, isLocalKeyboardAllowed, "^[a-zA-Z0-9]*$", maxLength);
default:
return new EditTextConfiguration(InputType.TYPE_CLASS_TEXT, true, null, maxLength);

2
app/src/main/res/values-bn/strings.xml
View File

@ -85,6 +85,8 @@
<string name="changepin_text">পিন নম্বর পরিবর্তন করুণ</string>
<string name="new_pin_error_text">পিন নম্বর অবশ্যই ৬ সংখ্যার হতে হবে</string>
<string name="cancel_text">বাতিল করুন</string>
<string name="setup_new_pin_title">লেনদেন পিন সেটআপ করুন</string>
<string name="setup_new_pin_body">নতুন লেনদেন পিন সেটআপ করতে এখানে ক্লিক করুন</string>
<!--Customer Support-->
<string name="help_you_text">আপনার সহযোগিতার জন্য আমরা আছি ( সকাল ৯টা থেকে রাত ১২ টা )</string>

2
app/src/main/res/values-ja/strings.xml
View File

@ -82,6 +82,8 @@
<string name="changepin_text">PINの変更</string>
<string name="new_pin_error_text">PINは6桁の数字でお願いします。</string>
<string name="cancel_text">キャンセル</string>
<string name="setup_new_pin_title">取引暗証番号の設定</string>
<string name="setup_new_pin_body">新しいトランザクション PIN を設定するには、ここをクリックしてください</string>
<!--Customer Support-->
<string name="help_you_text">お困りの際はいつでもサポート致します（受付時間 09:30～18:30）。</string>

2
app/src/main/res/values-ne/strings.xml
View File

@ -82,6 +82,8 @@
<string name="changepin_text">PIN परिवर्तन गर्नुहोस्</string>
<string name="new_pin_error_text">PIN 6 अंकको हुनुपर्दछ</string>
<string name="cancel_text">रद्द गर्नुहोस्</string>
<string name="setup_new_pin_title">PIN सेटअप गर्नुहोस्</string>
<string name="setup_new_pin_body">कृपया नयाँ पिन सेटअप गर्न यहाँ क्लिक गर्नुहोस्</string>
<!--Customer Support-->
<string name="help_you_text">यहाँको सेवाको लागी हामी बिहान ९:३० देखी साझ ६:३० सम्म हरेक दिन उपलब्ध छौं </string>

2
app/src/main/res/values-si/strings.xml
View File

@ -85,6 +85,8 @@
<string name="changepin_text">රහස් අංකය වෙනස් කරන්න</string>
<string name="new_pin_error_text">රහස් අංකය ඉලක්කම් 6ක් විය යුතුය</string>
<string name="cancel_text">අවලංගු කරන්න</string>
<string name="setup_new_pin_title">ගනුදෙනු PIN සකසන්න</string>
<string name="setup_new_pin_body">කරුණාකර නව ගනුදෙනු පින් පිහිටුවීමට මෙතන ක්ලික් කරන්න</string>
<!--Customer Support-->
<string name="help_you_text">ඔබට සහායවීමට අපි සැමවිටම මෙහි සිටින්නෙමු (9.30 සිට 18.30 දක්වා)</string>

3
app/src/main/res/values-vi/strings.xml
View File

@ -83,6 +83,9 @@
<string name="changepin_text">Thay đổi pin</string>
<string name="new_pin_error_text">Pin phải có 6 chữ số</string>
<string name="cancel_text">Hủy</string>
<string name="setup_new_pin_title">Thiết lập mã PIN giao dịch</string>
<string name="setup_new_pin_body">Vui lòng nhấp vào đây để thiết lập Pin giao dịch mới</string>
<!--Customer Support-->
<string name="help_you_text">Chúng tôi sẵn sàng trợ giúp bạn (Thời gian làm việc 9:30 – 18:30)</string>

4
app/src/main/res/values/strings.xml
View File

@ -106,6 +106,10 @@
<string name="changepin_text">Change PIN</string>
<string name="new_pin_error_text">PIN should be 6 digit number</string>
<string name="cancel_text">Cancel</string>
<string name="setup_new_pin_title">Setup Transaction PIN</string>
<string name="setup_new_pin_body">Please click here to setup new Transaction Pin</string>
<!--Customer Support-->
<string name="help_you_text">We are here to help you \n (Available time 09:30 AM - 06:30 PM)</string>

Write Preview
Loading…
Cancel
Save