Skip to content

Update SiteCreationService from latest AutoForeground #6916

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

Merged
mzorz merged 5 commits into from
Dec 18, 2017
Merged

Update SiteCreationService from latest AutoForeground #6916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f23aaef
Port latest AutoForeground work to SiteCreationService
hypest Nov 28, 2017
98c68bc
Keep state in sticky EventBus event only
hypest Nov 28, 2017
dfb489c
Better name for the progress start/end methods
hypest Nov 28, 2017
9c51695
Help resolve strings.xml conflicts
hypest Dec 14, 2017
eccf14a
Add ACCESS_NETWORK_STATE permission to Utils library
oguzkocer Dec 5, 2017
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
4 changes: 2 additions & 2 deletions ...ess/src/main/java/org/wordpress/android/ui/accounts/login/LoginEmailPasswordFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,9 @@ public void onCredentialsOK(OnCredentialsOK event) {
@SuppressWarnings("unused")
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
public void onLoginStateUpdated(OnLoginStateUpdated event) {
AppLog.i(T.NUX, "Received state: " + event.state.name());
AppLog.i(T.NUX, "Received state: " + event.getState().name());

switch (event.state) {
switch (event.getState()) {
case IDLE:
// nothing special to do, we'll start the service on next()
break;
Expand Down
105 changes: 51 additions & 54 deletions WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginWpcomService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,29 +20,31 @@
import org.wordpress.android.fluxc.store.AccountStore.OnAuthenticationChanged;
import org.wordpress.android.fluxc.store.SiteStore;
import org.wordpress.android.ui.accounts.login.LoginWpcomService.OnLoginStateUpdated;
import org.wordpress.android.ui.accounts.login.LoginWpcomService.LoginPhase;
import org.wordpress.android.ui.notifications.services.NotificationsUpdateService;
import org.wordpress.android.ui.reader.services.ReaderUpdateService;
import org.wordpress.android.util.AnalyticsUtils;
import org.wordpress.android.util.AppLog;
import org.wordpress.android.util.AppLog.T;
import org.wordpress.android.util.AutoForeground;
import org.wordpress.android.util.AutoForegroundNotification;
import org.wordpress.android.util.ToastUtils;

import java.util.EnumSet;
import java.util.HashMap;
import java.util.Map;


import javax.inject.Inject;

public class LoginWpcomService extends AutoForeground<OnLoginStateUpdated> {
public class LoginWpcomService extends AutoForeground<LoginPhase, OnLoginStateUpdated> {

private static final String ARG_EMAIL = "ARG_EMAIL";
private static final String ARG_PASSWORD = "ARG_PASSWORD";
private static final String ARG_SOCIAL_ID_TOKEN = "ARG_SOCIAL_ID_TOKEN";
private static final String ARG_SOCIAL_LOGIN = "ARG_SOCIAL_LOGIN";
private static final String ARG_SOCIAL_SERVICE = "ARG_SOCIAL_SERVICE";

public enum LoginPhase {
public enum LoginPhase implements AutoForeground.ServicePhase {
IDLE,
AUTHENTICATING(25),
SOCIAL_LOGIN(25),
Expand All @@ -67,30 +69,43 @@ public enum LoginPhase {
this.progressPercent = progressPercent;
}

@Override
public boolean isIdle() {
return this == IDLE;
}

@Override
public boolean isInProgress() {
return this != LoginPhase.IDLE && !isTerminal();
return this != IDLE && !isTerminal();
}

@Override
public boolean isError() {
return this == LoginPhase.FAILURE
|| this == LoginPhase.FAILURE_EMAIL_WRONG_PASSWORD
|| this == LoginPhase.FAILURE_2FA
|| this == LoginPhase.FAILURE_SOCIAL_2FA
|| this == LoginPhase.FAILURE_FETCHING_ACCOUNT
|| this == LoginPhase.FAILURE_CANNOT_ADD_DUPLICATE_SITE;
return this == FAILURE
|| this == FAILURE_EMAIL_WRONG_PASSWORD
|| this == FAILURE_2FA
|| this == FAILURE_SOCIAL_2FA
|| this == FAILURE_FETCHING_ACCOUNT
|| this == FAILURE_CANNOT_ADD_DUPLICATE_SITE;
}

@Override
public boolean isTerminal() {
return this == LoginPhase.SUCCESS || isError();
}
}

public static class OnLoginStateUpdated {
public final LoginPhase state;
public static class OnLoginStateUpdated implements AutoForeground.ServiceEvent<LoginPhase> {
private final LoginPhase state;

OnLoginStateUpdated(LoginPhase state) {
this.state = state;
}

@Override
public LoginPhase getState() {
return state;
}
}

static class OnCredentialsOK {
Expand All @@ -101,8 +116,6 @@ static class OnCredentialsOK {
@Inject AccountStore mAccountStore;
@Inject SiteStore mSiteStore;

private LoginPhase mLoginPhase = LoginPhase.IDLE;

private String mIdToken;
private String mService;
private boolean isSocialLogin;
Expand All @@ -123,75 +136,59 @@ public static void loginWithEmailAndPassword(
}

public static void clearLoginServiceState() {
EventBus.getDefault().removeStickyEvent(OnLoginStateUpdated.class);
clearServiceState(OnLoginStateUpdated.class);
}

public LoginWpcomService() {
super(OnLoginStateUpdated.class);
}

@Override
protected OnLoginStateUpdated getCurrentStateEvent() {
return new OnLoginStateUpdated(mLoginPhase);
super(LoginPhase.IDLE, OnLoginStateUpdated.class);
}

@Override
public boolean isIdle() {
return mLoginPhase == LoginPhase.IDLE;
protected void onProgressStart() {
mDispatcher.register(this);
}

@Override
public boolean isInProgress() {
return mLoginPhase.isInProgress();
protected void onProgressEnd() {
mDispatcher.unregister(this);
}

@Override
public boolean isError() {
return mLoginPhase.isError();
protected OnLoginStateUpdated getStateEvent(LoginPhase phase) {
return new OnLoginStateUpdated(phase);
}

@Override
public Notification getNotification() {
switch (mLoginPhase) {
public Notification getNotification(LoginPhase phase) {
switch (phase) {
case AUTHENTICATING:
case FETCHING_ACCOUNT:
case FETCHING_SETTINGS:
case FETCHING_SITES:
return LoginNotification.progress(this, mLoginPhase.progressPercent, R.string.notification_logging_in);
return AutoForegroundNotification.progress(this, phase.progressPercent,
R.string.notification_login_title_in_progress, R.string.notification_logging_in);
case SUCCESS:
return LoginNotification.success(this, R.string.notification_logged_in);
return AutoForegroundNotification.success(this, R.string.notification_login_title_success,
R.string.notification_logged_in);
case FAILURE_EMAIL_WRONG_PASSWORD:
return LoginNotification.failure(this, R.string.notification_error_wrong_password);
return AutoForegroundNotification.failure(this, R.string.notification_login_title_stopped,
R.string.notification_error_wrong_password);
case FAILURE_2FA:
return LoginNotification.failure(this, R.string.notification_2fa_needed);
return AutoForegroundNotification.failure(this, R.string.notification_login_title_stopped,
R.string.notification_2fa_needed);
case FAILURE_SOCIAL_2FA:
return LoginNotification.failure(this, R.string.notification_2fa_needed);
return AutoForegroundNotification.failure(this, R.string.notification_login_title_stopped,
R.string.notification_2fa_needed);
case FAILURE:
return LoginNotification.failure(this, R.string.notification_login_failed);
return AutoForegroundNotification.failure(this, R.string.notification_login_title_stopped,
R.string.notification_login_failed);
}

return null;
}

private void setState(LoginPhase loginPhase) {
if (!mLoginPhase.isInProgress() && loginPhase.isInProgress()) {
mDispatcher.register(this);
}

mLoginPhase = loginPhase;
track();
notifyState();

if (mLoginPhase.isTerminal()) {
mDispatcher.unregister(this);
stopSelf();
}
}

private void track() {
Map<String, Object> props = new HashMap<>();
props.put("login_phase", mLoginPhase == null ? "null" : mLoginPhase.name());
props.put("login_service_is_foreground", isForeground());
@Override
protected void trackPhaseUpdate(Map<String, ?> props) {
AnalyticsTracker.track(AnalyticsTracker.Stat.LOGIN_WPCOM_BACKGROUND_SERVICE_UPDATE, props);
}

Expand Down
4 changes: 2 additions & 2 deletions WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreatingFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ public void onPause() {
@SuppressWarnings("unused")
@Subscribe(threadMode = ThreadMode.MAIN)
public void onSiteCreationPhaseUpdated(OnSiteCreationStateUpdated event) {
AppLog.i(T.NUX, "Received state: " + event.state.name());
AppLog.i(T.NUX, "Received state: " + event.getState().name());

switch (event.state) {
switch (event.getState()) {
case IDLE:
SiteCreationService.createSite(getActivity(),
WordPress.getBuildConfigString(getActivity(), "DEBUG_DOTCOM_NEW_SITE_TITLE"),
Expand Down
Loading