Skip to content

Commit 5fb0fc1

Browse files
authored
Version 6.3.0
Version 6.3.0
2 parents 6d41fb2 + 47cb77d commit 5fb0fc1

File tree

113 files changed

+451
-557
lines changed

Some content is hidden

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

113 files changed

+451
-557
lines changed

CHANGELOG.md

Whitespace-only changes.

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@ libraries.
4848
```groovy
4949
dependencies {
5050
// FirebaseUI for Firebase Realtime Database
51-
implementation 'com.firebaseui:firebase-ui-database:6.2.1'
51+
implementation 'com.firebaseui:firebase-ui-database:6.3.0'
5252
5353
// FirebaseUI for Cloud Firestore
54-
implementation 'com.firebaseui:firebase-ui-firestore:6.2.1'
54+
implementation 'com.firebaseui:firebase-ui-firestore:6.3.0'
5555
5656
// FirebaseUI for Firebase Auth
57-
implementation 'com.firebaseui:firebase-ui-auth:6.2.1'
57+
implementation 'com.firebaseui:firebase-ui-auth:6.3.0'
5858
5959
// FirebaseUI for Cloud Storage
60-
implementation 'com.firebaseui:firebase-ui-storage:6.2.1'
60+
implementation 'com.firebaseui:firebase-ui-storage:6.3.0'
6161
}
6262
```
6363

@@ -113,7 +113,7 @@ you want to use. Here are some examples listing all of the critical dependencies
113113
implementation "com.google.firebase:firebase-auth:$X.Y.Z"
114114
implementation "com.google.android.gms:play-services-auth:$X.Y.Z"
115115
116-
implementation "android.arch.lifecycle:extensions:$X.Y.Z"
116+
implementation "androidx.lifecycle:lifecycle-extensions:$X.Y.Z"
117117
implementation "androidx.browser:browser:$X.Y.Z"
118118
implementation "androidx.cardview:cardview:$X.Y.Z"
119119
implementation "androidx.constraintlayout:constraintlayout:$X.Y.Z"

app/src/main/java/com/firebase/uidemo/database/firestore/FirestoreChatActivity.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.firebase.uidemo.database.firestore;
22

3+
import android.annotation.SuppressLint;
34
import android.os.Bundle;
45
import android.util.Log;
56
import android.view.LayoutInflater;
@@ -39,6 +40,7 @@
3940
* For a general intro to the RecyclerView, see <a href="https://developer.android.com/training/material/lists-cards.html">Creating
4041
* Lists</a>.
4142
*/
43+
@SuppressLint("RestrictedApi")
4244
public class FirestoreChatActivity extends AppCompatActivity
4345
implements FirebaseAuth.AuthStateListener {
4446
private static final String TAG = "FirestoreChatActivity";
@@ -104,7 +106,9 @@ public void onDonePressed() {
104106
@Override
105107
public void onStart() {
106108
super.onStart();
107-
if (isSignedIn()) { attachRecyclerViewAdapter(); }
109+
if (isSignedIn()) {
110+
attachRecyclerViewAdapter();
111+
}
108112
FirebaseAuth.getInstance().addAuthStateListener(this);
109113
}
110114

app/src/main/java/com/firebase/uidemo/database/realtime/FirebaseDbPagingActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
public class FirebaseDbPagingActivity extends AppCompatActivity {
3434

35-
private final String TAG = "PagingActivity";
35+
private static final String TAG = "PagingActivity";
3636

3737
@BindView(R.id.paging_recycler)
3838
RecyclerView mRecycler;

app/src/main/java/com/firebase/uidemo/database/realtime/RealtimeDbChatActivity.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.firebase.uidemo.database.realtime;
22

3+
import android.annotation.SuppressLint;
34
import android.os.Bundle;
45
import android.util.Log;
56
import android.view.LayoutInflater;
@@ -39,6 +40,7 @@
3940
* For a general intro to the RecyclerView, see <a href="https://developer.android.com/training/material/lists-cards.html">Creating
4041
* Lists</a>.
4142
*/
43+
@SuppressLint("RestrictedApi")
4244
public class RealtimeDbChatActivity extends AppCompatActivity
4345
implements FirebaseAuth.AuthStateListener {
4446
private static final String TAG = "RealtimeDatabaseDemo";
@@ -47,7 +49,7 @@ public class RealtimeDbChatActivity extends AppCompatActivity
4749
* Get the last 50 chat messages.
4850
*/
4951
@NonNull
50-
protected static final Query sChatQuery =
52+
protected final Query sChatQuery =
5153
FirebaseDatabase.getInstance().getReference().child("chats").limitToLast(50);
5254

5355
@BindView(R.id.messagesList)
@@ -82,7 +84,9 @@ public void onDonePressed() {
8284
@Override
8385
public void onStart() {
8486
super.onStart();
85-
if (isSignedIn()) { attachRecyclerViewAdapter(); }
87+
if (isSignedIn()) {
88+
attachRecyclerViewAdapter();
89+
}
8690
FirebaseAuth.getInstance().addAuthStateListener(this);
8791
}
8892

app/src/main/java/com/firebase/uidemo/util/ConfigurationUtils.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.firebase.uidemo.util;
22

3+
import android.annotation.SuppressLint;
34
import android.content.Context;
45

56
import com.firebase.ui.auth.AuthUI;
@@ -12,6 +13,7 @@
1213

1314
import androidx.annotation.NonNull;
1415

16+
@SuppressLint("RestrictedApi")
1517
public final class ConfigurationUtils {
1618

1719
private ConfigurationUtils() {

auth/README.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Gradle, add the dependency:
6565
```groovy
6666
dependencies {
6767
// ...
68-
implementation 'com.firebaseui:firebase-ui-auth:6.2.1'
68+
implementation 'com.firebaseui:firebase-ui-auth:6.3.0'
6969
7070
// Required only if Facebook login support is required
7171
// Find the latest Facebook SDK releases here: https://github.com/facebook/facebook-android-sdk/blob/master/CHANGELOG.md
@@ -273,19 +273,19 @@ pass it to us via `setEmailLink`.
273273

274274
```java
275275
if (AuthUI.canHandleIntent(getIntent())) {
276-
if (getIntent().getExtras() != null) {
277-
return;
278-
}
279-
String link = getIntent().getExtras().getString(ExtraConstants.EMAIL_LINK_SIGN_IN);
280-
if (link != null) {
281-
startActivityForResult(
282-
AuthUI.getInstance()
283-
.createSignInIntentBuilder()
284-
.setEmailLink(link)
285-
.setAvailableProviders(getAvailableProviders())
286-
.build(),
287-
RC_SIGN_IN);
288-
}
276+
if (getIntent().getExtras() == null) {
277+
return;
278+
}
279+
String link = getIntent().getData().toString();
280+
if (link != null) {
281+
startActivityForResult(
282+
AuthUI.getInstance()
283+
.createSignInIntentBuilder()
284+
.setEmailLink(link)
285+
.setAvailableProviders(getAvailableProviders())
286+
.build(),
287+
RC_SIGN_IN);
288+
}
289289
}
290290
```
291291

auth/src/main/java/com/firebase/ui/auth/AuthMethodPickerLayout.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import com.google.firebase.auth.EmailAuthProvider;
88
import com.google.firebase.auth.FacebookAuthProvider;
9+
import com.google.firebase.auth.GithubAuthProvider;
910
import com.google.firebase.auth.GoogleAuthProvider;
1011
import com.google.firebase.auth.PhoneAuthProvider;
1112
import com.google.firebase.auth.TwitterAuthProvider;
@@ -158,6 +159,12 @@ public AuthMethodPickerLayout.Builder setAnonymousButtonId(@IdRes int anonymousB
158159
return this;
159160
}
160161

162+
public AuthMethodPickerLayout.Builder setGithubButtonId(
163+
@IdRes int githubButtonId) {
164+
providersMapping.put(GithubAuthProvider.PROVIDER_ID, githubButtonId);
165+
return this;
166+
}
167+
161168
public AuthMethodPickerLayout.Builder setMicrosoftButtonId(
162169
@IdRes int microsoftButtonId) {
163170
providersMapping.put(AuthUI.MICROSOFT_PROVIDER, microsoftButtonId);

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,7 @@ public final class AuthUI {
149149
public static final Set<String> SOCIAL_PROVIDERS =
150150
Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
151151
GoogleAuthProvider.PROVIDER_ID,
152-
FacebookAuthProvider.PROVIDER_ID,
153-
GithubAuthProvider.PROVIDER_ID)));
152+
FacebookAuthProvider.PROVIDER_ID)));
154153

155154
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
156155
public static final String UNCONFIGURED_CONFIG_VALUE = "CHANGE-ME";

auth/src/main/java/com/firebase/ui/auth/data/remote/GenericIdpSignInHandler.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import com.google.firebase.auth.OAuthCredential;
4040
import com.google.firebase.auth.OAuthProvider;
4141

42+
import java.util.HashMap;
4243
import java.util.List;
4344
import java.util.Map;
4445

@@ -200,9 +201,12 @@ protected OAuthProvider buildOAuthProvider(String providerId) {
200201

201202
List<String> scopes =
202203
getArguments().getParams().getStringArrayList(ExtraConstants.GENERIC_OAUTH_SCOPES);
203-
Map<String, String> customParams =
204-
getArguments().getParams()
205-
.getParcelable(ExtraConstants.GENERIC_OAUTH_CUSTOM_PARAMETERS);
204+
205+
// This unchecked cast is safe, this extra is put in as a serializable
206+
// in AuthUI.setCustomParameters
207+
HashMap<String, String> customParams =
208+
(HashMap<String, String>) getArguments().getParams()
209+
.getSerializable(ExtraConstants.GENERIC_OAUTH_CUSTOM_PARAMETERS);
206210

207211
if (scopes != null) {
208212
providerBuilder.setScopes(scopes);

0 commit comments

Comments
 (0)