Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 21:29:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '685-teaser-length' into 'master'

Browse Source 
Check length of text after spanning

Closes #685

See merge request !334
This commit is contained in:
Torsten Grote
2016-09-29 14:12:10 +00:00
parent a30de6309d 42056720fa
commit f28bc691a5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/org/briarproject/android/blogs/BlogPostViewHolder.java
View File

@@ -30,8 +30,8 @@ import static android.view.View.VISIBLE;
import static org.briarproject.android.BriarActivity.GROUP_ID; import static org.briarproject.android.BriarActivity.GROUP_ID;
import static org.briarproject.android.blogs.BasePostPagerFragment.POST_ID; import static org.briarproject.android.blogs.BasePostPagerFragment.POST_ID;
import static org.briarproject.android.util.AndroidUtils.TEASER_LENGTH; import static org.briarproject.android.util.AndroidUtils.TEASER_LENGTH;
import static org.briarproject.android.util.AndroidUtils.getTeaser;
import static org.briarproject.android.util.AndroidUtils.getSpanned; import static org.briarproject.android.util.AndroidUtils.getSpanned;
import static org.briarproject.android.util.AndroidUtils.getTeaser;
import static org.briarproject.android.util.AndroidUtils.makeLinksClickable; import static org.briarproject.android.util.AndroidUtils.makeLinksClickable;
import static org.briarproject.api.blogs.MessageType.POST; import static org.briarproject.api.blogs.MessageType.POST;
@@ -118,7 +118,7 @@ class BlogPostViewHolder extends RecyclerView.ViewHolder {
makeLinksClickable(body); makeLinksClickable(body);
} else { } else {
body.setTextIsSelectable(false); body.setTextIsSelectable(false);
if (item.getBody().length() > TEASER_LENGTH) if (bodyText.length() > TEASER_LENGTH)
bodyText = getTeaser(ctx, bodyText); bodyText = getTeaser(ctx, bodyText);
body.setText(bodyText); body.setText(bodyText);
} }