kadu/gotify-android-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use long for ids

Browse Source
This commit is contained in:
Jannis Mattheis
2020-06-24 18:52:48 +02:00
parent 4edaa1943f
commit b3b1e47cff
10 changed files with 64 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/com/github/gotify/service/WebSocketService.java
View File

@@ -33,19 +33,19 @@ import com.github.gotify.messages.MessagesActivity;
import com.github.gotify.picasso.PicassoHandler;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
public class WebSocketService extends Service {
public static final String NEW_MESSAGE_BROADCAST =
WebSocketService.class.getName() + ".NEW_MESSAGE";
private static final int NOT_LOADED = -2;
private static final long NOT_LOADED = -2;
private Settings settings;
private WebSocketConnection connection;
private AtomicInteger lastReceivedMessage = new AtomicInteger(NOT_LOADED);
private AtomicLong lastReceivedMessage = new AtomicLong(NOT_LOADED);
private MissedMessageUtil missingMessageUtil;
private PicassoHandler picassoHandler;
@@ -143,7 +143,7 @@ public class WebSocketService extends Service {
}
private void notifyMissedNotifications() {
int messageId = lastReceivedMessage.get();
long messageId = lastReceivedMessage.get();
if (messageId == NOT_LOADED) {
return;
}
@@ -231,16 +231,16 @@ public class WebSocketService extends Service {
private void showNotification(
int id, String title, String message, long priority, Map<String, Object> extras) {
showNotification(id, title, message, priority, extras, -1);
showNotification(id, title, message, priority, extras, -1L);
}
private void showNotification(
int id,
long id,
String title,
String message,
long priority,
Map<String, Object> extras,
Integer appid) {
Long appid) {
Intent intent;
@@ -293,7 +293,7 @@ public class WebSocketService extends Service {
NotificationManager notificationManager =
(NotificationManager) this.getSystemService(Context.NOTIFICATION_SERVICE);
notificationManager.notify(id, b.build());
notificationManager.notify(Utils.longToInt(id), b.build());
}
@RequiresApi(Build.VERSION_CODES.N)