Skip to content

Commit 0c9c4c9

Browse files
committed
Make SocialProvider names match the case the Firebase provider use
1 parent 4318acc commit 0c9c4c9

File tree

3 files changed

+15
-23
lines changed

3 files changed

+15
-23
lines changed

app/src/main/java/com/firebase/uidemo/RecyclerViewDemoActivity.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import com.firebase.client.AuthData;
1818
import com.firebase.client.Firebase;
1919
import com.firebase.client.FirebaseError;
20+
import com.firebase.client.Query;
2021
import com.firebase.ui.FirebaseLoginBaseActivity;
2122
import com.firebase.ui.FirebaseRecyclerViewAdapter;
2223
import com.firebase.ui.com.firebasei.ui.authimpl.SocialProvider;
@@ -58,7 +59,8 @@ public void onComplete(FirebaseError firebaseError, Firebase firebase) {
5859
}
5960
});
6061

61-
FirebaseRecyclerViewAdapter<Chat, ChatHolder> adapter = new FirebaseRecyclerViewAdapter<Chat, ChatHolder>(Chat.class, android.R.layout.two_line_list_item, ChatHolder.class, mRef) {
62+
Query recentMessages = mRef.limitToLast(50);
63+
FirebaseRecyclerViewAdapter<Chat, ChatHolder> adapter = new FirebaseRecyclerViewAdapter<Chat, ChatHolder>(Chat.class, android.R.layout.two_line_list_item, ChatHolder.class, recentMessages) {
6264
@Override
6365
public void populateViewHolder(ChatHolder chatView, Chat chat) {
6466
chatView.textView.setText(chat.getText());
@@ -102,7 +104,7 @@ public boolean onPrepareOptionsMenu(Menu menu) {
102104
public boolean onOptionsItemSelected(MenuItem item) {
103105
switch (item.getItemId()) {
104106
case LOGIN:
105-
this.loginWithProvider(SocialProvider.Google);
107+
this.loginWithProvider(SocialProvider.google);
106108
return true;
107109
case LOGOUT:
108110
this.logout();

library/src/main/java/com/firebase/ui/FirebaseLoginBaseActivity.java

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ public abstract class FirebaseLoginBaseActivity extends AppCompatActivity {
4141

4242
public void loginWithProvider(SocialProvider provider) {
4343
switch (provider) {
44-
case Google:
44+
case google:
4545
mGoogleAuthHelper.login();
4646
break;
47-
case Facebook:
48-
case Twitter:
47+
case facebook:
48+
case twitter:
4949
throw new UnsupportedOperationException();
5050
}
5151

@@ -54,11 +54,11 @@ public void loginWithProvider(SocialProvider provider) {
5454

5555
public void logout() {
5656
switch (mChosenProvider) {
57-
case Google:
57+
case google:
5858
mGoogleAuthHelper.logout();
5959
break;
60-
case Facebook:
61-
case Twitter:
60+
case facebook:
61+
case twitter:
6262
throw new UnsupportedOperationException();
6363
}
6464
mRef.unauth();
@@ -97,18 +97,7 @@ protected void onStart() {
9797
@Override
9898
public void onAuthStateChanged(AuthData authData) {
9999
if (authData != null) {
100-
if (authData.getProvider().equals("google")) {
101-
mChosenProvider = SocialProvider.Google;
102-
}
103-
else if (authData.getProvider().equals("facebook")) {
104-
mChosenProvider = SocialProvider.Facebook;
105-
}
106-
else if (authData.getProvider().equals("twitter")) {
107-
mChosenProvider = SocialProvider.Twitter;
108-
}
109-
else {
110-
throw new UnsupportedOperationException("Provider '"+authData.getProvider()+"' is not handled");
111-
}
100+
mChosenProvider = SocialProvider.valueOf(authData.getProvider());
112101
onFirebaseLogin(authData);
113102
} else {
114103
onFirebaseLogout();
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package com.firebase.ui.com.firebasei.ui.authimpl;
22

3+
// Note: these enum values must be lowercase, to ensure they match the casing used by the Firebase Authentication providers
34
public enum SocialProvider {
4-
Google,
5-
Facebook,
6-
Twitter
5+
google,
6+
facebook,
7+
twitter
78
}

0 commit comments

Comments
 (0)