Skip to content

Commit

Permalink
Merge pull request #589 from /issues/587-illegalstate
Browse files Browse the repository at this point in the history
Fix IllegalStateException when showing error dialog
  • Loading branch information
TomasKypta authored Jun 3, 2024
2 parents aa2901c + 80169c9 commit 2054976
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ public void onCancel() {
});

// Show fragment
dialogFragment.show(fragmentManager, BiometricErrorDialogFragment.FRAGMENT_DEFAULT_TAG);
DialogFragmentUtil.showDialogAllowingStateLoss(dialogFragment, fragmentManager, BiometricErrorDialogFragment.FRAGMENT_DEFAULT_TAG);

return cancelableTask;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/*
* Copyright 2024 Wultra s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions
* and limitations under the License.
*/

package io.getlime.security.powerauth.biometry;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;

/**
* Utility methods for `DialogFragment`.
*/
public class DialogFragmentUtil {

/**
* A utility method to show dialog safely when `android.app.Activity#onSaveInstanceState(Bundle)` was already called.
*/
public static void showDialogAllowingStateLoss(@NonNull DialogFragment dialogFragment, @NonNull FragmentManager manager, @Nullable String tag) {
final FragmentTransaction ft = manager.beginTransaction();
ft.setReorderingAllowed(true);
ft.add(dialogFragment, tag);
// cannot commit() to avoid java.lang.IllegalStateException when onSaveInstanceState() was already called
ft.commitAllowingStateLoss();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ public void onCancel() {
dialogFragment.dismiss();
}
});
dialogFragment.show(fragmentManager, BiometricErrorDialogFragment.FRAGMENT_DEFAULT_TAG);
DialogFragmentUtil.showDialogAllowingStateLoss(dialogFragment, fragmentManager, BiometricErrorDialogFragment.FRAGMENT_DEFAULT_TAG);
}

/**
Expand Down Expand Up @@ -529,7 +529,7 @@ public void onCancel() {
});

// Show fragment
dialogFragment.show(fragmentManager, BiometricErrorDialogFragment.FRAGMENT_DEFAULT_TAG);
DialogFragmentUtil.showDialogAllowingStateLoss(dialogFragment, fragmentManager, BiometricErrorDialogFragment.FRAGMENT_DEFAULT_TAG);
}

/**
Expand Down

0 comments on commit 2054976

Please sign in to comment.