Added option to verify email only if login is for self hosted credentials

anitaa1990 · anitaa1990 · commit a1bc4624547a · 2019-10-28T09:55:10.000+05:30
diff --git a/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginEmailFragment.java b/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginEmailFragment.java
@@ -432,7 +432,7 @@ public void onAvailabilityChecked(OnAvailabilityChecked event) {
                     showEmailError(R.string.email_not_registered_wpcom);
                 } else if (mLoginListener != null) {
                     ActivityUtils.hideKeyboardForced(mEmailInput);
-                    mLoginListener.gotWpcomEmail(event.value);
+                    mLoginListener.gotWpcomEmail(event.value, false);
                 }
                 break;
             default:
diff --git a/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginListener.java b/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginListener.java
@@ -18,7 +18,7 @@ interface SelfSignedSSLCallback {
     LoginMode getLoginMode();
 
     // Login Email input callbacks
-    void gotWpcomEmail(String email);
+    void gotWpcomEmail(String email, boolean verifyEmail);
     void loginViaSiteAddress();
     void loginViaSocialAccount(String email, String idToken, String service, boolean isPasswordRequired);
     void loggedInViaSocialAccount(ArrayList<Integer> oldSiteIds, boolean doLoginUpdate);
diff --git a/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginMagicLinkRequestFragment.java b/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginMagicLinkRequestFragment.java
@@ -59,6 +59,7 @@ public class LoginMagicLinkRequestFragment extends Fragment {
     private static final String ARG_MAGIC_LINK_SCHEME = "ARG_MAGIC_LINK_SCHEME";
     private static final String ARG_IS_JETPACK_CONNECT = "ARG_IS_JETPACK_CONNECT";
     private static final String ARG_JETPACK_CONNECT_SOURCE = "ARG_JETPACK_CONNECT_SOURCE";
+    private static final String ARG_VERIFY_MAGIC_LINK_EMAIL = "ARG_VERIFY_MAGIC_LINK_EMAIL";
 
     private static final String ERROR_KEY = "error";
 
@@ -74,18 +75,21 @@ public class LoginMagicLinkRequestFragment extends Fragment {
 
     private boolean mInProgress;
     private boolean mIsJetpackConnect;
+    private boolean mVerifyMagicLinkEmail;
 
     @Inject protected Dispatcher mDispatcher;
 
     @Inject protected LoginAnalyticsListener mAnalyticsListener;
     public static LoginMagicLinkRequestFragment newInstance(String email, AuthEmailPayloadScheme scheme,
-                                                            boolean isJetpackConnect, String jetpackConnectSource) {
+                                                            boolean isJetpackConnect, String jetpackConnectSource,
+                                                            boolean verifyEmail) {
         LoginMagicLinkRequestFragment fragment = new LoginMagicLinkRequestFragment();
         Bundle args = new Bundle();
         args.putString(ARG_EMAIL_ADDRESS, email);
         args.putSerializable(ARG_MAGIC_LINK_SCHEME, scheme);
         args.putBoolean(ARG_IS_JETPACK_CONNECT, isJetpackConnect);
         args.putString(ARG_JETPACK_CONNECT_SOURCE, jetpackConnectSource);
+        args.putBoolean(ARG_VERIFY_MAGIC_LINK_EMAIL, verifyEmail);
         fragment.setArguments(args);
         return fragment;
     }
@@ -110,6 +114,7 @@ public void onCreate(Bundle savedInstanceState) {
             mMagicLinkScheme = (AuthEmailPayloadScheme) getArguments().getSerializable(ARG_MAGIC_LINK_SCHEME);
             mIsJetpackConnect = getArguments().getBoolean(ARG_IS_JETPACK_CONNECT);
             mJetpackConnectSource = getArguments().getString(ARG_JETPACK_CONNECT_SOURCE);
+            mVerifyMagicLinkEmail = getArguments().getBoolean(ARG_VERIFY_MAGIC_LINK_EMAIL);
         }
 
         setHasOptionsMenu(true);
@@ -148,7 +153,7 @@ public void onClick(View v) {
         ImageView avatarView = view.findViewById(R.id.gravatar);
 
         // Design changes added to the Woo Magic link sign-in
-        if (mLoginListener.getLoginMode() == LoginMode.WOO_LOGIN_MODE) {
+        if (mVerifyMagicLinkEmail) {
             View avatarContainerView = view.findViewById(R.id.avatar_container);
 
             LayoutParams lp = avatarContainerView.getLayoutParams();
@@ -162,6 +167,8 @@ public void onClick(View v) {
             TextView labelTextView = view.findViewById(R.id.label);
             labelTextView.setText(Html.fromHtml(String.format(getResources().getString(
                     R.string.login_site_credentials_magic_link_label), mEmail)));
+
+            mRequestMagicLinkButton.setText(getString(R.string.send_verification_email));
         } else {
             Glide.with(this)
                  .load(GravatarUtils.gravatarFromEmail(mEmail,
diff --git a/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginUsernamePasswordFragment.java b/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginUsernamePasswordFragment.java
@@ -569,7 +569,7 @@ public void onSiteChanged(OnSiteChanged event) {
                                 lastAddedXMLRPCSite.getXmlRpcUrl(), lastAddedXMLRPCSite.getUsername(),
                                 lastAddedXMLRPCSite.getPassword(), mAccountStore.getAccount().getAvatarUrl());
                     } else {
-                        mLoginListener.gotWpcomEmail(userEmail);
+                        mLoginListener.gotWpcomEmail(userEmail, true);
                     }
                 } else {
                     // Initiate the wp.getOptions endpoint to fetch the jetpack user email
diff --git a/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupEmailFragment.java b/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupEmailFragment.java
@@ -271,7 +271,7 @@ public void onAvailabilityChecked(OnAvailabilityChecked event) {
                             } else {
                                 mAnalyticsListener.trackSignupEmailToLogin();
                                 mLoginListener.showSignupToLoginMessage();
-                                mLoginListener.gotWpcomEmail(event.value);
+                                mLoginListener.gotWpcomEmail(event.value, false);
                                 // Kill connections with FluxC and this fragment since the flow is changing to login.
                                 mDispatcher.unregister(this);
                                 getActivity().getSupportFragmentManager().beginTransaction().remove(this).commit();
diff --git a/WordPressLoginFlow/src/main/res/values/strings.xml b/WordPressLoginFlow/src/main/res/values/strings.xml
@@ -4,6 +4,7 @@
     <string name="verification_code">Verification code</string>
     <string name="invalid_verification_code">Invalid verification code</string>
     <string name="send_link">Send link</string>
+    <string name="send_verification_email">Send verification email</string>
     <string name="enter_your_password_instead">Enter your password instead</string>
     <string name="username">Username</string>
     <string name="password">Password</string>

Original file line number	Diff line number	Diff line change
`@@ -432,7 +432,7 @@ public void onAvailabilityChecked(OnAvailabilityChecked event) {`
`432`	`432`	`showEmailError(R.string.email_not_registered_wpcom);`
`433`	`433`	`} else if (mLoginListener != null) {`
`434`	`434`	`ActivityUtils.hideKeyboardForced(mEmailInput);`
`435`		`- mLoginListener.gotWpcomEmail(event.value);`
	`435`	`+ mLoginListener.gotWpcomEmail(event.value, false);`
`436`	`436`	`}`
`437`	`437`	`break;`
`438`	`438`	`default:`
Original file line number	Diff line number	Diff line change
`@@ -569,7 +569,7 @@ public void onSiteChanged(OnSiteChanged event) {`
`569`	`569`	`lastAddedXMLRPCSite.getXmlRpcUrl(), lastAddedXMLRPCSite.getUsername(),`
`570`	`570`	`lastAddedXMLRPCSite.getPassword(), mAccountStore.getAccount().getAvatarUrl());`
`571`	`571`	`} else {`
`572`		`- mLoginListener.gotWpcomEmail(userEmail);`
	`572`	`+ mLoginListener.gotWpcomEmail(userEmail, true);`
`573`	`573`	`}`
`574`	`574`	`} else {`
`575`	`575`	`// Initiate the wp.getOptions endpoint to fetch the jetpack user email`