Improve file name for private ox keys.

no-tls
Martin Dosch 4 months ago
parent 10feec99c8
commit ce89cd94b9
No known key found for this signature in database
GPG Key ID: 52A57CFCE13D657D

@ -4,6 +4,7 @@
### Changed
- Properly handle lost connection.
- Better compatibility with perl sendxmpp config files.
- Improve file name for private Ox keys.
## [v0.8.3] 2024-02-17
### Changed

@ -347,13 +347,20 @@ func oxGetPrivKeyLoc(jid string) (string, error) {
// TODO: Remove handling of oldDataFile in a later version when it's very likely that there are no
// more versions in use using the oldDataFile (<0.8.3).
oldDataFile := dataDir + base64.StdEncoding.EncodeToString([]byte(jid))
dataFile := dataDir + strings.Replace(jid, "@", "_at_", -1)
oldDataFile2 := dataDir + strings.Replace(jid, "@", "_at_", -1)
dataFile := dataDir + strings.Replace(strings.Replace(jid, "@", "_at_", -1), ".", "_", -1)
if _, err := os.Stat(oldDataFile); err == nil {
err := os.Rename(oldDataFile, dataFile)
if err != nil {
return dataFile, err
}
}
if _, err := os.Stat(oldDataFile2); err == nil {
err := os.Rename(oldDataFile2, dataFile)
if err != nil {
return dataFile, err
}
}
return dataFile, nil
}

Loading…
Cancel
Save