From a7c767c914d860e3176fdeacb5d00e4fc25c17d1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 30 Apr 2017 14:07:46 -0400 Subject: more message improvements --- Role/Developer.hs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Role') diff --git a/Role/Developer.hs b/Role/Developer.hs index d3fc11c..6f762a7 100644 --- a/Role/Developer.hs +++ b/Role/Developer.hs @@ -51,17 +51,19 @@ run' runner url = do developer :: TMVar (TVar DeveloperState) -> TMChan (Message Entered) -> TMChan (MissingHashes AnyMessage) -> SessionID -> IO () developer dsv ichan ochan sid = withSessionLogger (Just "remote") sid $ \logger -> do sk <- genMySessionKey - (controlinput, controloutput) <- openControlWindow - displayInControlWindow controlinput - "Using gpg to sign the debug-me session key." spk <- myPublicKey sk (GpgSign True) + (controlinput, controloutput) <- openControlWindow displayInControlWindow controlinput "Connecting to the user's session ..." inRawMode $ do (devstate, startoutput) <- processSessionStart sk ochan logger dsv + displayInControlWindow controlinput + "Connected. You can now see what the user is doing." + displayInControlWindow controlinput + "(But, you can't type anything yet.)" emitOutput startoutput displayInControlWindow controlinput - "Waiting for the user to check your Gnupg key and grant access ..." + "Waiting for the user to check your Gnupg key and grant write access ..." authUser spk ichan ochan devstate logger >>= go controlinput controloutput logger devstate where -- cgit v1.2.3