Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not start Jetpack flow when leaving Connect activity #9868

Merged
merged 1 commit into from
May 15, 2019
Merged

Do not start Jetpack flow when leaving Connect activity #9868

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions WordPress/src/main/java/org/wordpress/android/ui/stats/StatsConnectJetpackActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,14 @@ private void startJetpackConnectionFlow(SiteModel siteModel) {
@SuppressWarnings("unused")
@Subscribe(threadMode = ThreadMode.MAIN)
public void onAccountChanged(OnAccountChanged event) {
if (event.isError()) {
AppLog.e(T.API, "StatsConnectJetpackActivity.onAccountChanged error: "
+ event.error.type + " - " + event.error.message);
} else if (!mIsJetpackConnectStarted && event.causeOfChange == AccountAction.FETCH_ACCOUNT
&& !TextUtils.isEmpty(mAccountStore.getAccount().getUserName())) {
startJetpackConnectionFlow((SiteModel) getIntent().getSerializableExtra(SITE));
if (!isFinishing()) {
if (event.isError()) {
AppLog.e(T.API, "StatsConnectJetpackActivity.onAccountChanged error: "
+ event.error.type + " - " + event.error.message);
} else if (!mIsJetpackConnectStarted && event.causeOfChange == AccountAction.FETCH_ACCOUNT
&& !TextUtils.isEmpty(mAccountStore.getAccount().getUserName())) {
startJetpackConnectionFlow((SiteModel) getIntent().getSerializableExtra(SITE));
}
}
}
}