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

Release 1.15.1

This commit is contained in:
stom79 2018-10-07 21:07:59 +02:00
parent e20b38564a
commit 1793a234c1
2 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -7,8 +7,8 @@ android {
applicationId "fr.gouv.etalab.mastodon"
minSdkVersion 15
targetSdkVersion 28
versionCode 149
versionName "1.15.0"
versionCode 150
versionName "1.15.1"
}
flavorDimensions "default"
buildTypes {

32
app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java
View File

@ -763,11 +763,9 @@ public class Status implements Parcelable{
int matchStart = matcher.start(2);
int matchEnd = matcher.end();
final String twittername = matcher.group(2);
if( spannableStringT.length() < matchEnd) {
URLSpan[] spans = spannableStringT.getSpans(matchStart, matchEnd, URLSpan.class);
for (URLSpan span : spans) {
spannableStringT.removeSpan(span);
}
URLSpan[] spans = spannableStringT.getSpans(matchStart, matchEnd, URLSpan.class);
for (URLSpan span : spans) {
spannableStringT.removeSpan(span);
}
if( matchEnd <= spannableStringT.toString().length() && matchEnd >= matchStart)
spannableStringT.setSpan(new ClickableSpan() {
@ -830,11 +828,9 @@ public class Status implements Parcelable{
for(int startPosition = -1 ; (startPosition = spannableStringT.toString().toLowerCase().indexOf(key.toLowerCase(), startPosition + 1)) != -1 ; startPosition++){
int endPosition = startPosition + key.length();
if( spannableStringT.length() < endPosition) {
URLSpan[] spans = spannableStringT.getSpans(startPosition, endPosition, URLSpan.class);
for (URLSpan span : spans) {
spannableStringT.removeSpan(span);
}
URLSpan[] spans = spannableStringT.getSpans(startPosition, endPosition, URLSpan.class);
for (URLSpan span : spans) {
spannableStringT.removeSpan(span);
}
if( endPosition <= spannableStringT.toString().length() && endPosition >= startPosition) {
spannableStringT.setSpan(new ClickableSpan() {
@ -895,11 +891,9 @@ public class Status implements Parcelable{
for(int startPosition = -1 ; (startPosition = spannableStringT.toString().toLowerCase().indexOf(targetedAccount.toLowerCase(), startPosition + 1)) != -1 ; startPosition++){
int endPosition = startPosition + targetedAccount.length();
if( spannableStringT.length() < endPosition) {
URLSpan[] spans = spannableStringT.getSpans(startPosition, endPosition, URLSpan.class);
for (URLSpan span : spans) {
spannableStringT.removeSpan(span);
}
URLSpan[] spans = spannableStringT.getSpans(startPosition, endPosition, URLSpan.class);
for (URLSpan span : spans) {
spannableStringT.removeSpan(span);
}
if( endPosition <= spannableStringT.toString().length() && endPosition >= startPosition)
spannableStringT.setSpan(new ClickableSpan() {
@ -931,11 +925,9 @@ public class Status implements Parcelable{
while (matcher.find()){
int matchStart = matcher.start(1);
int matchEnd = matcher.end();
if( spannableStringT.length() < matchEnd) {
URLSpan[] spans = spannableStringT.getSpans(matchStart, matchEnd, URLSpan.class);
for (URLSpan span : spans) {
spannableStringT.removeSpan(span);
}
URLSpan[] spans = spannableStringT.getSpans(matchStart, matchEnd, URLSpan.class);
for (URLSpan span : spans) {
spannableStringT.removeSpan(span);
}
final String tag = spannableStringT.toString().substring(matchStart, matchEnd);
if( matchEnd <= spannableStringT.toString().length() && matchEnd >= matchStart)