Skip to content

Commit 655116b

Browse files
authored
CMM-1121 enable application password for all sites linking (#22466)
* Removing the check when adding a new site * Cleaning LoginSiteAddressFragment * Checkstyle
1 parent 19d61b5 commit 655116b

File tree

5 files changed

+4
-535
lines changed

5 files changed

+4
-535
lines changed

WordPress/src/androidTest/java/org/wordpress/android/e2e/flows/LoginFlow.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ class LoginFlow {
127127

128128
fun enterSiteAddress(siteAddress: String?): LoginFlow {
129129
// Site Address Screen – Fill it in and click "Continue"
130-
// See LoginSiteAddressFragment
130+
// See LoginSiteApplicationPasswordFragment
131131
WPSupportUtils.populateTextField(R.id.input, siteAddress)
132132
WPSupportUtils.clickOn(R.id.bottom_button)
133133
return this

WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginActivity.java

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import org.wordpress.android.login.LoginMagicLinkRequestFragment;
4141
import org.wordpress.android.login.LoginMagicLinkSentFragment;
4242
import org.wordpress.android.login.LoginMode;
43-
import org.wordpress.android.login.LoginSiteAddressFragment;
4443
import org.wordpress.android.ui.accounts.login.applicationpassword.LoginSiteApplicationPasswordFragment;
4544
import org.wordpress.android.login.LoginUsernamePasswordFragment;
4645
import org.wordpress.android.login.SignupConfirmationFragment;
@@ -72,7 +71,6 @@
7271
import org.wordpress.android.ui.posts.BasicFragmentDialog.BasicDialogPositiveClickInterface;
7372
import org.wordpress.android.ui.prefs.AppPrefs;
7473
import org.wordpress.android.ui.prefs.experimentalfeatures.ExperimentalFeatures;
75-
import org.wordpress.android.ui.prefs.experimentalfeatures.ExperimentalFeatures.Feature;
7674
import org.wordpress.android.ui.reader.services.update.ReaderUpdateLogic;
7775
import org.wordpress.android.ui.reader.services.update.ReaderUpdateServiceStarter;
7876
import org.wordpress.android.util.AppLog;
@@ -202,11 +200,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
202200
case JETPACK_SELFHOSTED:
203201
case SELFHOSTED_ONLY:
204202
mUnifiedLoginTracker.setSource(Source.SELF_HOSTED);
205-
if (mExperimentalFeatures.isEnabled(Feature.EXPERIMENTAL_APPLICATION_PASSWORD_FEATURE)) {
206-
showFragment(new LoginSiteApplicationPasswordFragment(), LoginSiteAddressFragment.TAG);
207-
} else {
208-
showFragment(new LoginSiteAddressFragment(), LoginSiteAddressFragment.TAG);
209-
}
203+
showFragment(new LoginSiteApplicationPasswordFragment(), LoginSiteApplicationPasswordFragment.TAG);
210204
break;
211205
case JETPACK_STATS:
212206
mUnifiedLoginTracker.setSource(Source.JETPACK);
@@ -579,13 +573,7 @@ public void gotUnregisteredSocialAccount(String email, String displayName, Strin
579573

580574
@Override
581575
public void loginViaSiteAddress() {
582-
final Fragment loginSiteAddressFragment;
583-
if (mExperimentalFeatures.isEnabled(Feature.EXPERIMENTAL_APPLICATION_PASSWORD_FEATURE)) {
584-
loginSiteAddressFragment = new LoginSiteApplicationPasswordFragment();
585-
} else {
586-
loginSiteAddressFragment = new LoginSiteAddressFragment();
587-
}
588-
slideInFragment(loginSiteAddressFragment, true, LoginSiteAddressFragment.TAG);
576+
slideInFragment(new LoginSiteApplicationPasswordFragment(), true, LoginSiteApplicationPasswordFragment.TAG);
589577
}
590578

591579
@Override

0 commit comments

Comments
 (0)