Skip to content

Commit 9d61550

Browse files
abeisgoatabeisgoat
committed
Helper -> Provider
1 parent 1036784 commit 9d61550

File tree

6 files changed

+47
-54
lines changed

6 files changed

+47
-54
lines changed

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,9 @@
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;
9-
import com.firebase.client.FirebaseError;
10-
import com.firebase.ui.auth.facebook.FacebookAuthHelper;
11-
import com.firebase.ui.auth.google.GoogleAuthHelper;
12-
import com.firebase.ui.auth.password.PasswordAuthHelper;
13-
import com.firebase.ui.auth.twitter.TwitterAuthHelper;
148

159
public abstract class FirebaseLoginBaseActivity extends AppCompatActivity {
1610

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

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -12,50 +12,49 @@
1212

1313
import com.firebase.client.AuthData;
1414
import com.firebase.client.Firebase;
15-
import com.firebase.client.FirebaseError;
1615
import com.firebase.ui.R;
17-
import com.firebase.ui.auth.facebook.FacebookAuthHelper;
18-
import com.firebase.ui.auth.google.GoogleAuthHelper;
19-
import com.firebase.ui.auth.password.PasswordAuthHelper;
20-
import com.firebase.ui.auth.twitter.TwitterAuthHelper;
16+
import com.firebase.ui.auth.facebook.FacebookAuthProvider;
17+
import com.firebase.ui.auth.google.GoogleAuthProvider;
18+
import com.firebase.ui.auth.password.PasswordAuthProvider;
19+
import com.firebase.ui.auth.twitter.TwitterAuthProvider;
2120

2221
public class FirebaseLoginDialog extends DialogFragment {
2322

24-
FacebookAuthHelper mFacebookAuthHelper;
25-
TwitterAuthHelper mTwitterAuthHelper;
26-
GoogleAuthHelper mGoogleAuthHelper;
27-
PasswordAuthHelper mPasswordAuthHelper;
23+
FacebookAuthProvider mFacebookAuthProvider;
24+
TwitterAuthProvider mTwitterAuthProvider;
25+
GoogleAuthProvider mGoogleAuthProvider;
26+
PasswordAuthProvider mPasswordAuthProvider;
2827
TokenAuthHandler mHandler;
2928
Firebase mRef;
3029
Context mContext;
3130
View mView;
3231

3332
public void onStart() {
3433
super.onStart();
35-
if (mGoogleAuthHelper != null) mGoogleAuthHelper.onStart();
34+
if (mGoogleAuthProvider != null) mGoogleAuthProvider.onStart();
3635
}
3736

3837
public void onStop() {
3938
super.onStop();
40-
if (mGoogleAuthHelper != null) mGoogleAuthHelper.onStop();
39+
if (mGoogleAuthProvider != null) mGoogleAuthProvider.onStop();
4140
}
4241

4342
public void onDestroy() {
4443
super.onDestroy();
45-
if (mGoogleAuthHelper != null) mGoogleAuthHelper.onStop();
44+
if (mGoogleAuthProvider != null) mGoogleAuthProvider.onStop();
4645
}
4746

4847
public void onActivityResult(int requestCode, int resultCode, Intent data) {
49-
if (mFacebookAuthHelper != null) {
50-
mFacebookAuthHelper.mCallbackManager.onActivityResult(requestCode, resultCode, data);
48+
if (mFacebookAuthProvider != null) {
49+
mFacebookAuthProvider.mCallbackManager.onActivityResult(requestCode, resultCode, data);
5150
}
5251

53-
if (mTwitterAuthHelper != null) {
54-
mTwitterAuthHelper.onActivityResult(requestCode, resultCode, data);
52+
if (mTwitterAuthProvider != null) {
53+
mTwitterAuthProvider.onActivityResult(requestCode, resultCode, data);
5554
}
5655

57-
if (mGoogleAuthHelper != null) {
58-
mGoogleAuthHelper.onActivityResult(requestCode, resultCode, data);
56+
if (mGoogleAuthProvider != null) {
57+
mGoogleAuthProvider.onActivityResult(requestCode, resultCode, data);
5958
}
6059
}
6160

@@ -66,18 +65,18 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
6665

6766
mView = inflater.inflate(R.layout.fragment_firebase_login, null);
6867

69-
if (mFacebookAuthHelper != null) showLoginOption(mFacebookAuthHelper, R.id.facebook_button);
68+
if (mFacebookAuthProvider != null) showLoginOption(mFacebookAuthProvider, R.id.facebook_button);
7069
else mView.findViewById(R.id.facebook_button).setVisibility(View.GONE);
7170

72-
if (mGoogleAuthHelper != null) showLoginOption(mGoogleAuthHelper, R.id.google_button);
71+
if (mGoogleAuthProvider != null) showLoginOption(mGoogleAuthProvider, R.id.google_button);
7372
else mView.findViewById(R.id.google_button).setVisibility(View.GONE);
7473

75-
if (mTwitterAuthHelper != null) showLoginOption(mTwitterAuthHelper, R.id.twitter_button);
74+
if (mTwitterAuthProvider != null) showLoginOption(mTwitterAuthProvider, R.id.twitter_button);
7675
else mView.findViewById(R.id.twitter_button).setVisibility(View.GONE);
7776

78-
if (mPasswordAuthHelper != null) {
79-
showLoginOption(mPasswordAuthHelper, R.id.password_button);
80-
if (mFacebookAuthHelper == null && mGoogleAuthHelper == null && mTwitterAuthHelper == null)
77+
if (mPasswordAuthProvider != null) {
78+
showLoginOption(mPasswordAuthProvider, R.id.password_button);
79+
if (mFacebookAuthProvider == null && mGoogleAuthProvider == null && mTwitterAuthProvider == null)
8180
mView.findViewById(R.id.or_section).setVisibility(View.GONE);
8281
}
8382
else mView.findViewById(R.id.password_section).setVisibility(View.GONE);
@@ -104,10 +103,10 @@ public void reset() {
104103
}
105104

106105
public void logout() {
107-
if (mFacebookAuthHelper != null) mFacebookAuthHelper.logout();
108-
if (mGoogleAuthHelper != null) mGoogleAuthHelper.logout();
109-
if (mTwitterAuthHelper != null) mTwitterAuthHelper.logout();
110-
if (mPasswordAuthHelper != null) mPasswordAuthHelper.logout();
106+
if (mFacebookAuthProvider != null) mFacebookAuthProvider.logout();
107+
if (mGoogleAuthProvider != null) mGoogleAuthProvider.logout();
108+
if (mTwitterAuthProvider != null) mTwitterAuthProvider.logout();
109+
if (mPasswordAuthProvider != null) mPasswordAuthProvider.logout();
111110
mRef.unauth();
112111
}
113112

@@ -137,20 +136,20 @@ public void onProviderError(FirebaseLoginError err) {
137136
public FirebaseLoginDialog setProviderEnabled(SocialProvider provider) {
138137
switch (provider) {
139138
case facebook:
140-
if (mFacebookAuthHelper == null)
141-
mFacebookAuthHelper = new FacebookAuthHelper(mContext, mRef, mHandler);
139+
if (mFacebookAuthProvider == null)
140+
mFacebookAuthProvider = new FacebookAuthProvider(mContext, mRef, mHandler);
142141
break;
143142
case google:
144-
if (mGoogleAuthHelper == null)
145-
mGoogleAuthHelper = new GoogleAuthHelper(mContext, mRef, mHandler);
143+
if (mGoogleAuthProvider == null)
144+
mGoogleAuthProvider = new GoogleAuthProvider(mContext, mRef, mHandler);
146145
break;
147146
case twitter:
148-
if (mTwitterAuthHelper == null)
149-
mTwitterAuthHelper = new TwitterAuthHelper(mContext, mRef, mHandler);
147+
if (mTwitterAuthProvider == null)
148+
mTwitterAuthProvider = new TwitterAuthProvider(mContext, mRef, mHandler);
150149
break;
151150
case password:
152-
if (mPasswordAuthHelper == null)
153-
mPasswordAuthHelper = new PasswordAuthHelper(mContext, mRef, mHandler);
151+
if (mPasswordAuthProvider == null)
152+
mPasswordAuthProvider = new PasswordAuthProvider(mContext, mRef, mHandler);
154153
break;
155154
}
156155

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@
2424
import java.util.Arrays;
2525
import java.util.Collection;
2626

27-
public class FacebookAuthHelper extends FirebaseAuthHelper {
27+
public class FacebookAuthProvider extends FirebaseAuthHelper {
2828

2929
public static final String PROVIDER_NAME = "facebook";
30-
private final String TAG = "FacebookAuthHelper";
30+
private final String TAG = "FacebookAuthProvider";
3131
public CallbackManager mCallbackManager;
3232
private LoginManager mLoginManager;
3333
private TokenAuthHandler mHandler;
3434
private Activity mActivity;
3535
private Firebase mRef;
3636
private Boolean isReady = false;
3737

38-
public FacebookAuthHelper(Context context, Firebase ref, final TokenAuthHandler handler) {
38+
public FacebookAuthProvider(Context context, Firebase ref, final TokenAuthHandler handler) {
3939
mActivity = (Activity) context;
4040
FacebookSdk.sdkInitialize(context.getApplicationContext());
4141

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@
2424
import com.google.android.gms.common.api.ResultCallback;
2525
import com.google.android.gms.common.api.Status;
2626

27-
public class GoogleAuthHelper extends FirebaseAuthHelper implements
27+
public class GoogleAuthProvider extends FirebaseAuthHelper implements
2828
GoogleApiClient.OnConnectionFailedListener,
2929
GoogleOAuthTaskHandler {
3030

3131
public final static String PROVIDER_NAME = "google";
3232
private static final int RC_SIGN_IN = 9001;
33-
private final String TAG = "GoogleAuthHelper";
33+
private final String TAG = "GoogleAuthProvider";
3434
private GoogleApiClient mGoogleApiClient;
3535
private TokenAuthHandler mHandler;
3636
private Activity mActivity;
3737
private Firebase mRef;
3838

39-
public GoogleAuthHelper(Context context, Firebase ref, TokenAuthHandler handler) {
39+
public GoogleAuthProvider(Context context, Firebase ref, TokenAuthHandler handler) {
4040
mActivity = (Activity) context;
4141
mRef = ref;
4242
mHandler = handler;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@
1111
import com.firebase.ui.auth.core.FirebaseLoginError;
1212
import com.firebase.ui.auth.core.TokenAuthHandler;
1313

14-
public class PasswordAuthHelper extends FirebaseAuthHelper {
14+
public class PasswordAuthProvider extends FirebaseAuthHelper {
1515

16-
private final String LOG_TAG = "PasswordAuthHelper";
16+
private final String LOG_TAG = "PasswordAuthProvider";
1717

1818
public final static String PROVIDER_NAME = "password";
1919

2020
private TokenAuthHandler mHandler;
2121
private Activity mActivity;
2222
private Firebase mRef;
2323

24-
public PasswordAuthHelper(Context context, Firebase ref, TokenAuthHandler handler) {
24+
public PasswordAuthProvider(Context context, Firebase ref, TokenAuthHandler handler) {
2525
mActivity = (Activity) context;
2626
mRef = ref;
2727
mHandler = handler;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
import com.firebase.ui.auth.core.FirebaseOAuthToken;
1111
import com.firebase.ui.auth.core.TokenAuthHandler;
1212

13-
public class TwitterAuthHelper extends FirebaseAuthHelper {
13+
public class TwitterAuthProvider extends FirebaseAuthHelper {
1414

15-
public static final String TAG = "TwitterAuthHelper";
15+
public static final String TAG = "TwitterAuthProvider";
1616
public static final String PROVIDER_NAME = "twitter";
1717

1818
private Activity mActivity;
1919
private TokenAuthHandler mHandler;
2020
private Firebase mRef;
2121

22-
public TwitterAuthHelper(Context context, Firebase ref, TokenAuthHandler handler) {
22+
public TwitterAuthProvider(Context context, Firebase ref, TokenAuthHandler handler) {
2323
mActivity = (Activity) context;
2424
mHandler = handler;
2525
mRef = ref;

0 commit comments

Comments
 (0)