Merge pull request openMF#1092 from ritish099/fix#1091

Fix openMF#1091: Extra Country Checker Code creating bugs
Prashant830 · Aug 8, 2022 · 0891622 · 0891622
2 parents ac04c6a + 81149f3
commit 0891622
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 21 deletions.
diff --git a/...main/java/org/mifos/mobilewallet/mifospay/registration/ui/MobileVerificationActivity.java b/...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
@@ -23,23 +23,7 @@
                 android:layout_height="wrap_content"
                 android:background="@color/primaryDarkBlue"
                 android:theme="@style/Theme.AppCompat"
-                app:popupTheme="@style/ThemeOverlay.AppCompat.ActionBar">
-
-                <com.hbb20.CountryCodePicker
-                    android:id="@+id/ccp_country"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    app:ccpDialog_backgroundColor="@color/white"
-                    app:ccp_autoDetectCountry="true"
-                    app:ccp_autoFormatNumber="false"
-                    app:ccp_contentColor="@color/white"
-                    app:ccp_showFullName="true"
-                    app:ccp_showNameCode="false"
-                    app:ccp_showPhoneCode="false"
-                    app:ccp_textGravity="CENTER"/>
-
-            </android.support.v7.widget.Toolbar>
+                app:popupTheme="@style/ThemeOverlay.AppCompat.ActionBar"/>
 
             <LinearLayout
                 android:layout_width="match_parent"