Skip to content

Bugfixes for older versions of Android #382

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 5 commits into from
Oct 28, 2016
Merged

Bugfixes for older versions of Android #382

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
cba0256
Fixes for older Android devices
Oct 26, 2016
5aadcec
fix/rework SmartLock tests
Oct 27, 2016
068dd6e
review feedback
Oct 28, 2016
9f34960
Fix tests
Oct 28, 2016
1b5e6c0
fix more tests
Oct 28, 2016
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
42 changes: 42 additions & 0 deletions auth/src/main/java/com/firebase/ui/auth/ui/ActivityHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,18 @@
import android.content.Context;
import android.content.Intent;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.StringRes;

import com.firebase.ui.auth.IdpResponse;
import com.firebase.ui.auth.util.SmartLock;
import com.google.android.gms.auth.api.Auth;
import com.google.android.gms.auth.api.credentials.CredentialsApi;
import com.google.firebase.FirebaseApp;
import com.google.firebase.auth.FirebaseAuth;
import com.google.firebase.auth.FirebaseUser;

import static android.app.Activity.RESULT_OK;
import static com.firebase.ui.auth.util.Preconditions.checkNotNull;

public class ActivityHelper {
Expand Down Expand Up @@ -106,4 +110,42 @@ public static Intent createBaseIntent(
.putExtra(ExtraConstants.EXTRA_FLOW_PARAMS,
checkNotNull(flowParams, "flowParams cannot be null"));
}

public SmartLock getSmartLockInstance(AppCompatBase activity, String tag) {
return SmartLock.getInstance(activity, tag);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this method do anything besides pass through? Seems like we could just use the static method.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It just passes through. As you noted below, this makes shadowing it possible.

}

public void saveCredentialsOrFinish(
@Nullable SmartLock smartLock,
AppCompatBase activity,
FirebaseUser firebaseUser,
@NonNull IdpResponse response) {
saveCredentialsOrFinish(smartLock, activity, firebaseUser, null, response);
}

public void saveCredentialsOrFinish(
@Nullable SmartLock smartLock,
AppCompatBase activity,
FirebaseUser firebaseUser,
@NonNull String password) {
saveCredentialsOrFinish(smartLock, activity, firebaseUser, password, null);
}

private void saveCredentialsOrFinish(
@Nullable SmartLock smartLock,
AppCompatBase activity,
FirebaseUser firebaseUser,
@Nullable String password,
@Nullable IdpResponse response) {
if (smartLock == null) {
activity.finish(RESULT_OK, new Intent());
} else {
smartLock.saveCredentialsOrFinish(
activity,
this,
firebaseUser,
password,
response);
}
}
}
20 changes: 9 additions & 11 deletions auth/src/main/java/com/firebase/ui/auth/ui/account_link/WelcomeBackPasswordPrompt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import android.graphics.Typeface;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.design.widget.TextInputLayout;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
Expand All @@ -28,7 +29,6 @@
import android.widget.EditText;
import android.widget.TextView;

import com.firebase.ui.auth.AuthUI;
import com.firebase.ui.auth.IdpResponse;
import com.firebase.ui.auth.R;
import com.firebase.ui.auth.ui.ActivityHelper;
Expand Down Expand Up @@ -58,12 +58,14 @@ public class WelcomeBackPasswordPrompt extends AppCompatBase implements View.OnC
private TextInputLayout mPasswordLayout;
private EditText mPasswordField;
private IdpResponse mIdpResponse;
@Nullable
private SmartLock mSmartLock;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.welcome_back_password_prompt_layout);

mSmartLock = SmartLock.getInstance(WelcomeBackPasswordPrompt.this, TAG);
mPasswordLayout = (TextInputLayout) findViewById(R.id.password_layout);
mPasswordField = (EditText) findViewById(R.id.password);

Expand Down Expand Up @@ -139,15 +141,11 @@ public void onSuccess(AuthResult authResult) {
new OnSuccessListener<AuthResult>() {
@Override
public void onSuccess(AuthResult authResult) {
SmartLock
.getInstance(WelcomeBackPasswordPrompt.this,
TAG)
.saveCredentialsOrFinish(
WelcomeBackPasswordPrompt.this,
mActivityHelper,
authResult.getUser(),
password,
null);
mActivityHelper.saveCredentialsOrFinish(
mSmartLock,
WelcomeBackPasswordPrompt.this,
authResult.getUser(),
password);
}
});
}
Expand Down
19 changes: 10 additions & 9 deletions auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import android.net.Uri;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.design.widget.TextInputLayout;
import android.support.v4.content.ContextCompat;
import android.text.SpannableStringBuilder;
Expand All @@ -30,8 +31,6 @@
import android.widget.ImageView;
import android.widget.TextView;

import com.firebase.ui.auth.AuthUI;
import com.firebase.ui.auth.IdpResponse;
import com.firebase.ui.auth.R;
import com.firebase.ui.auth.ui.ActivityHelper;
import com.firebase.ui.auth.ui.AppCompatBase;
Expand Down Expand Up @@ -66,12 +65,16 @@ public class RegisterEmailActivity extends AppCompatBase implements View.OnClick
private EmailFieldValidator mEmailFieldValidator;
private PasswordFieldValidator mPasswordFieldValidator;
private RequiredFieldValidator mNameValidator;
@Nullable
private SmartLock mSmartLock;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.register_email_layout);

mSmartLock = mActivityHelper.getSmartLockInstance(this, TAG);

String email = getIntent().getStringExtra(ExtraConstants.EXTRA_EMAIL);
mEmailEditText = (EditText) findViewById(R.id.email);

Expand Down Expand Up @@ -156,13 +159,11 @@ public void onComplete(@NonNull Task<Void> task) {
// This executes even if the name change fails, since
// the account creation succeeded and we want to save
// the credential to SmartLock (if enabled).
SmartLock.getInstance(RegisterEmailActivity.this, TAG)
.saveCredentialsOrFinish(
RegisterEmailActivity.this,
mActivityHelper,
firebaseUser,
password,
null);
mActivityHelper.saveCredentialsOrFinish(
mSmartLock,
RegisterEmailActivity.this,
firebaseUser,
password);
}
});
}
Expand Down
18 changes: 10 additions & 8 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 @@ -18,6 +18,7 @@
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.design.widget.TextInputLayout;
import android.util.TypedValue;
import android.view.View;
Expand All @@ -26,8 +27,6 @@
import android.widget.ImageView;
import android.widget.TextView;

import com.firebase.ui.auth.AuthUI;
import com.firebase.ui.auth.IdpResponse;
import com.firebase.ui.auth.R;
import com.firebase.ui.auth.ui.ActivityHelper;
import com.firebase.ui.auth.ui.AppCompatBase;
Expand All @@ -51,12 +50,16 @@ public class SignInActivity extends AppCompatBase implements View.OnClickListene
private EditText mPasswordEditText;
private EmailFieldValidator mEmailValidator;
private RequiredFieldValidator mPasswordValidator;
@Nullable
private SmartLock mSmartLock;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.sign_in_layout);

mSmartLock = mActivityHelper.getSmartLockInstance(this, TAG);

String email = getIntent().getStringExtra(ExtraConstants.EXTRA_EMAIL);

mEmailEditText = (EditText) findViewById(R.id.email);
Expand Down Expand Up @@ -100,12 +103,11 @@ private void signIn(final String email, final String password) {
@Override
public void onSuccess(AuthResult authResult) {
// Save credential in SmartLock (if enabled)
SmartLock.getInstance(SignInActivity.this, TAG)
.saveCredentialsOrFinish(SignInActivity.this,
mActivityHelper,
authResult.getUser(),
password,
null);
mActivityHelper.saveCredentialsOrFinish(
mSmartLock,
SignInActivity.this,
authResult.getUser(),
password);
}
})
.addOnFailureListener(new OnFailureListener() {
Expand Down
7 changes: 5 additions & 2 deletions auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.util.Log;
import android.view.View;
import android.widget.ImageView;
Expand Down Expand Up @@ -63,12 +64,14 @@ public class AuthMethodPickerActivity extends IDPBaseActivity
private static final int RC_EMAIL_FLOW = 2;
private static final int RC_ACCOUNT_LINK = 3;
private ArrayList<IdpProvider> mIdpProviders;
@Nullable
private SmartLock mSmartLock;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.auth_method_picker_layout);

mSmartLock = mActivityHelper.getSmartLockInstance(this, TAG);
findViewById(R.id.email_provider).setOnClickListener(this);

populateIdpList(mActivityHelper.getFlowParams().providerInfo);
Expand Down Expand Up @@ -167,7 +170,7 @@ public void onSuccess(final IdpResponse response) {
.addOnCompleteListener(new CredentialSignInHandler(
AuthMethodPickerActivity.this,
mActivityHelper,
SmartLock.getInstance(AuthMethodPickerActivity.this, TAG),
mSmartLock,
RC_ACCOUNT_LINK,
response));
}
Expand Down
15 changes: 8 additions & 7 deletions auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
package com.firebase.ui.auth.ui.idp;

import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.util.Log;

import com.firebase.ui.auth.IdpResponse;
Expand All @@ -40,14 +41,14 @@ public class CredentialSignInHandler implements OnCompleteListener<AuthResult> {

private AppCompatBase mActivity;
private ActivityHelper mActivityHelper;
private SmartLock mSmartLock;
@Nullable private SmartLock mSmartLock;
private IdpResponse mResponse;
private int mAccountLinkResultCode;

public CredentialSignInHandler(
AppCompatBase activity,
ActivityHelper activityHelper,
SmartLock smartLock,
@Nullable SmartLock smartLock,
int accountLinkResultCode,
IdpResponse response) {
mActivity = activity;
Expand All @@ -61,11 +62,11 @@ public CredentialSignInHandler(
public void onComplete(@NonNull Task<AuthResult> task) {
if (task.isSuccessful()) {
FirebaseUser firebaseUser = task.getResult().getUser();
mSmartLock.saveCredentialsOrFinish(mActivity,
mActivityHelper,
firebaseUser,
null /* password */,
mResponse);
mActivityHelper.saveCredentialsOrFinish(
mSmartLock,
mActivity,
firebaseUser,
mResponse);
} else {
if (task.getException() instanceof FirebaseAuthUserCollisionException) {
final String email = mResponse.getEmail();
Expand Down
7 changes: 5 additions & 2 deletions auth/src/main/java/com/firebase/ui/auth/ui/idp/IdpSignInContainerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import com.firebase.ui.auth.AuthUI.IdpConfig;
import com.firebase.ui.auth.IdpResponse;
import com.firebase.ui.auth.provider.FacebookProvider;
Expand Down Expand Up @@ -44,11 +45,13 @@ public class IdpSignInContainerActivity extends IDPBaseActivity implements IdpCa
private IdpProvider mIdpProvider;
private String mProvider;
private String mEmail;
@Nullable
private SmartLock mSmartLock;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

mSmartLock = mActivityHelper.getSmartLockInstance(this, TAG);
mProvider = getIntent().getStringExtra(ExtraConstants.EXTRA_PROVIDER);
mEmail = getIntent().getStringExtra(ExtraConstants.EXTRA_EMAIL);
IdpConfig providerConfig = null;
Expand Down Expand Up @@ -87,7 +90,7 @@ public void onSuccess(final IdpResponse response) {
.addOnCompleteListener(new CredentialSignInHandler(
IdpSignInContainerActivity.this,
mActivityHelper,
SmartLock.getInstance(IdpSignInContainerActivity.this, TAG),
mSmartLock,
RC_WELCOME_BACK_IDP,
response));
}
Expand Down
Loading