newtype UidString

1 files changed, 7 insertions, 4 deletions

diff --git a/lib/KeyDB.hs b/lib/KeyDB.hs
index 1f0849c..1aef747 100644
--- a/lib/KeyDB.hs
+++ b/lib/KeyDB.hs
@@ -21,6 +21,7 @@ module KeyDB
     , sortByHint
     , flattenKeys
     , flattenFiltered
+    , UidString(..)
     ) where
 
 import Control.Monad
@@ -38,12 +39,14 @@ type SigAndTrust = ( MappedPacket
                    , TrustMap     ) -- trust packets
 data SubKey = SubKey MappedPacket [SigAndTrust] deriving Show
 
+data UidString = UidString { unUidString :: String } deriving (Show, Eq, Ord)
+
 -- | This is a GPG Identity which includes a master key and all its UIDs and
 -- subkeys and associated signatures.
 data KeyData = KeyData
     { keyMappedPacket :: MappedPacket                               -- main key
     , keySigAndTrusts :: [SigAndTrust]                              -- sigs on main key
-    , keyUids         :: (Map.Map String ([SigAndTrust],OriginMap)) -- uids
+    , keyUids         :: (Map.Map UidString ([SigAndTrust],OriginMap)) -- uids
     , keySubKeys      :: (Map.Map KeyKey SubKey)                    -- subkeys
     } deriving Show
 
@@ -118,14 +121,14 @@ flattenKeys isPublic db = Message $ concatMap (map packet . flattenTop "" isPubl
                                   _)) = True
                   isSecret _          = False
 
-flattenUid :: FilePath -> Bool -> (String,([SigAndTrust],OriginMap)) -> [MappedPacket]
-flattenUid fname ispub (str,(sigs,om)) =
+flattenUid :: FilePath -> Bool -> (UidString,([SigAndTrust],OriginMap)) -> [MappedPacket]
+flattenUid fname ispub (UidString str,(sigs,om)) =
     (mappedPacket "" $ UserIDPacket str) {locations=om} : concatSort fname head (unsig fname ispub) sigs
 
 flattenSub :: FilePath -> Bool -> SubKey -> [MappedPacket]
 flattenSub fname ispub (SubKey key sigs) = unk ispub key: concatSort fname head (unsig fname ispub) sigs
 
-flattenAllUids :: FilePath -> Bool -> Map.Map String ([SigAndTrust],OriginMap) -> [MappedPacket]
+flattenAllUids :: FilePath -> Bool -> Map.Map UidString ([SigAndTrust],OriginMap) -> [MappedPacket]
 flattenAllUids fname ispub uids =
     concatSort fname head (flattenUid fname ispub) (Map.assocs uids)