Merge branch 'develop'

This commit is contained in:
stom79 2017-12-09 14:59:34 +01:00
commit ba13132678
2 changed files with 3 additions and 3 deletions

View File

@ -7,8 +7,8 @@ android {
applicationId "fr.gouv.etalab.mastodon"
minSdkVersion 15
targetSdkVersion 27
versionCode 85
versionName "1.6.5"
versionCode 86
versionName "1.6.5.1"
}
flavorDimensions "default"
buildTypes {

View File

@ -320,7 +320,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
}
}
if (Long.parseLong(tmpStatuses.get(tmpStatuses.size()-1).getId()) > Long.parseLong(bookmark)) {
if (tmpStatuses.size() > 0 && Long.parseLong(tmpStatuses.get(tmpStatuses.size()-1).getId()) > Long.parseLong(bookmark)) {
tmpStatuses.get(tmpStatuses.size()-1).setFetchMore(true);
}
this.statuses.addAll(position, tmpStatuses);