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

Jump to bottom

Move GoogleApiClient.Builder to onStart/Stop methods #10523

Merged
merged 3 commits into from
Oct 3, 2019
Merged

Move GoogleApiClient.Builder to onStart/Stop methods #10523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e902150
Move GoogleApiClient.Builder to onStart/Stop methods
planarvoid Sep 25, 2019
113fb26
Remove api client cleanup from onDetach
planarvoid Sep 25, 2019
2a24368
Implement PR comments
planarvoid Oct 2, 2019
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
24 changes: 17 additions & 7 deletions ...ogin/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginEmailFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import dagger.android.support.AndroidSupportInjection;

import static android.app.Activity.RESULT_OK;

import dagger.android.support.AndroidSupportInjection;

public class LoginEmailFragment extends LoginBaseFormFragment<LoginListener> implements TextWatcher,
OnEditorCommitListener, ConnectionCallbacks, OnConnectionFailedListener {
private static final String KEY_GOOGLE_EMAIL = "KEY_GOOGLE_EMAIL";
Expand Down Expand Up @@ -280,14 +280,29 @@ public void onCreate(Bundle savedInstanceState) {
mHideLoginWithSiteOption = args.getBoolean(ARG_HIDE_LOGIN_BY_SITE_OPTION, false);
mLoginSiteUrl = args.getString(ARG_LOGIN_SITE_URL, "");
}
}

@Override
public void onStart() {
super.onStart();
mGoogleApiClient = new GoogleApiClient.Builder(getActivity())
.addConnectionCallbacks(LoginEmailFragment.this)
.enableAutoManage(getActivity(), GOOGLE_API_CLIENT_ID, LoginEmailFragment.this)
.addApi(Auth.CREDENTIALS_API)
.build();
}

@Override
public void onStop() {
super.onStop();
if (mGoogleApiClient != null) {
mGoogleApiClient.stopAutoManage(getActivity());
if (mGoogleApiClient.isConnected()) {
mGoogleApiClient.disconnect();
}
}
}

@Override
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
Expand Down Expand Up @@ -333,11 +348,6 @@ protected void next(String email) {
public void onDetach() {
super.onDetach();
mLoginListener = null;

mGoogleApiClient.stopAutoManage(getActivity());
if (mGoogleApiClient.isConnected()) {
mGoogleApiClient.disconnect();
}
}

private String getCleanedEmail() {
Expand Down
25 changes: 15 additions & 10 deletions ...gin/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupEmailFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import dagger.android.support.AndroidSupportInjection;

import static android.app.Activity.RESULT_OK;

import dagger.android.support.AndroidSupportInjection;

public class SignupEmailFragment extends LoginBaseFormFragment<LoginListener> implements TextWatcher,
OnEditorCommitListener, ConnectionCallbacks, OnConnectionFailedListener {
private static final String KEY_HAS_DISMISSED_EMAIL_HINTS = "KEY_HAS_DISMISSED_EMAIL_HINTS";
Expand Down Expand Up @@ -143,16 +143,26 @@ public void onAttach(Context context) {
super.onAttach(context);
}

@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@Override public void onStart() {
super.onStart();
mGoogleApiClient = new GoogleApiClient.Builder(getActivity())
.addConnectionCallbacks(SignupEmailFragment.this)
.enableAutoManage(getActivity(), GOOGLE_API_CLIENT_ID, SignupEmailFragment.this)
.addApi(Auth.CREDENTIALS_API)
.build();
}

@Override
public void onStop() {
super.onStop();
if (mGoogleApiClient != null) {
mGoogleApiClient.stopAutoManage(getActivity());
if (mGoogleApiClient.isConnected()) {
mGoogleApiClient.disconnect();
}
}
}

@Override
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
Expand Down Expand Up @@ -190,11 +200,6 @@ protected void next(String email) {
public void onDetach() {
super.onDetach();
mLoginListener = null;

if (mGoogleApiClient.isConnected()) {
mGoogleApiClient.stopAutoManage(getActivity());
mGoogleApiClient.disconnect();
}
}

private String getCleanedEmail() {
Expand Down