TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-27 20:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ryan/fix-optimized-message-notifier' into dev

Browse Source
This commit is contained in:
nielsandriesse 2020-07-13 11:52:32 +10:00
commit fd4ed74892
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/org/thoughtcrime/securesms/notifications/OptimizedMessageNotifier.java
View File

@ -42,9 +42,13 @@ public class OptimizedMessageNotifier implements MessageNotifier {
public void updateNotification(@NonNull Context context) { public void updateNotification(@NonNull Context context) {
Poller lokiPoller = ApplicationContext.getInstance(context).lokiPoller; Poller lokiPoller = ApplicationContext.getInstance(context).lokiPoller;
LokiPublicChatManager lokiPublicChatManager = ApplicationContext.getInstance(context).lokiPublicChatManager; LokiPublicChatManager lokiPublicChatManager = ApplicationContext.getInstance(context).lokiPublicChatManager;
boolean isCaughtUp = false; boolean isCaughtUp = true;
if (lokiPoller != null && lokiPublicChatManager != null) { if (lokiPoller != null) {
isCaughtUp = lokiPoller.isCaughtUp() && lokiPublicChatManager.areAllCaughtUp(); isCaughtUp = isCaughtUp && lokiPoller.isCaughtUp();
}
if (lokiPublicChatManager != null) {
isCaughtUp = isCaughtUp && lokiPublicChatManager.areAllCaughtUp();
} }
if (isCaughtUp) { if (isCaughtUp) {
@ -58,9 +62,13 @@ public class OptimizedMessageNotifier implements MessageNotifier {
public void updateNotification(@NonNull Context context, long threadId) { public void updateNotification(@NonNull Context context, long threadId) {
Poller lokiPoller = ApplicationContext.getInstance(context).lokiPoller; Poller lokiPoller = ApplicationContext.getInstance(context).lokiPoller;
LokiPublicChatManager lokiPublicChatManager = ApplicationContext.getInstance(context).lokiPublicChatManager; LokiPublicChatManager lokiPublicChatManager = ApplicationContext.getInstance(context).lokiPublicChatManager;
boolean isCaughtUp = false; boolean isCaughtUp = true;
if (lokiPoller != null && lokiPublicChatManager != null) { if (lokiPoller != null) {
isCaughtUp = lokiPoller.isCaughtUp() && lokiPublicChatManager.areAllCaughtUp(); isCaughtUp = isCaughtUp && lokiPoller.isCaughtUp();
}
if (lokiPublicChatManager != null) {
isCaughtUp = isCaughtUp && lokiPublicChatManager.areAllCaughtUp();
} }
if (isCaughtUp) { if (isCaughtUp) {
@ -74,9 +82,13 @@ public class OptimizedMessageNotifier implements MessageNotifier {
public void updateNotification(@NonNull Context context, long threadId, boolean signal) { public void updateNotification(@NonNull Context context, long threadId, boolean signal) {
Poller lokiPoller = ApplicationContext.getInstance(context).lokiPoller; Poller lokiPoller = ApplicationContext.getInstance(context).lokiPoller;
LokiPublicChatManager lokiPublicChatManager = ApplicationContext.getInstance(context).lokiPublicChatManager; LokiPublicChatManager lokiPublicChatManager = ApplicationContext.getInstance(context).lokiPublicChatManager;
boolean isCaughtUp = false; boolean isCaughtUp = true;
if (lokiPoller != null && lokiPublicChatManager != null) { if (lokiPoller != null) {
isCaughtUp = lokiPoller.isCaughtUp() && lokiPublicChatManager.areAllCaughtUp(); isCaughtUp = isCaughtUp && lokiPoller.isCaughtUp();
}
if (lokiPublicChatManager != null) {
isCaughtUp = isCaughtUp && lokiPublicChatManager.areAllCaughtUp();
} }
if (isCaughtUp) { if (isCaughtUp) {
@ -90,9 +102,13 @@ public class OptimizedMessageNotifier implements MessageNotifier {
public void updateNotification(@android.support.annotation.NonNull Context context, boolean signal, int reminderCount) { public void updateNotification(@android.support.annotation.NonNull Context context, boolean signal, int reminderCount) {
Poller lokiPoller = ApplicationContext.getInstance(context).lokiPoller; Poller lokiPoller = ApplicationContext.getInstance(context).lokiPoller;
LokiPublicChatManager lokiPublicChatManager = ApplicationContext.getInstance(context).lokiPublicChatManager; LokiPublicChatManager lokiPublicChatManager = ApplicationContext.getInstance(context).lokiPublicChatManager;
boolean isCaughtUp = false; boolean isCaughtUp = true;
if (lokiPoller != null && lokiPublicChatManager != null) { if (lokiPoller != null) {
isCaughtUp = lokiPoller.isCaughtUp() && lokiPublicChatManager.areAllCaughtUp(); isCaughtUp = isCaughtUp && lokiPoller.isCaughtUp();
}
if (lokiPublicChatManager != null) {
isCaughtUp = isCaughtUp && lokiPublicChatManager.areAllCaughtUp();
} }
if (isCaughtUp) { if (isCaughtUp) {