Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix conversation issue

This commit is contained in:
tom79 2020-04-08 17:56:59 +02:00
parent 6912a798d5
commit 0fdccbe87b
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java
View File

@ -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) {

4
app/src/main/java/app/fedilab/android/client/API.java
View File

@ -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;
}

14
app/src/main/java/app/fedilab/android/client/Entities/Status.java
View File

@ -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;