diff options
author | tom79 <tschneider.ac@gmail.com> | 2020-04-08 17:56:59 +0200 |
---|---|---|
committer | tom79 <tschneider.ac@gmail.com> | 2020-04-08 17:56:59 +0200 |
commit | 0fdccbe87bad1cf58abd8d86c64e51b252004d28 (patch) | |
tree | 53e860166911e9bfa06ccac551936351720df448 /app/src/main/java | |
parent | 6912a798d5681ee0c27f03deb70f0148aa8d7df3 (diff) |
Fix conversation issue
Diffstat (limited to 'app/src/main/java')
3 files changed, 18 insertions, 6 deletions
diff --git a/app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java b/app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java index 9b9e3800b..9f605cfe0 100644 --- a/app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java @@ -108,6 +108,12 @@ public class ShowConversationActivity extends BaseActivity implements OnRetrieve loader = findViewById(R.id.loader); loader.setVisibility(View.VISIBLE); detailsStatus.setFocused(true); + //Some spannable + Status.fillSpan(ShowConversationActivity.this, detailsStatus); + if( detailsStatus.getPoll() != null ) { + Status.makeEmojiPoll(ShowConversationActivity.this, detailsStatus.getPoll()); + } + Account.makeAccountNameEmoji(ShowConversationActivity.this, detailsStatus.getAccount()); if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON) { diff --git a/app/src/main/java/app/fedilab/android/client/API.java b/app/src/main/java/app/fedilab/android/client/API.java index 5459367d8..eb42c5353 100644 --- a/app/src/main/java/app/fedilab/android/client/API.java +++ b/app/src/main/java/app/fedilab/android/client/API.java @@ -917,9 +917,7 @@ public class API { e.printStackTrace(); } status.setViewType(context); - Status.transform(context, status); - Status.makeEmojis(context, status); - Status.makeImage(context, status); + Status.fillSpan(context, status); return status; } diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Status.java b/app/src/main/java/app/fedilab/android/client/Entities/Status.java index 4a549b9f7..235855a81 100644 --- a/app/src/main/java/app/fedilab/android/client/Entities/Status.java +++ b/app/src/main/java/app/fedilab/android/client/Entities/Status.java @@ -263,7 +263,15 @@ public class Status implements Parcelable { this.showTopLine = in.readByte() != 0; } - public static void transform(Context context, Status status) { + + public static void fillSpan(Context context, Status status){ + Status.transform(context, status); + Status.makeEmojis(context, status); + Status.makeImage(context, status); + } + + + private static void transform(Context context, Status status) { if (status == null) return; @@ -852,7 +860,7 @@ public class Status implements Parcelable { status.setDisplayNameSpan(displayNameSpan); } - public static void makeEmojis(final Context context, Status status) { + private static void makeEmojis(final Context context, Status status) { if (((Activity) context).isFinishing()) return; @@ -983,7 +991,7 @@ public class Status implements Parcelable { } } - public static void makeImage(final Context context, Status status) { + private static void makeImage(final Context context, Status status) { if (((Activity) context).isFinishing()) return; |