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

Merged master into PhotonQyv-Baseline

This commit is contained in:
PhotonQyv 2017-09-19 17:55:23 +01:00
parent 662d616294 70afb3a018
commit eebfb30e6a
3 changed files with 4 additions and 4 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" applicationId "fr.gouv.etalab.mastodon"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 25 targetSdkVersion 25
versionCode 50 versionCode 51
versionName "1.4.9-beta-2" versionName "1.4.9-beta-3"
} }
buildTypes { buildTypes {
release { release {

2
app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java
View File

@ -205,7 +205,7 @@ public class DisplayNotificationsFragment extends Fragment implements OnRetrieve
} }
if( notifications != null && notifications.size() > 0) { if( notifications != null && notifications.size() > 0) {
for(Notification tmpNotification: notifications){ for(Notification tmpNotification: notifications){
if( Long.parseLong(tmpNotification.getId()) > Long.parseLong(lastReadNotifications)) if( lastReadNotifications != null && Long.parseLong(tmpNotification.getId()) > Long.parseLong(lastReadNotifications))
MainActivity.countNewNotifications++; MainActivity.countNewNotifications++;
this.notifications.add(tmpNotification); this.notifications.add(tmpNotification);
} }

2
app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java
View File

@ -295,7 +295,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
} }
if( statuses != null && statuses.size() > 0) { if( statuses != null && statuses.size() > 0) {
for(Status tmpStatus: statuses){ for(Status tmpStatus: statuses){
if( type == RetrieveFeedsAsyncTask.Type.HOME && firstLoad && Long.parseLong(tmpStatus.getId()) > Long.parseLong(lastReadStatus)){ if( type == RetrieveFeedsAsyncTask.Type.HOME && firstLoad && lastReadStatus != null && Long.parseLong(tmpStatus.getId()) > Long.parseLong(lastReadStatus)){
tmpStatus.setNew(true); tmpStatus.setNew(true);
MainActivity.countNewStatus++; MainActivity.countNewStatus++;
}else { }else {