Release 1.15.1
This commit is contained in:
parent
e20b38564a
commit
1793a234c1
|
@ -7,8 +7,8 @@ android {
|
||||||
applicationId "fr.gouv.etalab.mastodon"
|
applicationId "fr.gouv.etalab.mastodon"
|
||||||
minSdkVersion 15
|
minSdkVersion 15
|
||||||
targetSdkVersion 28
|
targetSdkVersion 28
|
||||||
versionCode 149
|
versionCode 150
|
||||||
versionName "1.15.0"
|
versionName "1.15.1"
|
||||||
}
|
}
|
||||||
flavorDimensions "default"
|
flavorDimensions "default"
|
||||||
buildTypes {
|
buildTypes {
|
||||||
|
|
|
@ -763,11 +763,9 @@ public class Status implements Parcelable{
|
||||||
int matchStart = matcher.start(2);
|
int matchStart = matcher.start(2);
|
||||||
int matchEnd = matcher.end();
|
int matchEnd = matcher.end();
|
||||||
final String twittername = matcher.group(2);
|
final String twittername = matcher.group(2);
|
||||||
if( spannableStringT.length() < matchEnd) {
|
URLSpan[] spans = spannableStringT.getSpans(matchStart, matchEnd, URLSpan.class);
|
||||||
URLSpan[] spans = spannableStringT.getSpans(matchStart, matchEnd, URLSpan.class);
|
for (URLSpan span : spans) {
|
||||||
for (URLSpan span : spans) {
|
spannableStringT.removeSpan(span);
|
||||||
spannableStringT.removeSpan(span);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if( matchEnd <= spannableStringT.toString().length() && matchEnd >= matchStart)
|
if( matchEnd <= spannableStringT.toString().length() && matchEnd >= matchStart)
|
||||||
spannableStringT.setSpan(new ClickableSpan() {
|
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++){
|
for(int startPosition = -1 ; (startPosition = spannableStringT.toString().toLowerCase().indexOf(key.toLowerCase(), startPosition + 1)) != -1 ; startPosition++){
|
||||||
|
|
||||||
int endPosition = startPosition + key.length();
|
int endPosition = startPosition + key.length();
|
||||||
if( spannableStringT.length() < endPosition) {
|
URLSpan[] spans = spannableStringT.getSpans(startPosition, endPosition, URLSpan.class);
|
||||||
URLSpan[] spans = spannableStringT.getSpans(startPosition, endPosition, URLSpan.class);
|
for (URLSpan span : spans) {
|
||||||
for (URLSpan span : spans) {
|
spannableStringT.removeSpan(span);
|
||||||
spannableStringT.removeSpan(span);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if( endPosition <= spannableStringT.toString().length() && endPosition >= startPosition) {
|
if( endPosition <= spannableStringT.toString().length() && endPosition >= startPosition) {
|
||||||
spannableStringT.setSpan(new ClickableSpan() {
|
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++){
|
for(int startPosition = -1 ; (startPosition = spannableStringT.toString().toLowerCase().indexOf(targetedAccount.toLowerCase(), startPosition + 1)) != -1 ; startPosition++){
|
||||||
|
|
||||||
int endPosition = startPosition + targetedAccount.length();
|
int endPosition = startPosition + targetedAccount.length();
|
||||||
if( spannableStringT.length() < endPosition) {
|
URLSpan[] spans = spannableStringT.getSpans(startPosition, endPosition, URLSpan.class);
|
||||||
URLSpan[] spans = spannableStringT.getSpans(startPosition, endPosition, URLSpan.class);
|
for (URLSpan span : spans) {
|
||||||
for (URLSpan span : spans) {
|
spannableStringT.removeSpan(span);
|
||||||
spannableStringT.removeSpan(span);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if( endPosition <= spannableStringT.toString().length() && endPosition >= startPosition)
|
if( endPosition <= spannableStringT.toString().length() && endPosition >= startPosition)
|
||||||
spannableStringT.setSpan(new ClickableSpan() {
|
spannableStringT.setSpan(new ClickableSpan() {
|
||||||
|
@ -931,11 +925,9 @@ public class Status implements Parcelable{
|
||||||
while (matcher.find()){
|
while (matcher.find()){
|
||||||
int matchStart = matcher.start(1);
|
int matchStart = matcher.start(1);
|
||||||
int matchEnd = matcher.end();
|
int matchEnd = matcher.end();
|
||||||
if( spannableStringT.length() < matchEnd) {
|
URLSpan[] spans = spannableStringT.getSpans(matchStart, matchEnd, URLSpan.class);
|
||||||
URLSpan[] spans = spannableStringT.getSpans(matchStart, matchEnd, URLSpan.class);
|
for (URLSpan span : spans) {
|
||||||
for (URLSpan span : spans) {
|
spannableStringT.removeSpan(span);
|
||||||
spannableStringT.removeSpan(span);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
final String tag = spannableStringT.toString().substring(matchStart, matchEnd);
|
final String tag = spannableStringT.toString().substring(matchStart, matchEnd);
|
||||||
if( matchEnd <= spannableStringT.toString().length() && matchEnd >= matchStart)
|
if( matchEnd <= spannableStringT.toString().length() && matchEnd >= matchStart)
|
||||||
|
|
Loading…
Reference in New Issue