From 81149f3b66a457024b4652beea00d0b44f5ff1af Mon Sep 17 00:00:00 2001 From: ritish099 Date: Sat, 2 Jan 2021 11:59:01 +0530 Subject: [PATCH] Fix #1091: Extra Country Checker Code creating bugs --- .../ui/MobileVerificationActivity.java | 5 +---- .../layout/activity_mobile_verification.xml | 18 +----------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/registration/ui/MobileVerificationActivity.java b/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/registration/ui/MobileVerificationActivity.java index ad64117c4..601350755 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/registration/ui/MobileVerificationActivity.java +++ b/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/registration/ui/MobileVerificationActivity.java @@ -47,8 +47,6 @@ public class MobileVerificationActivity extends BaseActivity implements ProgressBar mProgressBar; @BindView(R.id.tv_verifying_otp) TextView mTvVerifyingOtp; - @BindView(R.id.ccp_country) - CountryCodePicker mCcpCountry; @Override protected void onCreate(Bundle savedInstanceState) { @@ -63,7 +61,6 @@ protected void onCreate(Bundle savedInstanceState) { showColoredBackButton(Constants.WHITE_BACK_BUTTON); mCcpCode.registerCarrierNumberEditText(mEtMobileNumber); - mCcpCountry.setCustomMasterCountries(null); } @Override @@ -148,7 +145,7 @@ public void onOtpVerificationSuccess() { intent.putExtra(Constants.GOOGLE_GIVEN_NAME, getIntent().getStringExtra(Constants.GOOGLE_GIVEN_NAME)); - intent.putExtra(Constants.COUNTRY, mCcpCountry.getSelectedCountryName()); + intent.putExtra(Constants.COUNTRY, mCcpCode.getSelectedCountryName()); intent.putExtra(Constants.MOBILE_NUMBER, mCcpCode.getFullNumber()); startActivity(intent); diff --git a/mifospay/src/main/res/layout/activity_mobile_verification.xml b/mifospay/src/main/res/layout/activity_mobile_verification.xml index d794621cd..e18d1f3ca 100644 --- a/mifospay/src/main/res/layout/activity_mobile_verification.xml +++ b/mifospay/src/main/res/layout/activity_mobile_verification.xml @@ -21,23 +21,7 @@ android:layout_height="wrap_content" android:background="@color/primaryDarkBlue" android:theme="@style/Theme.AppCompat" - app:popupTheme="@style/ThemeOverlay.AppCompat.ActionBar"> - - - - + app:popupTheme="@style/ThemeOverlay.AppCompat.ActionBar"/>