1 files changed, 10 insertions, 4 deletions
diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/FragmentLoginPickInstanceMastodon.java b/app/src/main/java/app/fedilab/android/ui/fragment/FragmentLoginPickInstanceMastodon.java
index 8f59d29e2..9fc048213 100644
--- a/app/src/main/java/app/fedilab/android/ui/fragment/FragmentLoginPickInstanceMastodon.java
+++ b/app/src/main/java/app/fedilab/android/ui/fragment/FragmentLoginPickInstanceMastodon.java
@@ -15,6 +15,8 @@ package app.fedilab.android.ui.fragment;
  * see <http://www.gnu.org/licenses>. */
 
 
+import static app.fedilab.android.BaseMainActivity.currentAccount;
+
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -32,6 +34,7 @@ import java.util.List;
 import app.fedilab.android.R;
 import app.fedilab.android.databinding.FragmentLoginPickInstanceMastodonBinding;
 import app.fedilab.android.mastodon.client.entities.api.JoinMastodonInstance;
+import app.fedilab.android.mastodon.client.entities.app.CachedBundle;
 import app.fedilab.android.mastodon.client.entities.app.Timeline;
 import app.fedilab.android.mastodon.helper.Helper;
 import app.fedilab.android.mastodon.ui.drawer.InstanceRegAdapter;
@@ -145,10 +148,13 @@ public class FragmentLoginPickInstanceMastodon extends Fragment implements Insta
             Bundle args = new Bundle();
             args.putSerializable(Helper.ARG_REMOTE_INSTANCE_STRING, clickedInstance.domain);
             args.putSerializable(Helper.ARG_TIMELINE_TYPE, Timeline.TimeLineEnum.TREND_MESSAGE_PUBLIC);
-
-            Helper.addFragment(
-                    getParentFragmentManager(), android.R.id.content, new FragmentMastodonTimeline(),
-                    args, null, FragmentLoginRegisterMastodon.class.getName());
+            new CachedBundle(requireActivity()).insertBundle(args, currentAccount, bundleId -> {
+                Bundle bundle = new Bundle();
+                bundle.putLong(Helper.ARG_INTENT_ID, bundleId);
+                Helper.addFragment(
+                        getParentFragmentManager(), android.R.id.content, new FragmentMastodonTimeline(),
+                        bundle, null, FragmentLoginRegisterMastodon.class.getName());
+            });
         }
     }
 }
 \ No newline at end of file