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

Prepares release 2.13.2

This commit is contained in:
tom79 2019-08-08 18:44:41 +02:00
parent 0354b3c7a9
commit 0ff62abed9
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/app/fedilab/android/client/Entities/Notification.java
View File

@ -220,7 +220,7 @@ public class Notification implements Parcelable {
@Override @Override
public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) { public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
final String targetedEmoji = ":" + emoji.getShortcode() + ":"; final String targetedEmoji = ":" + emoji.getShortcode() + ":";
if (displayNameSpan != null && displayNameSpan.toString().contains(targetedEmoji)) { if (displayNameSpan.toString().contains(targetedEmoji)) {
//emojis can be used several times so we have to loop //emojis can be used several times so we have to loop
for (int startPosition = -1; (startPosition = displayNameSpan.toString().indexOf(targetedEmoji, startPosition + 1)) != -1; startPosition++) { for (int startPosition = -1; (startPosition = displayNameSpan.toString().indexOf(targetedEmoji, startPosition + 1)) != -1; startPosition++) {
final int endPosition = startPosition + targetedEmoji.length(); final int endPosition = startPosition + targetedEmoji.length();

16
app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
View File

@ -4226,7 +4226,8 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
if (statusListAdapter.getItemAt(i) != null && statusListAdapter.getItemAt(i).getId().equals(status.getId())) { if (statusListAdapter.getItemAt(i) != null && statusListAdapter.getItemAt(i).getId().equals(status.getId())) {
try { try {
statuses.set(i, status); statuses.set(i, status);
if( mRecyclerView != null) { statusListAdapter.notifyItemChanged(i);
/*if( mRecyclerView != null) {
int finalI = i; int finalI = i;
mRecyclerView.post(new Runnable() { mRecyclerView.post(new Runnable() {
@Override @Override
@ -4234,9 +4235,8 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
statusListAdapter.notifyItemChanged(finalI); statusListAdapter.notifyItemChanged(finalI);
} }
}); });
} }*/
} catch (Exception ignored) { } catch (Exception ignored) {}
}
break; break;
} }
} }
@ -4250,7 +4250,8 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
if (statusListAdapter.getItemAt(i) != null && statusListAdapter.getItemAt(i).getId().equals(status.getId())) { if (statusListAdapter.getItemAt(i) != null && statusListAdapter.getItemAt(i).getId().equals(status.getId())) {
try { try {
statuses.set(i, status); statuses.set(i, status);
if( mRecyclerView != null) { statusListAdapter.notifyItemChanged(i);
/*if( mRecyclerView != null) {
int finalI = i; int finalI = i;
mRecyclerView.post(new Runnable() { mRecyclerView.post(new Runnable() {
@Override @Override
@ -4258,9 +4259,8 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
statusListAdapter.notifyItemChanged(finalI); statusListAdapter.notifyItemChanged(finalI);
} }
}); });
} }*/
} catch (Exception ignored) { } catch (Exception ignored) {}
}
break; break;
} }
} }