mirror of https://github.com/M66B/FairEmail.git
Prevent crash
This commit is contained in:
parent
9c759e310f
commit
a1d45a2684
|
@ -183,7 +183,7 @@ public class FragmentDialogBase extends DialogFragment {
|
||||||
targetRequestCode = requestCode;
|
targetRequestCode = requestCode;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setTargetActivity(ActivityBase activity, int requestCode){
|
public void setTargetActivity(ActivityBase activity, int requestCode) {
|
||||||
targetRequestKey = activity.getRequestKey();
|
targetRequestKey = activity.getRequestKey();
|
||||||
targetRequestCode = requestCode;
|
targetRequestCode = requestCode;
|
||||||
}
|
}
|
||||||
|
@ -197,14 +197,22 @@ public class FragmentDialogBase extends DialogFragment {
|
||||||
if (!hasResult || resultCode == RESULT_OK) {
|
if (!hasResult || resultCode == RESULT_OK) {
|
||||||
hasResult = true;
|
hasResult = true;
|
||||||
|
|
||||||
if (targetRequestKey != null) {
|
if (targetRequestKey != null)
|
||||||
Bundle args = getArguments();
|
try {
|
||||||
if (args == null) // onDismiss
|
Bundle args = getArguments();
|
||||||
args = new Bundle();
|
if (args == null) // onDismiss
|
||||||
args.putInt("requestCode", targetRequestCode);
|
args = new Bundle();
|
||||||
args.putInt("resultCode", resultCode);
|
args.putInt("requestCode", targetRequestCode);
|
||||||
getParentFragmentManager().setFragmentResult(targetRequestKey, args);
|
args.putInt("resultCode", resultCode);
|
||||||
}
|
getParentFragmentManager().setFragmentResult(targetRequestKey, args);
|
||||||
|
} catch (Throwable ex) {
|
||||||
|
Log.w(ex);
|
||||||
|
/*
|
||||||
|
java.lang.IllegalStateException: Fragment FragmentDialog... not associated with a fragment manager.
|
||||||
|
at androidx.fragment.app.Fragment.getParentFragmentManager(SourceFile:2)
|
||||||
|
at eu.faircode.email.FragmentDialogBase.sendResult(SourceFile:9)
|
||||||
|
*/
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue