Skip to content

Commit bee4c1a

Browse files
samtsternsamtstern
authored
Merge pull request #825 from firebase/version-2.1.1-dev
Merge Version 2.1.1 to master
2 parents b252af3 + 3753c34 commit bee4c1a

File tree

172 files changed

+6491
-6552
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+6491
-6552
lines changed

‎README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ libraries.
3939
```groovy
4040
dependencies {
4141
// FirebaseUI Database only
42-
compile 'com.firebaseui:firebase-ui-database:2.1.0'
42+
compile 'com.firebaseui:firebase-ui-database:2.1.1'
4343
4444
// FirebaseUI Auth only
45-
compile 'com.firebaseui:firebase-ui-auth:2.1.0'
45+
compile 'com.firebaseui:firebase-ui-auth:2.1.1'
4646
4747
// FirebaseUI Storage only
48-
compile 'com.firebaseui:firebase-ui-storage:2.1.0'
48+
compile 'com.firebaseui:firebase-ui-storage:2.1.1'
4949
5050
// Single target that includes all FirebaseUI libraries above
51-
compile 'com.firebaseui:firebase-ui:2.1.0'
51+
compile 'com.firebaseui:firebase-ui:2.1.1'
5252
}
5353
```
5454

@@ -91,7 +91,7 @@ For convenience, here are some recent examples:
9191

9292
| FirebaseUI Version | Firebase/Play Services Version |
9393
|--------------------|--------------------------------|
94-
| 2.1.0 | 11.0.2 |
94+
| 2.1.1 | 11.0.2 |
9595
| 2.0.1 | 11.0.1 |
9696
| 1.2.0 | 10.2.0 |
9797
| 1.1.1 | 10.0.0 or 10.0.1 |

‎auth/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Gradle, add the dependency:
4646
```groovy
4747
dependencies {
4848
// ...
49-
compile 'com.firebaseui:firebase-ui-auth:2.1.0'
49+
compile 'com.firebaseui:firebase-ui-auth:2.1.1'
5050
5151
// Required only if Facebook login support is required
5252
compile('com.facebook.android:facebook-android-sdk:4.22.1')

‎auth/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ android {
1010
targetSdkVersion targetSdk
1111
versionCode 1
1212
versionName "1.0"
13+
14+
resourcePrefix "fui_"
1315
}
1416

1517
buildTypes {
@@ -43,6 +45,7 @@ android {
4345
dependencies {
4446
compile "com.android.support:design:$supportLibraryVersion"
4547
compile "com.android.support:customtabs:$supportLibraryVersion"
48+
compile 'com.android.support.constraint:constraint-layout:1.1.0-beta1'
4649

4750
compile "com.google.firebase:firebase-auth:$firebaseVersion"
4851
compile "com.google.android.gms:play-services-auth:$firebaseVersion"

‎auth/lint.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<lint>
3+
<issue id="all">
4+
<ignore path="src/main/res/values/com_crashlytics_export_strings.xml" />
5+
</issue>
6+
</lint>

‎auth/src/main/AndroidManifest.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,34 +32,34 @@
3232

3333
<activity
3434
android:name=".ui.email.RecoverPasswordActivity"
35-
android:label="@string/title_recover_password_activity"
36-
android:exported="false" />
35+
android:label="@string/fui_title_recover_password_activity"
36+
android:exported="false"/>
3737

3838
<activity
3939
android:name=".ui.email.RegisterEmailActivity"
40-
android:label="@string/sign_in_default"
41-
android:exported="false" />
40+
android:label="@string/fui_sign_in_default"
41+
android:exported="false"/>
4242

4343
<activity
4444
android:name=".ui.phone.PhoneVerificationActivity"
45-
android:label="@string/sign_in_with_phone_number"
46-
android:exported="false"
47-
android:windowSoftInputMode="stateAlwaysVisible" />
45+
android:label="@string/fui_sign_in_with_phone_number"
46+
android:windowSoftInputMode="stateAlwaysVisible"
47+
android:exported="false"/>
4848

4949
<activity
5050
android:name=".ui.accountlink.WelcomeBackIdpPrompt"
51-
android:label="@string/title_welcome_back_idp_prompt"
52-
android:exported="false" />
51+
android:label="@string/fui_title_welcome_back_idp_prompt"
52+
android:exported="false"/>
5353

5454
<activity
5555
android:name=".ui.accountlink.WelcomeBackPasswordPrompt"
56-
android:label="@string/title_welcome_back_password_prompt"
57-
android:exported="false" />
56+
android:label="@string/fui_title_welcome_back_password_prompt"
57+
android:exported="false"/>
5858

5959
<activity
6060
android:name=".ui.idp.AuthMethodPickerActivity"
61-
android:label="@string/default_toolbar_title"
62-
android:exported="false" />
61+
android:label="@string/fui_default_toolbar_title"
62+
android:exported="false"/>
6363

6464
<activity
6565
android:name="com.facebook.FacebookActivity"

‎auth/src/main/java/com/firebase/ui/auth/AuthUI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public Task<Void> signOut(@NonNull FragmentActivity activity) {
192192

193193
// Twitter sign out
194194
try {
195-
TwitterProvider.signout(activity);
195+
TwitterProvider.signOut(activity);
196196
} catch (NoClassDefFoundError e) {
197197
// do nothing
198198
}

‎auth/src/main/java/com/firebase/ui/auth/IdpResponse.java

Lines changed: 18 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -24,35 +24,28 @@
2424

2525
import com.firebase.ui.auth.ui.ExtraConstants;
2626
import com.google.firebase.auth.FacebookAuthProvider;
27-
import com.google.firebase.auth.GithubAuthProvider;
2827
import com.google.firebase.auth.GoogleAuthProvider;
2928
import com.google.firebase.auth.TwitterAuthProvider;
3029

3130
/**
3231
* A container that encapsulates the result of authenticating with an Identity Provider.
3332
*/
3433
public class IdpResponse implements Parcelable {
35-
private final String mProviderId;
36-
private final String mEmail;
37-
private final String mPhoneNumber;
34+
private final User mUser;
3835
private final String mToken;
3936
private final String mSecret;
4037
private final int mErrorCode;
4138

4239
private IdpResponse(int errorCode) {
43-
this(null, null, null, null, null, errorCode);
40+
this(null, null, null, errorCode);
4441
}
4542

4643
private IdpResponse(
47-
String providerId,
48-
String email,
49-
String phoneNumber,
44+
User user,
5045
String token,
5146
String secret,
5247
int errorCode) {
53-
mProviderId = providerId;
54-
mEmail = email;
55-
mPhoneNumber = phoneNumber;
48+
mUser = user;
5649
mToken = token;
5750
mSecret = secret;
5851
mErrorCode = errorCode;
@@ -89,23 +82,23 @@ public Intent toIntent() {
8982
@NonNull
9083
@AuthUI.SupportedProvider
9184
public String getProviderType() {
92-
return mProviderId;
85+
return mUser.getProviderId();
9386
}
9487

9588
/**
9689
* Get the email used to sign in.
9790
*/
9891
@Nullable
9992
public String getEmail() {
100-
return mEmail;
93+
return mUser.getEmail();
10194
}
10295

10396
/**
10497
* Get the phone number used to sign in.
10598
*/
10699
@Nullable
107100
public String getPhoneNumber() {
108-
return mPhoneNumber;
101+
return mUser.getPhoneNumber();
109102
}
110103

111104
/**
@@ -138,9 +131,7 @@ public int describeContents() {
138131

139132
@Override
140133
public void writeToParcel(Parcel dest, int flags) {
141-
dest.writeString(mProviderId);
142-
dest.writeString(mEmail);
143-
dest.writeString(mPhoneNumber);
134+
dest.writeParcelable(mUser, flags);
144135
dest.writeString(mToken);
145136
dest.writeString(mSecret);
146137
dest.writeInt(mErrorCode);
@@ -150,9 +141,7 @@ public void writeToParcel(Parcel dest, int flags) {
150141
@Override
151142
public IdpResponse createFromParcel(Parcel in) {
152143
return new IdpResponse(
153-
in.readString(),
154-
in.readString(),
155-
in.readString(),
144+
in.<User>readParcelable(User.class.getClassLoader()),
156145
in.readString(),
157146
in.readString(),
158147
in.readInt()
@@ -167,21 +156,12 @@ public IdpResponse[] newArray(int size) {
167156

168157
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
169158
public static class Builder {
170-
private String mProviderId;
171-
private String mEmail;
172-
private String mPhoneNumber;
159+
private User mUser;
173160
private String mToken;
174161
private String mSecret;
175162

176-
public Builder(@AuthUI.SupportedProvider @NonNull String providerId,
177-
@Nullable String email) {
178-
mProviderId = providerId;
179-
mEmail = email;
180-
}
181-
182-
public Builder setPhoneNumber(String phoneNumber) {
183-
mPhoneNumber = phoneNumber;
184-
return this;
163+
public Builder(@NonNull User user) {
164+
mUser = user;
185165
}
186166

187167
public Builder setToken(String token) {
@@ -195,22 +175,21 @@ public Builder setSecret(String secret) {
195175
}
196176

197177
public IdpResponse build() {
198-
if ((mProviderId.equalsIgnoreCase(GoogleAuthProvider.PROVIDER_ID)
199-
|| mProviderId.equalsIgnoreCase(FacebookAuthProvider.PROVIDER_ID)
200-
|| mProviderId.equalsIgnoreCase(TwitterAuthProvider.PROVIDER_ID)
201-
|| mProviderId.equalsIgnoreCase(GithubAuthProvider.PROVIDER_ID))
178+
String providerId = mUser.getProviderId();
179+
if ((providerId.equalsIgnoreCase(GoogleAuthProvider.PROVIDER_ID)
180+
|| providerId.equalsIgnoreCase(FacebookAuthProvider.PROVIDER_ID)
181+
|| providerId.equalsIgnoreCase(TwitterAuthProvider.PROVIDER_ID))
202182
&& TextUtils.isEmpty(mToken)) {
203183
throw new IllegalStateException(
204184
"Token cannot be null when using a non-email provider.");
205185
}
206-
if (mProviderId.equalsIgnoreCase(TwitterAuthProvider.PROVIDER_ID)
186+
if (providerId.equalsIgnoreCase(TwitterAuthProvider.PROVIDER_ID)
207187
&& TextUtils.isEmpty(mSecret)) {
208188
throw new IllegalStateException(
209189
"Secret cannot be null when using the Twitter provider.");
210190
}
211191

212-
return new IdpResponse(
213-
mProviderId, mEmail, mPhoneNumber, mToken, mSecret, ResultCodes.OK);
192+
return new IdpResponse(mUser, mToken, mSecret, ResultCodes.OK);
214193
}
215194
}
216195
}

0 commit comments

Comments
 (0)