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

Fixes notification issue

This commit is contained in:
stom79 2017-11-06 12:59:42 +01:00
parent ada656e4ec
commit c31791ea80
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveNotificationsAsyncTask.java
View File

@ -24,6 +24,7 @@ import fr.gouv.etalab.mastodon.client.APIResponse;
import fr.gouv.etalab.mastodon.interfaces.OnRetrieveNotificationsInterface;
/**
* Created by Thomas on 28/04/2017.
* Retrieves notifications on the instance

6
app/src/main/java/fr/gouv/etalab/mastodon/jobs/NotificationsSyncJob.java
View File

@ -88,7 +88,6 @@ public class NotificationsSyncJob extends Job implements OnRetrieveNotifications
.setPeriodic(TimeUnit.MINUTES.toMillis(Helper.MINUTES_BETWEEN_NOTIFICATIONS_REFRESH), TimeUnit.MINUTES.toMillis(5))
.setUpdateCurrent(updateCurrent)
.setRequiredNetworkType(JobRequest.NetworkType.METERED)
.setRequiresBatteryNotLow(true)
.setRequirementsEnforced(false)
.build()
.schedule();
@ -142,16 +141,14 @@ public class NotificationsSyncJob extends Job implements OnRetrieveNotifications
boolean notif_mention = sharedpreferences.getBoolean(Helper.SET_NOTIF_MENTION, true);
boolean notif_share = sharedpreferences.getBoolean(Helper.SET_NOTIF_SHARE, true);
final String max_id = sharedpreferences.getString(Helper.LAST_NOTIFICATION_MAX_ID + userId, null);
final List<Notification> notifications = new ArrayList<>();
int pos = 0;
for(Notification notif: notificationsReceived){
if( Long.parseLong(notif.getId()) > Long.parseLong(max_id) ) {
if( max_id == null || Long.parseLong(notif.getId()) > Long.parseLong(max_id) ) {
notifications.add(pos, notif);
pos++;
}
}
//No previous notifications in cache, so no notification will be sent
int newFollows = 0;
int newAdds = 0;
@ -229,7 +226,6 @@ public class NotificationsSyncJob extends Job implements OnRetrieveNotifications
intent.putExtra(PREF_KEY_ID, userId);
long notif_id = Long.parseLong(userId);
final int notificationId = ((notif_id + 1) > 2147483647) ? (int) (2147483647 - notif_id - 1) : (int) (notif_id + 1);
if( notificationUrl != null ){
ImageLoader imageLoaderNoty = ImageLoader.getInstance();
File cacheDir = new File(getContext().getCacheDir(), getContext().getString(R.string.app_name));