1 files changed, 12 insertions, 3 deletions
diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusDraftAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusDraftAdapter.java
index bb8a90c85..40dcfd799 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusDraftAdapter.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusDraftAdapter.java
@@ -15,9 +15,12 @@ package app.fedilab.android.mastodon.ui.drawer;
  * see <http://www.gnu.org/licenses>. */
 
 
+import static app.fedilab.android.BaseMainActivity.currentAccount;
+
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -39,6 +42,7 @@ import app.fedilab.android.databinding.DrawerStatusDraftBinding;
 import app.fedilab.android.mastodon.activities.ComposeActivity;
 import app.fedilab.android.mastodon.client.entities.api.Attachment;
 import app.fedilab.android.mastodon.client.entities.api.Status;
+import app.fedilab.android.mastodon.client.entities.app.CachedBundle;
 import app.fedilab.android.mastodon.client.entities.app.StatusDraft;
 import app.fedilab.android.mastodon.exception.DBException;
 import app.fedilab.android.mastodon.helper.Helper;
@@ -100,11 +104,16 @@ public class StatusDraftAdapter extends RecyclerView.Adapter<StatusDraftAdapter.
 
         holder.binding.cardviewContainer.setOnClickListener(v -> {
             Intent intent = new Intent(context, ComposeActivity.class);
-            intent.putExtra(Helper.ARG_STATUS_DRAFT, statusDraft);
-            context.startActivity(intent);
+            Bundle args = new Bundle();
+            args.putSerializable(Helper.ARG_STATUS_DRAFT, statusDraft);
+            new CachedBundle(context).insertBundle(args, currentAccount, bundleId -> {
+                Bundle bundle = new Bundle();
+                bundle.putLong(Helper.ARG_INTENT_ID, bundleId);
+                intent.putExtras(bundle);
+                context.startActivity(intent);
+            });
         });
 
-
         holder.binding.delete.setOnClickListener(v -> {
             AlertDialog.Builder unfollowConfirm = new MaterialAlertDialogBuilder(context);
             unfollowConfirm.setMessage(context.getString(R.string.remove_draft));