From f35f34c0a464580bbffc650d4be3ef32b2dbb80d Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Wed, 29 Mar 2023 17:22:40 +0100
Subject: [PATCH] Fix logic for reporting clock skew.
---
.../mailbox/core/tor/AbstractTorPlugin.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/mailbox-core/src/main/java/org/briarproject/mailbox/core/tor/AbstractTorPlugin.java b/mailbox-core/src/main/java/org/briarproject/mailbox/core/tor/AbstractTorPlugin.java
index e0eaea61..8f2d8d3f 100644
--- a/mailbox-core/src/main/java/org/briarproject/mailbox/core/tor/AbstractTorPlugin.java
+++ b/mailbox-core/src/main/java/org/briarproject/mailbox/core/tor/AbstractTorPlugin.java
@@ -340,15 +340,14 @@ public abstract class AbstractTorPlugin implements TorPlugin, EventListener {
private synchronized TorPluginState getCurrentState(TorState torState) {
if (torState == TorState.STARTING_STOPPING) {
return TorPluginState.StartingStopping.INSTANCE;
- } else if (torState == TorState.CONNECTING) {
- return new TorPluginState.Enabling(bootstrapPercent);
} else if (torState == TorState.DISABLED) {
return TorPluginState.Inactive.INSTANCE;
+ } else if (clockSkewed) {
+ return TorPluginState.ClockSkewed.INSTANCE;
+ } else if (torState == TorState.CONNECTING) {
+ return new TorPluginState.Enabling(bootstrapPercent);
} else if (torState == TorState.CONNECTED) {
- if (clockSkewed) {
- // TODO: Should we also report clock skew while connecting?
- return TorPluginState.ClockSkewed.INSTANCE;
- } else if (numServiceUploads >= HS_DESC_UPLOADS) {
+ if (numServiceUploads >= HS_DESC_UPLOADS) {
return TorPluginState.Published.INSTANCE;
} else {
return TorPluginState.Active.INSTANCE;
--
GitLab