TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-16 10:40:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix logic error of isCaughtUp

Browse Source
This commit is contained in:
ryanzhao
2020-07-10 15:36:23 +10:00
parent bd5ec9f401
commit caabf4c1bf
1 changed files with 28 additions and 12 deletions
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) {
LokiPoller lokiPoller = ApplicationContext.getInstance(context).lokiPoller; LokiPoller 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,11 +62,15 @@ public class OptimizedMessageNotifier implements MessageNotifier {
public void updateNotification(@NonNull Context context, long threadId) { public void updateNotification(@NonNull Context context, long threadId) {
LokiPoller lokiPoller = ApplicationContext.getInstance(context).lokiPoller; LokiPoller 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) {
performOnBackgroundThreadIfNeeded(() -> wrapped.updateNotification(context, threadId)); performOnBackgroundThreadIfNeeded(() -> wrapped.updateNotification(context, threadId));
} else { } else {
@@ -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) {
LokiPoller lokiPoller = ApplicationContext.getInstance(context).lokiPoller; LokiPoller 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) {
LokiPoller lokiPoller = ApplicationContext.getInstance(context).lokiPoller; LokiPoller 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) {