diff options
Diffstat (limited to 'app/src/main/java/app/fedilab/android/client/Entities/Account.java')
| -rw-r--r-- | app/src/main/java/app/fedilab/android/client/Entities/Account.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Account.java b/app/src/main/java/app/fedilab/android/client/Entities/Account.java index 0a6f3e98e..65e9ad7f5 100644 --- a/app/src/main/java/app/fedilab/android/client/Entities/Account.java +++ b/app/src/main/java/app/fedilab/android/client/Entities/Account.java @@ -139,7 +139,7 @@ public class Account implements Parcelable { private String invite_request; private String created_by_application_id; private String invited_by_account_id; - private boolean emojiFound = false; + private transient boolean emojiFound = false; public Account() { } @@ -202,7 +202,7 @@ public class Account implements Parcelable { public static void makeAccountNameEmoji(final WeakReference<Context> contextWeakReference, Account account) { Context context = contextWeakReference.get(); - if ((context instanceof Activity && ((Activity) context).isFinishing()) || account.getDisplay_name() == null) + if ((context instanceof Activity && ((Activity) context).isFinishing()) || account == null || account.getDisplay_name() == null) return; account.setDisplayNameSpan(new SpannableString(account.getDisplay_name())); @@ -723,7 +723,7 @@ public class Account implements Parcelable { int startPositionTar = spannableString.toString().indexOf("@" + this.getMoved_to_account().getAcct()); int endPositionTar = startPositionTar + ("@" + this.getMoved_to_account().getAcct()).length(); final Account idTar = this.getMoved_to_account(); - if (endPositionTar <= spannableString.toString().length() && endPositionTar >= startPositionTar) + if (startPositionTar >= 0 && endPositionTar <= spannableString.toString().length() && endPositionTar >= startPositionTar) spannableString.setSpan(new ClickableSpan() { @Override public void onClick(@NonNull View textView) { @@ -801,7 +801,7 @@ public class Account implements Parcelable { int matchStart = matcher.start(0); int matchEnd = matcher.end(); final String url = fieldSpan.toString().substring(matchStart, matchEnd); - if (matchEnd <= fieldSpan.toString().length() && matchEnd >= matchStart) { + if (matchStart >= 0 && matchEnd <= fieldSpan.toString().length() && matchEnd >= matchStart) { fieldSpan.setSpan(new ClickableSpan() { @Override public void onClick(@NonNull View textView) { @@ -832,7 +832,7 @@ public class Account implements Parcelable { int matchStart = matcher.start(0); int matchEnd = matcher.end(); final String email = fieldSpan.toString().substring(matchStart, matchEnd); - if (matchEnd <= fieldSpan.toString().length() && matchEnd >= matchStart) { + if (matchStart >= 0 && matchEnd <= fieldSpan.toString().length() && matchEnd >= matchStart) { fieldSpan.setSpan(new ClickableSpan() { @Override public void onClick(@NonNull View textView) { @@ -865,7 +865,7 @@ public class Account implements Parcelable { int matchStart = matcher.start(1); int matchEnd = matcher.end(); final String tag = fieldSpan.toString().substring(matchStart, matchEnd); - if (matchEnd <= fieldSpan.toString().length() && matchEnd >= matchStart) + if (matchStart >= 0 && matchEnd <= fieldSpan.toString().length() && matchEnd >= matchStart) fieldSpan.setSpan(new ClickableSpan() { @Override public void onClick(@NonNull View textView) { @@ -935,7 +935,7 @@ public class Account implements Parcelable { int matchStart = matcher.start(0); int matchEnd = matcher.end(); final String url = fieldSpan.toString().substring(matchStart, matchEnd); - if (matchEnd <= fieldSpan.toString().length() && matchEnd >= matchStart) { + if (matchStart >= 0 && matchEnd <= fieldSpan.toString().length() && matchEnd >= matchStart) { fieldSpan.setSpan(new ClickableSpan() { @Override public void onClick(@NonNull View textView) { |