Skip to content

Commit f3f472c

Browse files
committed
Addresses #53 and other minor cleanup
1 parent 745ad82 commit f3f472c

File tree

3 files changed

+18
-27
lines changed

3 files changed

+18
-27
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
135135
return super.onOptionsItemSelected(item);
136136
}
137137

138+
138139
@Override
139140
public void onFirebaseLoggedIn(AuthData authData) {
140141
Log.i(TAG, "Logged in to " + authData.getProvider().toString());
@@ -163,13 +164,13 @@ public void onFirebaseLoggedOut() {
163164
@Override
164165
public void onFirebaseLoginProviderError(FirebaseLoginError firebaseError) {
165166
Log.e(TAG, "Login provider error: " + firebaseError.toString());
166-
resetFirebaseLoginDialog();
167+
resetFirebaseLoginPrompt();
167168
}
168169

169170
@Override
170171
public void onFirebaseLoginUserError(FirebaseLoginError firebaseError) {
171172
Log.e(TAG, "Login user error: "+firebaseError.toString());
172-
resetFirebaseLoginDialog();
173+
resetFirebaseLoginPrompt();
173174
}
174175

175176
@Override

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
@@ -96,7 +96,7 @@ public void dismissFirebaseLoginPrompt() {
9696
mDialog.dismiss();
9797
}
9898

99-
public void resetFirebaseLoginDialog() {
99+
public void resetFirebaseLoginPrompt() {
100100
mDialog.reset();
101101
}
102102

@@ -112,7 +112,6 @@ public void setEnabledAuthProvider(AuthProviderType provider) {
112112
@Override
113113
protected void onStart() {
114114
super.onStart();
115-
116115
mHandler = new TokenAuthHandler() {
117116
@Override
118117
public void onSuccess(AuthData data) {

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

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,14 @@
66
import android.content.Context;
77
import android.content.Intent;
88
import android.os.Bundle;
9-
import android.util.Log;
109
import android.view.LayoutInflater;
1110
import android.view.View;
1211
import android.widget.EditText;
1312

1413
import com.firebase.client.AuthData;
1514
import com.firebase.client.Firebase;
1615
import com.firebase.ui.R;
17-
import com.firebase.ui.auth.facebook.FacebookAuthProvider;
1816
import com.firebase.ui.auth.google.GoogleAuthProvider;
19-
import com.firebase.ui.auth.password.PasswordAuthProvider;
20-
import com.firebase.ui.auth.twitter.TwitterAuthProvider;
2117

2218
import java.util.HashMap;
2319
import java.util.Map;
@@ -31,11 +27,6 @@ public class FirebaseLoginDialog extends DialogFragment {
3127
Context mContext;
3228
View mView;
3329

34-
/*
35-
We need to be extra aggressive about building / destroying mGoogleauthProviders so we don't
36-
end up with two clients connected at the same time.
37-
*/
38-
3930
@Override
4031
public void onStop() {
4132
super.onStop();
@@ -76,7 +67,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
7667
showLoginOption(mEnabledProvidersByType.get(providerType), providerType.getButtonId());
7768
}
7869
else {
79-
mView.findViewById(providerType.getButtonId()).setVisibility(View.GONE);;
70+
mView.findViewById(providerType.getButtonId()).setVisibility(View.GONE);
8071
}
8172
}
8273

@@ -86,9 +77,9 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
8677
}
8778

8879
mView.findViewById(R.id.loading_section).setVisibility(View.GONE);
89-
9080
builder.setView(mView);
9181

82+
this.setRetainInstance(true);
9283
return builder.create();
9384
}
9485

@@ -146,18 +137,18 @@ private void showLoginOption(final FirebaseAuthProvider helper, int id) {
146137
mView.findViewById(id).setOnClickListener(new View.OnClickListener() {
147138
@Override
148139
public void onClick(View view) {
149-
if (AuthProviderType.getTypeForProvider(helper) == AuthProviderType.PASSWORD) {
150-
EditText emailText = (EditText) mView.findViewById(R.id.email);
151-
EditText passwordText = (EditText) mView.findViewById(R.id.password);
152-
helper.login(emailText.getText().toString(), passwordText.getText().toString());
153-
154-
passwordText.setText("");
155-
} else {
156-
helper.login();
157-
}
158-
mActiveProvider = helper.getProviderType();
159-
mView.findViewById(R.id.login_section).setVisibility(View.GONE);
160-
mView.findViewById(R.id.loading_section).setVisibility(View.VISIBLE);
140+
if (AuthProviderType.getTypeForProvider(helper) == AuthProviderType.PASSWORD) {
141+
EditText emailText = (EditText) mView.findViewById(R.id.email);
142+
EditText passwordText = (EditText) mView.findViewById(R.id.password);
143+
helper.login(emailText.getText().toString(), passwordText.getText().toString());
144+
145+
passwordText.setText("");
146+
} else {
147+
helper.login();
148+
}
149+
mActiveProvider = helper.getProviderType();
150+
mView.findViewById(R.id.login_section).setVisibility(View.GONE);
151+
mView.findViewById(R.id.loading_section).setVisibility(View.VISIBLE);
161152
}
162153
});
163154
}

0 commit comments

Comments
 (0)