Skip to content

Fix memory leak, switch to auto managed clients and bug fix #334

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
merged 1 commit into from
Sep 30, 2016
Merged

Fix memory leak, switch to auto managed clients and bug fix #334

Show file tree
Hide file tree
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
18 changes: 1 addition & 17 deletions auth/src/main/java/com/firebase/ui/auth/ui/account_link/SaveCredentialsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,26 +79,10 @@ protected void onCreate(Bundle savedInstanceState) {
.addConnectionCallbacks(this)
.addOnConnectionFailedListener(this)
.addApi(Auth.CREDENTIALS_API)
.enableAutoManage(this, this)
.build();
mCredentialsApiClient.connect();
}


@Override
protected void onStart() {
super.onStart();
mCredentialsApiClient.connect();
}

@Override
protected void onStop() {
super.onStop();
if (mCredentialsApiClient != null) {
mCredentialsApiClient.disconnect();
}
}


@Override
public void onConnected(@Nullable Bundle bundle) {
if (mEmail == null) {
Expand Down
1 change: 1 addition & 0 deletions auth/src/main/java/com/firebase/ui/auth/ui/email/SignInActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ public void onFailure(@NonNull Exception e) {
TextInputLayout passwordInput =
(TextInputLayout) findViewById(R.id.password_layout);
passwordInput.setError(getString(R.string.login_error));
mActivityHelper.dismissDialog();
}
});
}
Expand Down
3 changes: 2 additions & 1 deletion auth/src/main/java/com/firebase/ui/auth/util/FirebaseAuthWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import android.support.annotation.Nullable;
import android.support.annotation.WorkerThread;

import android.support.v4.app.FragmentActivity;
import com.google.firebase.auth.AuthCredential;
import com.google.firebase.auth.FirebaseUser;

Expand Down Expand Up @@ -68,7 +69,7 @@ FirebaseUser linkWithCredential(

boolean isPlayServicesAvailable(Context context);

PendingIntent getEmailHintIntent(Context context);
PendingIntent getEmailHintIntent(FragmentActivity context);

void setTimeOut(long timeoutMs);

Expand Down
18 changes: 13 additions & 5 deletions auth/src/main/java/com/firebase/ui/auth/util/FirebaseAuthWrapperImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@

package com.firebase.ui.auth.util;

import android.app.Fragment;
import android.app.PendingIntent;
import android.content.Context;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.WorkerThread;
import android.support.v4.app.FragmentActivity;
import android.util.Log;

import com.firebase.ui.auth.BuildConfig;
Expand All @@ -29,6 +31,7 @@
import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.GoogleApiAvailability;
import com.google.android.gms.common.api.GoogleApiClient;
import com.google.android.gms.common.api.GoogleApiClient.OnConnectionFailedListener;
import com.google.android.gms.tasks.Task;
import com.google.android.gms.tasks.Tasks;
import com.google.firebase.auth.AuthCredential;
Expand Down Expand Up @@ -153,18 +156,23 @@ protected boolean isPlayServicesAvailable(
}

@Override
public PendingIntent getEmailHintIntent(Context context) {
if (!isPlayServicesAvailable(context, GoogleApiAvailability.getInstance())) {
public PendingIntent getEmailHintIntent(FragmentActivity fragmentActivity) {
if (!isPlayServicesAvailable(fragmentActivity, GoogleApiAvailability.getInstance())) {
return null;
}

GoogleApiClient client = new GoogleApiClient.Builder(context)
GoogleApiClient client = new GoogleApiClient.Builder(fragmentActivity)
.addConnectionCallbacks(this)
.addApi(Auth.CREDENTIALS_API)
.enableAutoManage(fragmentActivity, new OnConnectionFailedListener() {
@Override
public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
Log.e(TAG,
"Client connection failed: " + connectionResult.getErrorMessage());
}
})
.build();

client.connect();

HintRequest hintRequest = new HintRequest.Builder()
.setHintPickerConfig(new CredentialPickerConfig.Builder()
.setShowCancelButton(true)
Expand Down