|
|
@ -318,11 +318,11 @@ func oxPublishPubKey(jid string, client *xmpp.Client, iqc chan xmpp.IQ, pubKey *
|
|
|
|
func oxGetPrivKeyLoc(jid string) (string, error) {
|
|
|
|
func oxGetPrivKeyLoc(jid string) (string, error) {
|
|
|
|
dataDir, err := getDataPath(strings.Replace(strings.Replace(jid, "@", "_at_", -1), ".", "_", -1))
|
|
|
|
dataDir, err := getDataPath(strings.Replace(strings.Replace(jid, "@", "_at_", -1), ".", "_", -1))
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
return strError, fmt.Errorf("oxGetPubKeyLoc: %w", err)
|
|
|
|
return strError, fmt.Errorf("oxGetPrivKeyLoc: %w", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
oldDataDir, err := getDataPath("oxprivkeys/")
|
|
|
|
oldDataDir, err := getDataPath("oxprivkeys/")
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
return strError, fmt.Errorf("oxGetPubKeyLoc: %w", err)
|
|
|
|
return strError, fmt.Errorf("oxGetPrivKeyLoc: %w", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// TODO: Remove handling of oldDataFile in a later version when it's very likely that there are no
|
|
|
|
// 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).
|
|
|
|
// more versions in use using the oldDataFile (<0.8.3).
|
|
|
|