chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

remove old emoji shortcodes

Browse source
This commit is contained in:
Conny Duck 2017-10-19 15:54:08 +02:00
commit 2666f81b96
7 changed files with 13 additions and 1969 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/com/keylesspalace/tusky/entity/Account.java
View file

@ -21,7 +21,6 @@ import android.text.Spanned;
import com.google.gson.annotations.SerializedName;
import com.keylesspalace.tusky.util.HtmlUtils;
import com.keylesspalace.tusky.json.StringWithEmoji;
public class Account implements Parcelable {
public String id;
@ -33,7 +32,7 @@ public class Account implements Parcelable {
public String username;
@SerializedName("display_name")
public StringWithEmoji displayName;
public String displayName;
public Spanned note;
@ -71,10 +70,10 @@ public class Account implements Parcelable {
}
public String getDisplayName() {
if (displayName.value.length() == 0) {
if (displayName.length() == 0) {
return localUsername;
}
return displayName.value;
return displayName;
}
@Override
@ -87,7 +86,7 @@ public class Account implements Parcelable {
dest.writeString(id);
dest.writeString(localUsername);
dest.writeString(username);
dest.writeString(displayName.value);
dest.writeString(displayName);
dest.writeString(HtmlUtils.toHtml(note));
dest.writeString(url);
dest.writeString(avatar);
@ -104,7 +103,7 @@ public class Account implements Parcelable {
id = in.readString();
localUsername = in.readString();
username = in.readString();
displayName = new StringWithEmoji(in.readString());
displayName = in.readString();
note = HtmlUtils.fromHtml(in.readString());
url = in.readString();
avatar = in.readString();