2 files changed, 11 insertions, 4 deletions

diff --git a/ToxManager.hs b/ToxManager.hs
index 1e9c618d..460b2fe5 100644
--- a/ToxManager.hs
+++ b/ToxManager.hs
@@ -111,8 +111,8 @@ toxman announcer toxbkts tox presence = ToxManager
             --      Stop the recurring search for that contact
             --
             -- Stop recurring announce.
+            akey <- packAnnounceKey announcer ("toxid:" ++ show pubid)
             fmap Just $ forM toxbkts $ \(nm,bkts) -> do
-                akey <- packAnnounceKey announcer (nm ++ "id:" ++ show pubid)
                 return (akey,bkts)
         else return Nothing
        forM_ bStopped $ \kbkts -> do
diff --git a/ToxToXMPP.hs b/ToxToXMPP.hs
index ace4e041..c61764ef 100644
--- a/ToxToXMPP.hs
+++ b/ToxToXMPP.hs
@@ -111,7 +111,8 @@ dispatch :: ToxToXMPP -> ContactEvent -> IO ()
 dispatch tx (SessionEstablished theirKey) = stopConnecting tx theirKey
 dispatch tx (SessionTerminated theirKey)  = startConnecting tx theirKey
 dispatch tx (AddrChange   theirkey saddr)                    = return () -- todo
-dispatch tx (PolicyChange theirkey policy                  ) = return () -- todo
+dispatch tx (PolicyChange theirkey TryingToConnect         ) = startConnecting tx theirkey
+dispatch tx (PolicyChange theirkey policy                  ) = stopConnecting tx theirkey
 dispatch tx (OnionRouted  theirkey (OnionDHTPublicKey pkey)) = return () -- todo
 dispatch tx (OnionRouted  theirkey (OnionFriendRequest fr) ) = do
     let ToxToXMPP { txAnnouncer = acr
@@ -198,6 +199,7 @@ startConnecting tx them = do
 
 stopConnecting :: ToxToXMPP -> PublicKey -> IO ()
 stopConnecting ToxToXMPP{txAnnouncer=announcer,txAccount=acnt} them = do
+    hPutStrLn stderr $ "STOP CONNECTING " ++ show (key2id them)
     let pub = toPublic $ userSecret acnt
         me  = key2id pub
     akey <- akeyDHTKeyShare announcer me them
@@ -207,7 +209,7 @@ forkAccountWatcher :: Account -> Tox -> PresenceState -> Announcer -> IO ThreadI
 forkAccountWatcher acc tox st announcer = forkIO $ do
     myThreadId >>= flip labelThread ("tox-xmpp:"
                                       ++ show (key2id $ toPublic $ userSecret acc))
-    (chan,contacts) <- atomically $ do
+    (chan,cs) <- atomically $ do
                 chan <- dupTChan $ eventChan acc -- duplicate broadcast channel for reading.
                 contacts <- readTVar (contacts acc)
                 return (chan,contacts)
@@ -216,7 +218,7 @@ forkAccountWatcher acc tox st announcer = forkIO $ do
                        , txPresence  = st
                        , txTox       = tox
                        }
-    forM_ (HashMap.toList contacts) $ \(them,c) -> do
+    forM_ (HashMap.toList cs) $ \(them,c) -> do
         startConnecting0 tx (id2key them) c
 
     -- Loop endlessly until clientRefs is null.
@@ -230,6 +232,11 @@ forkAccountWatcher acc tox st announcer = forkIO $ do
 
     forM_ mev $ \ev -> dispatch tx ev >> loop
 
+    cs <- atomically $ readTVar (contacts acc)
+    forM_ (HashMap.toList cs) $ \(them,c) -> do
+        stopConnecting tx (id2key them)
+
+
 toxQSearch :: Tox.Tox -> Search Tox.NodeId (IP, PortNumber) Nonce32 Tox.NodeInfo Tox.Rendezvous
 toxQSearch tox = Tox.toxidSearch (Tox.onionTimeout tox) (Tox.toxCryptoKeys tox) (Tox.toxOnion tox)