Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

only alert once on multiple notifications, fix order of notifications

This commit is contained in:
Conny Duck 2018-03-01 19:05:47 +01:00
parent c2c607270a
commit 550235d40b
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/keylesspalace/tusky/NotificationPullJobCreator.java
View File

@ -36,6 +36,7 @@ import com.keylesspalace.tusky.util.OkHttpUtils;
import java.io.IOException; import java.io.IOException;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
@ -129,6 +130,8 @@ public final class NotificationPullJobCreator implements JobCreator {
private void onNotificationsReceived(AccountEntity account, List<Notification> notificationList) { private void onNotificationsReceived(AccountEntity account, List<Notification> notificationList) {
Collections.reverse(notificationList);
BigInteger newId = new BigInteger(account.getLastNotificationId()); BigInteger newId = new BigInteger(account.getLastNotificationId());
BigInteger newestId = BigInteger.ZERO; BigInteger newestId = BigInteger.ZERO;
@ -142,8 +145,6 @@ public final class NotificationPullJobCreator implements JobCreator {
} }
if (isBiggerThan(currentId, newId)) { if (isBiggerThan(currentId, newId)) {
account.setLastNotificationId(notification.id);
NotificationHelper.make(context, notification, account); NotificationHelper.make(context, notification, account);
} }
} }

12
app/src/main/java/com/keylesspalace/tusky/util/NotificationHelper.java
View File

@ -152,8 +152,7 @@ public class NotificationHelper {
} else { } else {
try { try {
String format = context.getString(R.string.notification_title_summary); String title = context.getString(R.string.notification_title_summary, currentNotifications.length());
String title = String.format(format, currentNotifications.length());
String text = joinNames(context, currentNotifications); String text = joinNames(context, currentNotifications);
builder.setContentTitle(title) builder.setContentTitle(title)
.setContentText(text); .setContentText(text);
@ -167,6 +166,8 @@ public class NotificationHelper {
builder.setVisibility(NotificationCompat.VISIBILITY_PRIVATE); builder.setVisibility(NotificationCompat.VISIBILITY_PRIVATE);
builder.setCategory(NotificationCompat.CATEGORY_SOCIAL); builder.setCategory(NotificationCompat.CATEGORY_SOCIAL);
builder.setOnlyAlertOnce(true);
NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE); NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
//noinspection ConstantConditions //noinspection ConstantConditions
@ -351,14 +352,15 @@ public class NotificationHelper {
@Nullable @Nullable
private static String joinNames(Context context, JSONArray array) throws JSONException { private static String joinNames(Context context, JSONArray array) throws JSONException {
if (array.length() > 3) { if (array.length() > 3) {
int length = array.length();
return String.format(context.getString(R.string.notification_summary_large), return String.format(context.getString(R.string.notification_summary_large),
array.get(0), array.get(1), array.get(2), array.length() - 3); array.get(length-1), array.get(length-2), array.get(length-3), length - 3);
} else if (array.length() == 3) { } else if (array.length() == 3) {
return String.format(context.getString(R.string.notification_summary_medium), return String.format(context.getString(R.string.notification_summary_medium),
array.get(0), array.get(1), array.get(2)); array.get(2), array.get(1), array.get(0));
} else if (array.length() == 2) { } else if (array.length() == 2) {
return String.format(context.getString(R.string.notification_summary_small), return String.format(context.getString(R.string.notification_summary_small),
array.get(0), array.get(1)); array.get(1), array.get(0));
} }
return null; return null;