1 files changed, 21 insertions, 5 deletions

diff --git a/Presence/Presence.hs b/Presence/Presence.hs
index 77689d1e..ed1c5033 100644
--- a/Presence/Presence.hs
+++ b/Presence/Presence.hs
@@ -39,7 +39,8 @@ import Data.XML.Types (Event)
 import System.Posix.Types (UserID,CPid)
 import Control.Applicative
 import Crypto.Error.Types       (CryptoFailable (..))
-import Crypto.PubKey.Curve25519 (publicKey, secretKey, toPublic)
+import Crypto.PubKey.Curve25519 (SecretKey,toPublic)
+import Text.Read (readMaybe)
 
 import LockedChan (LockedChan)
 import TraversableT
@@ -51,6 +52,8 @@ import ConsoleWriter
 import ClientState
 import Util
 import qualified Connection
+import Network.Tox.NodeId (id2key)
+import Crypto.Tox (decodeSecret)
 
 isPeerKey :: ConnectionKey -> Bool
 isPeerKey k = case k of { PeerKey {} -> True ; _ -> False }
@@ -65,9 +68,22 @@ localJID user "." resource = do
 localJID user profile resource =
     return $ user <> "@" <> profile <> "/" <> resource
 
+-- | These hooks will be invoked in order to connect to *.tox hosts in the
+-- user's roster.
+--
+-- The parameter k is a lookup key corresponding to an XMPP client.  Each
+-- unique value should be able to hold a reference to the ToxID identity which
+-- should stay online until all interested keys have run 'deactivateAccount'.
 data ToxManager k = ToxManager
-    { activateAccount        :: k -> Text -> IO ()
+      -- | Put the given ToxID online.
+    { activateAccount        :: k -> Text -> SecretKey -> IO ()
+      -- | Take the given ToxID offline (assuming no other /k/ has a claim).
     , deactivateAccount      :: k -> Text -> IO ()
+      -- | Try to connect to the remote peer (or not).
+      --
+      -- The arguments are our public key (in hostname format) followed by
+      -- their public key (in hostname format) and the Policy to set for this
+      -- link.
     , setToxConnectionPolicy :: Text -> Text -> Connection.Policy -> IO ()
     }
 
@@ -196,9 +212,9 @@ chooseResourceName state k addr clientsNameForMe desired = do
                 -- TODO: Tox key profile.
                 secs <- configText ConfigFiles.getSecrets user wanted_profile
                 case secs of
-                    sec:_ | CryptoPassed s <- secretKey (Text.encodeUtf8 sec)
-                          , CryptoPassed (toPublic s) == publicKey (Text.encodeUtf8 pub)
-                          -> do activateAccount toxman k wanted_profile
+                    sec:_ | Just s <- decodeSecret (Text.encodeUtf8 sec)
+                          , Just (toPublic s) == fmap id2key (readMaybe $ Text.unpack pub)
+                          -> do activateAccount toxman k wanted_profile s
                                 return wanted_profile
                     _     -> do
                             -- XXX: We should probably fail to connect when an