mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Prevent crash

This commit is contained in:
M66B 2020-10-02 12:16:25 +02:00
parent c43fae68ad
commit f4158c4e66
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/eu/faircode/email/FragmentBase.java
View File

@ -227,12 +227,29 @@ public class FragmentBase extends Fragment {
getParentFragmentManager().setFragmentResultListener(getRequestKey(), this, new FragmentResultListener() { getParentFragmentManager().setFragmentResultListener(getRequestKey(), this, new FragmentResultListener() {
@Override @Override
public void onFragmentResult(@NonNull String requestKey, @NonNull Bundle result) { public void onFragmentResult(@NonNull String requestKey, @NonNull Bundle result) {
int requestCode = result.getInt("requestCode"); try {
int resultCode = result.getInt("resultCode"); int requestCode = result.getInt("requestCode");
int resultCode = result.getInt("resultCode");
Intent data = new Intent(); Intent data = new Intent();
data.putExtra("args", result); data.putExtra("args", result);
onActivityResult(requestCode, resultCode, data); onActivityResult(requestCode, resultCode, data);
} catch (Throwable ex) {
Log.w(ex);
/*
android.os.BadParcelableException: ClassNotFoundException when unmarshalling: eu.faircode.email.FragmentMessages$MessageTarget
at android.os.Parcel.readParcelableCreator(Parcel.java:2839)
at android.os.Parcel.readParcelable(Parcel.java:2765)
at android.os.Parcel.readValue(Parcel.java:2668)
at android.os.Parcel.readListInternal(Parcel.java:3098)
at android.os.Parcel.readArrayList(Parcel.java:2319)
at android.os.Parcel.readValue(Parcel.java:2689)
at android.os.Parcel.readArrayMapInternal(Parcel.java:3037)
at android.os.BaseBundle.initializeFromParcelLocked(BaseBundle.java:288)
at android.os.BaseBundle.unparcel(BaseBundle.java:232)
at android.os.BaseBundle.getInt(BaseBundle.java:1017)
*/
}
} }
}); });
} }

14
app/src/main/java/eu/faircode/email/FragmentDialogBase.java
View File

@ -76,12 +76,16 @@ public class FragmentDialogBase extends DialogFragment {
getParentFragmentManager().setFragmentResultListener(getRequestKey(), this, new FragmentResultListener() { getParentFragmentManager().setFragmentResultListener(getRequestKey(), this, new FragmentResultListener() {
@Override @Override
public void onFragmentResult(@NonNull String requestKey, @NonNull Bundle result) { public void onFragmentResult(@NonNull String requestKey, @NonNull Bundle result) {
int requestCode = result.getInt("requestCode"); try {
int resultCode = result.getInt("resultCode"); int requestCode = result.getInt("requestCode");
int resultCode = result.getInt("resultCode");
Intent data = new Intent(); Intent data = new Intent();
data.putExtra("args", result); data.putExtra("args", result);
onActivityResult(requestCode, resultCode, data); onActivityResult(requestCode, resultCode, data);
} catch (Throwable ex) {
Log.w(ex);
}
} }
}); });