From 926bfab589161027ca055555fadaef39e8ef9222 Mon Sep 17 00:00:00 2001
From: Nathaniel Wesley Filardo <nwfilardo@gmail.com>
Date: Tue, 19 Feb 2019 01:00:02 +0000
Subject: [PATCH] MainService: minor changes to reporting and client handling

Don't set the state on timesync events.
Null out the client handle slightly earlier.
---
 .../com/acmetensortoys/ctfwstimer/MainService.java   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainService.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainService.java
index 6a28839..35f3437 100644
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainService.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainService.java
@@ -137,7 +137,7 @@ public class MainService extends Service {
                             return;
                         }
                         lastServerTimeDeltaEstimate = rxtime - mtime;
-                        setMSE(MqttServerEvent.MSE_SUB);
+                        notifyMSE();
                     }
                 });
 
@@ -238,7 +238,7 @@ public class MainService extends Service {
                 Log.d("Service", "domqtt disconn close mqtt", me);
             }
             mMqc.unregisterResources();
-
+            mMqc = null;
         } else {
             Log.d("Service", "domqtt no client");
         }
@@ -267,7 +267,6 @@ public class MainService extends Service {
 
         // If disconnecting is all we were told to do, we're done.
         if (server == null) {
-            mMqc = null;
             return;
         }
 
@@ -325,10 +324,15 @@ public class MainService extends Service {
         void onHandbookFetch(LocalBinder b);
     }
     private final Set<Observer> mObsvs = new HashSet<>();
+    private void notifyMSE() {
+        synchronized(this) {
+            for (Observer o : mObsvs) { o.onMqttServerEvent(mBinder, mMSE); }
+        }
+    }
     private void setMSE(MqttServerEvent mse) {
         synchronized(this) {
             mMSE = mse;
-            for (Observer o : mObsvs) { o.onMqttServerEvent(mBinder, mse); }
+            notifyMSE();
         }
     }
     private void notifyServerChanged(String sURL) {
-- 
2.50.1