Skip to content

Fix dialog NPE and IllegalStateExceptions by guarding #927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samtstern merged 2 commits into from
Sep 28, 2017
Merged

Fix dialog NPE and IllegalStateExceptions by guarding #927

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52499e9
Fix IllegalStateException on showing dialog
samtstern Sep 27, 2017
40b5b65
Also guard against nulls (#921)
samtstern Sep 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions auth/src/main/java/com/firebase/ui/auth/ui/phone/CompletableProgressDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,23 @@ public final class CompletableProgressDialog extends DialogFragment {

public static CompletableProgressDialog show(FragmentManager manager) {
CompletableProgressDialog dialog = new CompletableProgressDialog();
dialog.show(manager, TAG);
dialog.showAllowingStateLoss(manager, TAG);
return dialog;
}

/**
* This method is adapted from {@link #show(FragmentManager, String)}
*/
public void showAllowingStateLoss(FragmentManager manager, String tag) {
// This prevents us from hitting FragmentManager.checkStateLoss() which
// throws a runtime exception if state has already been saved.
if (manager.isStateSaved()) {
return;
}

show(manager, tag);
}

@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
Expand All @@ -60,12 +73,18 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {

public void onComplete(String msg) {
setMessage(msg);
mProgress.setVisibility(View.GONE);
mSuccessImage.setVisibility(View.VISIBLE);

if (mProgress != null) {
mProgress.setVisibility(View.GONE);
}

if (mSuccessImage != null) {
mSuccessImage.setVisibility(View.VISIBLE);
}
}

public void setMessage(CharSequence message) {
if (mProgress != null) {
if (mProgress != null && mMessageView != null) {
mMessageView.setText(message);
} else {
mMessage = message;
Expand Down