web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix friend migration and handle UPDATE_DATA mails

Browse Source
This commit is contained in:
yflory
2019-06-05 16:05:00 +02:00
parent 592544819e
commit 250d9f3bc6
2 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
www/common/migrate-user-object.js
View File

@@ -192,6 +192,7 @@ define([
}).nThen(function (waitFor) {
// Migration 9: send our mailbox channel to existing friends
var migrateFriends = function () {
var network = store.network;
var channels = {};
var ctx = {
store: store
@@ -203,8 +204,8 @@ define([
if (!channel) { return; }
try {
channel.wc.leave();
delete channels[chan];
} catch (e) {}
delete channels[chan];
};
var onDirectMessage = function (msg, sender) {
@@ -229,7 +230,7 @@ define([
// Channel is ready and we didn't receive their mailbox channel: send our channel
myData.channel = parsed.channel;
var updateMsg = ['UPDATE', myData.curvePublic, +new Date(), myData];
var cryptMsg = channel.encrypt(JSON.stringify(updateMsg));
var cryptMsg = channels[parsed.channel].encrypt(JSON.stringify(updateMsg));
channels[parsed.channel].wc.bcast(cryptMsg).then(function () {}, function (err) {
console.error("Can't migrate this friend", channels[parsed.channel].friend, err);
});
@@ -255,10 +256,11 @@ define([
channel.friend.notifications = data.notifications
myData.channel = chan;
Mailbox.sendTo(ctx, 'UPDATE_DATA', myData, {
channel: data.notitications,
channel: data.notifications,
curvePublic: data.curvePublic
}, function () {
console.log('friend migrated', friend);
}, function (obj) {
if (obj && obj.error) { return void console.error(obj); }
console.log('friend migrated', channel.friend);
});
close(chan);
}
@@ -267,7 +269,9 @@ define([
network.on('message', function(msg, sender) {
try {
onDirectMessage(msg, sender);
} catch (e) {}
} catch (e) {
console.error(e);
}
});
var friends = userObject.friends || {};
@@ -309,7 +313,7 @@ define([
if (version < 9) {
migrateFriends();
Feedback.send('Migrate-9', true);
userObject.version = version = 9;
//userObject.version = version = 9;
}
/*}).nThen(function (waitFor) {
// Test progress bar in the loading screen