From cad060282b53a54e2ea664837f519642ee397017 Mon Sep 17 00:00:00 2001 From: Vavassor Date: Wed, 1 Feb 2017 15:20:39 -0500 Subject: [PATCH] Links in user bios can be clicked on. --- .../com/keylesspalace/tusky/AccountActivity.java | 12 +++++++++--- .../com/keylesspalace/tusky/StatusViewHolder.java | 3 ++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java index 61bab4fd..4b78b80f 100644 --- a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java @@ -28,6 +28,7 @@ import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.text.Spanned; +import android.text.method.LinkMovementMethod; import android.util.Log; import android.view.Menu; import android.view.MenuItem; @@ -110,7 +111,9 @@ public class AccountActivity extends AppCompatActivity { tabLayout.setupWithViewPager(viewPager); for (int i = 0; i < tabLayout.getTabCount(); i++) { TabLayout.Tab tab = tabLayout.getTabAt(i); - tab.setCustomView(adapter.getTabView(i)); + if (tab != null) { + tab.setCustomView(adapter.getTabView(i)); + } } } @@ -166,6 +169,7 @@ public class AccountActivity extends AppCompatActivity { note.setText(account.note); note.setLinksClickable(true); + note.setMovementMethod(LinkMovementMethod.getInstance()); ImageLoader imageLoader = VolleySingleton.getInstance(this).getImageLoader(); if (!account.avatar.isEmpty()) { @@ -187,8 +191,10 @@ public class AccountActivity extends AppCompatActivity { TabLayout.Tab tab = tabLayout.getTabAt(i); if (tab != null) { View view = tab.getCustomView(); - TextView total = (TextView) view.findViewById(R.id.total); - total.setText(counts[i]); + if (view != null) { + TextView total = (TextView) view.findViewById(R.id.total); + total.setText(counts[i]); + } } } } diff --git a/app/src/main/java/com/keylesspalace/tusky/StatusViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/StatusViewHolder.java index b870b87e..62f48825 100644 --- a/app/src/main/java/com/keylesspalace/tusky/StatusViewHolder.java +++ b/app/src/main/java/com/keylesspalace/tusky/StatusViewHolder.java @@ -106,7 +106,8 @@ public class StatusViewHolder extends RecyclerView.ViewHolder { public void setContent(Spanned content, Status.Mention[] mentions, final StatusActionListener listener) { - // Redirect URLSpan's in the status content to the listener for viewing tag pages. + /* Redirect URLSpan's in the status content to the listener for viewing tag pages and + * account pages. */ SpannableStringBuilder builder = new SpannableStringBuilder(content); URLSpan[] urlSpans = content.getSpans(0, content.length(), URLSpan.class); for (URLSpan span : urlSpans) {