diff --git a/app/build.gradle b/app/build.gradle index c75216a..aeea779 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { minSdkVersion 21 targetSdkVersion 30 - versionCode 18 + versionCode 19 versionName "1.5.0" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/app/fedilab/fedilabtube/drawer/AccountsListAdapter.java b/app/src/main/java/app/fedilab/fedilabtube/drawer/AccountsListAdapter.java index f6b0053..e205761 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/drawer/AccountsListAdapter.java +++ b/app/src/main/java/app/fedilab/fedilabtube/drawer/AccountsListAdapter.java @@ -48,10 +48,10 @@ import es.dmoral.toasty.Toasty; public class AccountsListAdapter extends RecyclerView.Adapter { public AllAccountsRemoved allAccountsRemoved; - private List accounts; + private final List accounts; private Context context; - private AccountsListAdapter accountsListAdapter; - private RetrofitPeertubeAPI.DataType type; + private final AccountsListAdapter accountsListAdapter; + private final RetrofitPeertubeAPI.DataType type; public AccountsListAdapter(RetrofitPeertubeAPI.DataType type, List accounts) { this.accounts = accounts; @@ -96,7 +96,8 @@ public class AccountsListAdapter extends RecyclerView.Adapter { Intent intent = new Intent(context, ShowAccountActivity.class); Bundle b = new Bundle(); - b.putParcelable("channel", account); + b.putParcelable("account", account); + b.putString("accountAcct", account.getAcct()); intent.putExtras(b); context.startActivity(intent); }); diff --git a/app/src/main/java/app/fedilab/fedilabtube/drawer/CommentListAdapter.java b/app/src/main/java/app/fedilab/fedilabtube/drawer/CommentListAdapter.java index 31ae1fd..1061652 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/drawer/CommentListAdapter.java +++ b/app/src/main/java/app/fedilab/fedilabtube/drawer/CommentListAdapter.java @@ -18,7 +18,9 @@ import android.annotation.SuppressLint; import android.app.Activity; import android.app.AlertDialog; import android.content.Context; +import android.content.Intent; import android.os.Build; +import android.os.Bundle; import android.os.Handler; import android.os.Looper; import android.text.Html; @@ -52,6 +54,8 @@ import java.util.regex.Pattern; import app.fedilab.fedilabtube.PeertubeActivity; import app.fedilab.fedilabtube.R; +import app.fedilab.fedilabtube.ShowAccountActivity; +import app.fedilab.fedilabtube.ShowChannelActivity; import app.fedilab.fedilabtube.client.APIResponse; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; import app.fedilab.fedilabtube.client.data.CommentData.Comment; @@ -253,6 +257,14 @@ public class CommentListAdapter extends RecyclerView.Adapter{ + Bundle b = new Bundle(); + Intent intent = new Intent(context, ShowAccountActivity.class); + b.putParcelable("account", comment.getAccount()); + b.putString("accountAcct", comment.getAccount().getAcct()); + intent.putExtras(b); + context.startActivity(intent); + }); if(comment.isReply()) { holder.replyButton.setVisibility(View.VISIBLE); }else{