netCrypto packet-request thread wip (continued)

1 files changed, 3 insertions, 9 deletions

diff --git a/src/Network/Tox/Crypto/Handlers.hs b/src/Network/Tox/Crypto/Handlers.hs
index ea5c0f98..356ddf24 100644
--- a/src/Network/Tox/Crypto/Handlers.hs
+++ b/src/Network/Tox/Crypto/Handlers.hs
@@ -753,15 +753,9 @@ runUponHandshake netCryptoSession0 addr pktoq = do
         labelThread tid ("NetCryptoRequest." ++ show (key2id remotePublicKey) ++ sidStr)
         fix $ \loop -> do
             atomically (readTVar (ncRequestInterval netCryptoSession0)) >>= threadDelay
-            result <- atomically $ PQ.dequeueOrGetMissing pktq
-            case result of
-                Right cd -> do
-                    dput XNetCrypto $ "Dequeued(Request Thread)::" ++ show (bufferData cd) ++ " now running hook..."
-                    _ <- runCryptoHook netCryptoSession0 (bufferData cd)
-                    return ()
-                Left nums -> do
-                    dput XNetCrypto $ "(Request Thread) Missing Packets detected:" ++ show nums
-                    dput XNetCrypto $ "TODO: compose PacketRequest message and send it."
+            nums <- atomically $ PQ.getMissing pktq
+            dput XNetCrypto $ "(Request Thread) Missing Packets detected:" ++ show nums
+            dput XNetCrypto $ "TODO: compose PacketRequest message and send it."
             loop
     dput XNetCrypto $ "runUponHandshake: " ++ show threadid ++ " = NetCryptoRequest." ++ show (key2id remotePublicKey) ++ sidStr
     -- launch dequeueOutgoing thread