Skip to content

Commit bb7b0fc

Browse files
pufpuf
committed
Rename SocialProvider to AuthProviderType
The name made no sense after we added PASSWORD to it.
1 parent 3870fd0 commit bb7b0fc

File tree

9 files changed

+27
-29
lines changed

9 files changed

+27
-29
lines changed

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,10 +175,10 @@ public class MainActivity extends FirebaseLoginBaseActivity {
175175
protected void onStart() {
176176
super.onStart();
177177
// All providers are optional! Remove any you don't want.
178-
setEnabledAuthProvider(SocialProvider.FACEBOOK);
179-
setEnabledAuthProvider(SocialProvider.TWITTER);
180-
setEnabledAuthProvider(SocialProvider.GOOGLE);
181-
setEnabledAuthProvider(SocialProvider.PASSWORD);
178+
setEnabledAuthProvider(AuthProviderType.FACEBOOK);
179+
setEnabledAuthProvider(AuthProviderType.TWITTER);
180+
setEnabledAuthProvider(AuthProviderType.GOOGLE);
181+
setEnabledAuthProvider(AuthProviderType.PASSWORD);
182182
}
183183
```
184184

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import com.firebase.ui.auth.core.FirebaseLoginBaseActivity;
2424
import com.firebase.ui.FirebaseRecyclerAdapter;
2525
import com.firebase.ui.auth.core.FirebaseLoginError;
26-
import com.firebase.ui.auth.core.SocialProvider;
26+
import com.firebase.ui.auth.core.AuthProviderType;
2727

2828
public class RecyclerViewDemoActivity extends FirebaseLoginBaseActivity {
2929

@@ -99,10 +99,10 @@ public void populateViewHolder(ChatHolder chatView, Chat chat, int position) {
9999
@Override
100100
protected void onStart() {
101101
super.onStart();
102-
setEnabledAuthProvider(SocialProvider.FACEBOOK);
103-
setEnabledAuthProvider(SocialProvider.TWITTER);
104-
setEnabledAuthProvider(SocialProvider.GOOGLE);
105-
setEnabledAuthProvider(SocialProvider.PASSWORD);
102+
setEnabledAuthProvider(AuthProviderType.FACEBOOK);
103+
setEnabledAuthProvider(AuthProviderType.TWITTER);
104+
setEnabledAuthProvider(AuthProviderType.GOOGLE);
105+
setEnabledAuthProvider(AuthProviderType.PASSWORD);
106106
}
107107

108108
@Override

‎library/src/main/java/com/firebase/ui/auth/core/SocialProvider.java renamed to ‎library/src/main/java/com/firebase/ui/auth/core/AuthProviderType.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
import java.lang.reflect.InvocationTargetException;
1313

14-
public enum SocialProvider {
14+
public enum AuthProviderType {
1515
GOOGLE ("google", GoogleAuthProvider.class, R.id.google_button),
1616
FACEBOOK("facebook", FacebookAuthProvider.class, R.id.facebook_button),
1717
TWITTER ("twitter", TwitterAuthProvider.class, R.id.twitter_button),
@@ -21,7 +21,7 @@ public enum SocialProvider {
2121
private final Class<? extends FirebaseAuthProvider> mClass;
2222
private final int mButtonId;
2323

24-
SocialProvider(String name, Class<? extends FirebaseAuthProvider> clazz, int button_id) {
24+
AuthProviderType(String name, Class<? extends FirebaseAuthProvider> clazz, int button_id) {
2525
this.mName = name;
2626
this.mClass = clazz;
2727
this.mButtonId = button_id;
@@ -36,7 +36,7 @@ public int getButtonId() {
3636

3737
public FirebaseAuthProvider createProvider(Context context, Firebase ref, TokenAuthHandler handler) {
3838
try {
39-
return mClass.getConstructor(Context.class, SocialProvider.class, String.class, Firebase.class, TokenAuthHandler.class).newInstance(context, this, this.getName(), ref, handler);
39+
return mClass.getConstructor(Context.class, AuthProviderType.class, String.class, Firebase.class, TokenAuthHandler.class).newInstance(context, this, this.getName(), ref, handler);
4040
} catch (NoSuchMethodException e) {
4141
throw new RuntimeException(e);
4242
} catch (IllegalAccessException e) {
@@ -47,8 +47,8 @@ public FirebaseAuthProvider createProvider(Context context, Firebase ref, TokenA
4747
throw new RuntimeException(e);
4848
}
4949
}
50-
public static SocialProvider getTypeForProvider(FirebaseAuthProvider provider) {
51-
for (SocialProvider type : SocialProvider.values()) {
50+
public static AuthProviderType getTypeForProvider(FirebaseAuthProvider provider) {
51+
for (AuthProviderType type : AuthProviderType.values()) {
5252
if (provider.getProviderName() == type.getName()) {
5353
return type;
5454
}

‎library/src/main/java/com/firebase/ui/auth/core/FirebaseAuthProvider.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@
1313
public abstract class FirebaseAuthProvider {
1414
private static final String TAG = "FirebaseAuthProvider";
1515
private final Context mContext;
16-
private final SocialProvider mProviderType;
16+
private final AuthProviderType mAuthProviderType;
1717
private final String mProviderName;
1818
private final Firebase mRef;
1919
private final TokenAuthHandler mHandler;
2020

2121
public abstract void logout();
2222
public Context getContext() { return mContext; }
23-
public SocialProvider getProviderType() { return mProviderType; }
23+
public AuthProviderType getProviderType() { return mAuthProviderType; }
2424
public String getProviderName() { return mProviderName; }
2525
public Firebase getFirebaseRef() { return mRef; }
2626
public TokenAuthHandler getHandler() { return mHandler; }
2727

28-
protected FirebaseAuthProvider(Context context, SocialProvider providerType, String providerName, Firebase ref, TokenAuthHandler handler) {
28+
protected FirebaseAuthProvider(Context context, AuthProviderType providerType, String providerName, Firebase ref, TokenAuthHandler handler) {
2929
mContext = context;
30-
mProviderType = providerType;
30+
mAuthProviderType = providerType;
3131
mProviderName = providerName;
3232
mRef = ref;
3333
mHandler = handler;

‎library/src/main/java/com/firebase/ui/auth/core/FirebaseLoginBaseActivity.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import android.content.Intent;
44
import android.support.v7.app.AppCompatActivity;
5-
import android.util.Log;
65

76
import com.firebase.client.AuthData;
87
import com.firebase.client.Firebase;
@@ -106,7 +105,7 @@ public void resetFirebaseLoginDialog() {
106105
*
107106
* @param provider the provider to enable.
108107
*/
109-
public void setEnabledAuthProvider(SocialProvider provider) {
108+
public void setEnabledAuthProvider(AuthProviderType provider) {
110109
mDialog.setEnabledProvider(provider);
111110
}
112111

‎library/src/main/java/com/firebase/ui/auth/facebook/FacebookAuthProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import com.firebase.ui.auth.core.FirebaseResponse;
2020
import com.firebase.ui.auth.core.FirebaseLoginError;
2121
import com.firebase.ui.auth.core.FirebaseOAuthToken;
22-
import com.firebase.ui.auth.core.SocialProvider;
22+
import com.firebase.ui.auth.core.AuthProviderType;
2323
import com.firebase.ui.auth.core.TokenAuthHandler;
2424

2525
import java.util.Arrays;
@@ -32,7 +32,7 @@ public class FacebookAuthProvider extends FirebaseAuthProvider {
3232
private LoginManager mLoginManager;
3333
private Boolean isReady = false;
3434

35-
public FacebookAuthProvider(Context context, SocialProvider providerType, String providerName, Firebase ref, final TokenAuthHandler handler) {
35+
public FacebookAuthProvider(Context context, AuthProviderType providerType, String providerName, Firebase ref, final TokenAuthHandler handler) {
3636
super(context, providerType, providerName, ref, handler);
3737
FacebookSdk.sdkInitialize(context.getApplicationContext());
3838

‎library/src/main/java/com/firebase/ui/auth/google/GoogleAuthProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import com.firebase.ui.auth.core.FirebaseLoginError;
1313
import com.firebase.ui.auth.core.FirebaseOAuthToken;
1414
import com.firebase.ui.auth.core.FirebaseResponse;
15-
import com.firebase.ui.auth.core.SocialProvider;
15+
import com.firebase.ui.auth.core.AuthProviderType;
1616
import com.firebase.ui.auth.core.TokenAuthHandler;
1717
import com.google.android.gms.auth.api.Auth;
1818
import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
@@ -32,7 +32,7 @@ public class GoogleAuthProvider extends FirebaseAuthProvider implements
3232
private GoogleApiClient mGoogleApiClient;
3333
private Integer onConnectedAction = 0;
3434

35-
public GoogleAuthProvider(Context context, SocialProvider providerType, String providerName, Firebase ref, TokenAuthHandler handler) {
35+
public GoogleAuthProvider(Context context, AuthProviderType providerType, String providerName, Firebase ref, TokenAuthHandler handler) {
3636
super(context, providerType, providerName, ref, handler);
3737

3838
GoogleSignInOptions gso = new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)

‎library/src/main/java/com/firebase/ui/auth/password/PasswordAuthProvider.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.firebase.ui.auth.password;
22

3-
import android.app.Activity;
43
import android.content.Context;
54

65
import com.firebase.client.AuthData;
@@ -9,14 +8,14 @@
98
import com.firebase.ui.auth.core.FirebaseAuthProvider;
109
import com.firebase.ui.auth.core.FirebaseResponse;
1110
import com.firebase.ui.auth.core.FirebaseLoginError;
12-
import com.firebase.ui.auth.core.SocialProvider;
11+
import com.firebase.ui.auth.core.AuthProviderType;
1312
import com.firebase.ui.auth.core.TokenAuthHandler;
1413

1514
public class PasswordAuthProvider extends FirebaseAuthProvider {
1615

1716
private final String LOG_TAG = "PasswordAuthProvider";
1817

19-
public PasswordAuthProvider(Context context, SocialProvider providerType, String providerName, Firebase ref, TokenAuthHandler handler) {
18+
public PasswordAuthProvider(Context context, AuthProviderType providerType, String providerName, Firebase ref, TokenAuthHandler handler) {
2019
super(context, providerType, providerName, ref, handler);
2120
}
2221

‎library/src/main/java/com/firebase/ui/auth/twitter/TwitterAuthProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
import com.firebase.ui.auth.core.FirebaseLoginError;
1010
import com.firebase.ui.auth.core.FirebaseOAuthToken;
1111
import com.firebase.ui.auth.core.FirebaseResponse;
12-
import com.firebase.ui.auth.core.SocialProvider;
12+
import com.firebase.ui.auth.core.AuthProviderType;
1313
import com.firebase.ui.auth.core.TokenAuthHandler;
1414

1515
public class TwitterAuthProvider extends FirebaseAuthProvider {
1616

1717
public static final String TAG = "TwitterAuthProvider";
1818

19-
public TwitterAuthProvider(Context context, SocialProvider providerType, String providerName, Firebase ref, TokenAuthHandler handler) {
19+
public TwitterAuthProvider(Context context, AuthProviderType providerType, String providerName, Firebase ref, TokenAuthHandler handler) {
2020
super(context, providerType, providerName, ref, handler);
2121
}
2222

0 commit comments

Comments
 (0)