tox: Removed obsolete "userKeys" TVar, use keys from ContactInfo.

1 files changed, 8 insertions, 1 deletions

diff --git a/src/Network/Tox/ContactInfo.hs b/src/Network/Tox/ContactInfo.hs
index d9d9a510..df3365a2 100644
--- a/src/Network/Tox/ContactInfo.hs
+++ b/src/Network/Tox/ContactInfo.hs
@@ -12,10 +12,11 @@ import qualified Data.HashMap.Strict as HashMap
 import Data.Maybe
 import qualified Data.Set            as Set
          ;import Data.Set            (Set)
+import Network.Socket
 import Network.Tox.DHT.Transport     as DHT
+import Network.Tox.NodeId            (id2key)
 import Network.Tox.Onion.Transport   as Onion
 import System.IO
-import Network.Socket
 
 newtype ContactInfo = ContactInfo
       -- | Map our toxid public key to an Account record.
@@ -150,3 +151,9 @@ friendRequests (ContactInfo roster) = do
                                $ HashMap.toList cs
         return remotes
 
+myKeyPairs :: ContactInfo -> STM [(SecretKey,PublicKey)]
+myKeyPairs (ContactInfo accounts) = do
+    acnts <- readTVar accounts
+    forM (HashMap.toList acnts) $ \(nid, Account{userSecret}) -> do
+        return (userSecret,id2key nid)
+