Fix conversation issue
This commit is contained in:
parent
6912a798d5
commit
0fdccbe87b
|
@ -108,6 +108,12 @@ public class ShowConversationActivity extends BaseActivity implements OnRetrieve
|
||||||
loader = findViewById(R.id.loader);
|
loader = findViewById(R.id.loader);
|
||||||
loader.setVisibility(View.VISIBLE);
|
loader.setVisibility(View.VISIBLE);
|
||||||
detailsStatus.setFocused(true);
|
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) {
|
if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON) {
|
||||||
|
|
||||||
|
|
|
@ -917,9 +917,7 @@ public class API {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
status.setViewType(context);
|
status.setViewType(context);
|
||||||
Status.transform(context, status);
|
Status.fillSpan(context, status);
|
||||||
Status.makeEmojis(context, status);
|
|
||||||
Status.makeImage(context, status);
|
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -263,7 +263,15 @@ public class Status implements Parcelable {
|
||||||
this.showTopLine = in.readByte() != 0;
|
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)
|
if (status == null)
|
||||||
return;
|
return;
|
||||||
|
@ -852,7 +860,7 @@ public class Status implements Parcelable {
|
||||||
status.setDisplayNameSpan(displayNameSpan);
|
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())
|
if (((Activity) context).isFinishing())
|
||||||
return;
|
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())
|
if (((Activity) context).isFinishing())
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in New Issue