From 06d206d491c0e5106cde5d624dbd889ca2431187 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 2 Oct 2020 14:50:06 +0200
Subject: [PATCH] Attempt to workround crash

android.os.BadParcelableException: ClassNotFoundException when unmarshalling
---
 app/src/main/java/eu/faircode/email/FragmentBase.java       | 1 +
 app/src/main/java/eu/faircode/email/FragmentDialogBase.java | 1 +
 app/src/main/java/eu/faircode/email/FragmentMessages.java   | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentBase.java b/app/src/main/java/eu/faircode/email/FragmentBase.java
index 6df4296ba2..747e860b30 100644
--- a/app/src/main/java/eu/faircode/email/FragmentBase.java
+++ b/app/src/main/java/eu/faircode/email/FragmentBase.java
@@ -228,6 +228,7 @@ public class FragmentBase extends Fragment {
             @Override
             public void onFragmentResult(@NonNull String requestKey, @NonNull Bundle result) {
                 try {
+                    result.setClassLoader(ApplicationEx.class.getClassLoader());
                     int requestCode = result.getInt("requestCode");
                     int resultCode = result.getInt("resultCode");
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogBase.java b/app/src/main/java/eu/faircode/email/FragmentDialogBase.java
index c33ccb8eda..5e3f753ede 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogBase.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogBase.java
@@ -77,6 +77,7 @@ public class FragmentDialogBase extends DialogFragment {
             @Override
             public void onFragmentResult(@NonNull String requestKey, @NonNull Bundle result) {
                 try {
+                    result.setClassLoader(ApplicationEx.class.getClassLoader());
                     int requestCode = result.getInt("requestCode");
                     int resultCode = result.getInt("resultCode");
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 4f3748da2a..fae21b59c5 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -7323,7 +7323,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         EntityAccount copyto;
     }
 
-    private static class MessageTarget implements Parcelable {
+    public static class MessageTarget implements Parcelable {
         long id;
         Account sourceAccount;
         Folder sourceFolder;