1 files changed, 14 insertions, 8 deletions
diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/SliderAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/SliderAdapter.java
index 0cf829bd5..69c2b2cd9 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/SliderAdapter.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/SliderAdapter.java
@@ -14,6 +14,8 @@ package app.fedilab.android.mastodon.ui.drawer;
  * You should have received a copy of the GNU General Public License along with Fedilab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import static app.fedilab.android.BaseMainActivity.currentAccount;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -38,6 +40,7 @@ import app.fedilab.android.databinding.DrawerSliderBinding;
 import app.fedilab.android.mastodon.activities.MediaActivity;
 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.helper.Helper;
 import jp.wasabeef.glide.transformations.BlurTransformation;
 
@@ -102,14 +105,17 @@ public class SliderAdapter extends SliderViewAdapter<SliderAdapter.SliderAdapter
                 }
             } else {
                 Intent mediaIntent = new Intent(context, MediaActivity.class);
-                Bundle b = new Bundle();
-                b.putInt(Helper.ARG_MEDIA_POSITION, position + 1);
-                b.putSerializable(Helper.ARG_MEDIA_ARRAY, new ArrayList<>(status.media_attachments));
-                mediaIntent.putExtras(b);
-                ActivityOptionsCompat options = ActivityOptionsCompat
-                        .makeSceneTransitionAnimation((Activity) context, viewHolder.binding.ivAutoImageSlider, status.media_attachments.get(0).url);
-                // start the new activity
-                context.startActivity(mediaIntent, options.toBundle());
+                Bundle args = new Bundle();
+                args.putInt(Helper.ARG_MEDIA_POSITION, position + 1);
+                args.putSerializable(Helper.ARG_MEDIA_ARRAY, new ArrayList<>(status.media_attachments));
+                new CachedBundle(context).insertBundle(args, currentAccount, bundleId -> {
+                    Bundle bundle = new Bundle();
+                    bundle.putLong(Helper.ARG_INTENT_ID, bundleId);
+                    mediaIntent.putExtras(bundle);
+                    ActivityOptionsCompat options = ActivityOptionsCompat
+                            .makeSceneTransitionAnimation((Activity) context, viewHolder.binding.ivAutoImageSlider, status.media_attachments.get(0).url);
+                    context.startActivity(mediaIntent, options.toBundle());
+                });
             }
         });
     }