Skip to content

Commit ce8426a

Browse files
authored
Improve network error handling (#1811)
1 parent 8240822 commit ce8426a

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
- Fixes issue with custom parameters for OAuth providers (#1805)
22
- Restore `setGithubButtonId` when using custom layouts (#1783)
3+
- Improve how network errors display when they are non-fatal (#1803)

auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
import com.firebase.ui.auth.util.ui.ImeHelper;
2424
import com.firebase.ui.auth.util.ui.fieldvalidators.EmailFieldValidator;
2525
import com.firebase.ui.auth.viewmodel.ResourceObserver;
26+
import com.google.android.material.snackbar.Snackbar;
2627
import com.google.android.material.textfield.TextInputLayout;
28+
import com.google.firebase.FirebaseNetworkException;
2729
import com.google.firebase.auth.EmailAuthProvider;
2830

2931
import androidx.annotation.NonNull;
@@ -150,6 +152,11 @@ protected void onFailure(@NonNull Exception e) {
150152
&& ((FirebaseUiException) e).getErrorCode() == ErrorCodes.DEVELOPER_ERROR) {
151153
mListener.onDeveloperFailure(e);
152154
}
155+
156+
if (e instanceof FirebaseNetworkException) {
157+
Snackbar.make(getView(), getString(R.string.fui_no_internet), Snackbar.LENGTH_SHORT).show();
158+
}
159+
153160
// Otherwise just let the user enter their data
154161
}
155162
});

auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import com.firebase.ui.auth.viewmodel.ProviderSignInBase;
4848
import com.firebase.ui.auth.viewmodel.ResourceObserver;
4949
import com.firebase.ui.auth.viewmodel.idp.SocialProviderResponseHandler;
50+
import com.google.android.material.snackbar.Snackbar;
5051
import com.google.firebase.FirebaseApp;
5152
import com.google.firebase.auth.EmailAuthProvider;
5253
import com.google.firebase.auth.FacebookAuthProvider;
@@ -362,7 +363,7 @@ private void handleResponse(@NonNull IdpResponse response) {
362363
@Override
363364
public void onClick(View view) {
364365
if (isOffline()) {
365-
Toast.makeText(AuthMethodPickerActivity.this, getString(R.string.fui_no_internet), Toast.LENGTH_SHORT).show();
366+
Snackbar.make(findViewById(android.R.id.content), getString(R.string.fui_no_internet), Snackbar.LENGTH_SHORT).show();
366367
return;
367368
}
368369

0 commit comments

Comments
 (0)