diff options
author | Thomas <tschneider.ac@gmail.com> | 2024-01-15 09:06:30 +0100 |
---|---|---|
committer | Thomas <tschneider.ac@gmail.com> | 2024-01-15 09:06:30 +0100 |
commit | c40f6c3330ceade83ecd9277ded527d414631157 (patch) | |
tree | afb3f2887a12c539e82b52ed91d90006e582fa6c | |
parent | 6b03aef11bf87263922b502b263ef5717a1b7668 (diff) |
Fix a crash when searching tags
3 files changed, 14 insertions, 6 deletions
diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/HashTagActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/HashTagActivity.java index 4dd565868..db07020a1 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/activities/HashTagActivity.java +++ b/app/src/main/java/app/fedilab/android/mastodon/activities/HashTagActivity.java @@ -91,8 +91,10 @@ public class HashTagActivity extends BaseActivity { if( bundle != null) { tag = bundle.getString(Helper.ARG_SEARCH_KEYWORD, null); } - if (tag == null) + if (tag == null) { finish(); + return; + } pinnedTag = null; followedTag = null; mutedTag = null; diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/TagAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/TagAdapter.java index 81e1b67c4..8ee8508da 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/TagAdapter.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/TagAdapter.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.content.Context; import android.content.Intent; import android.content.SharedPreferences; @@ -41,6 +43,7 @@ import app.fedilab.android.databinding.DrawerTagBinding; import app.fedilab.android.mastodon.activities.HashTagActivity; import app.fedilab.android.mastodon.client.entities.api.History; import app.fedilab.android.mastodon.client.entities.api.Tag; +import app.fedilab.android.mastodon.client.entities.app.CachedBundle; import app.fedilab.android.mastodon.helper.Helper; public class TagAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> { @@ -100,10 +103,14 @@ public class TagAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> { tagViewHolder.binding.getRoot().setOnClickListener(v1 -> { Intent intent = new Intent(context, HashTagActivity.class); - Bundle b = new Bundle(); - b.putString(Helper.ARG_SEARCH_KEYWORD, tag.name.trim()); - intent.putExtras(b); - context.startActivity(intent); + Bundle args = new Bundle(); + args.putString(Helper.ARG_SEARCH_KEYWORD, tag.name.trim()); + new CachedBundle(context).insertBundle(args, currentAccount, bundleId -> { + Bundle bundle = new Bundle(); + bundle.putLong(Helper.ARG_INTENT_ID, bundleId); + intent.putExtras(bundle); + context.startActivity(intent); + }); }); } diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java index 20232c4e8..6a64147cb 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java @@ -27,7 +27,6 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.os.Handler; import android.os.Looper; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; |