Merge pull request #551 from BeaudanBrown/disable-sharing

[multi-device] Disable sharing of contacts (TEMPORARY) and add start-multi2
pull/578/head
Beaudan Campbell-Brown 6 years ago committed by GitHub
commit 521359fb3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -0,0 +1,12 @@
{
"storageProfile": "development2",
"localServerPort": "8083",
"seedNodeList": [
{
"ip": "storage.testnetseed1.loki.network",
"port": "38157"
}
],
"openDevTools": true,
"defaultPublicChatServer": "https://chat-dev.lokinet.org/"
}

@ -178,11 +178,12 @@
profile,
});
// Attach contact list
const syncMessage = await createContactSyncProtoMessage();
// TODO: Reenable sending of the syncmessage for pairing requests
// const syncMessage = await createContactSyncProtoMessage();
const content = new textsecure.protobuf.Content({
pairingAuthorisation,
dataMessage,
syncMessage,
// syncMessage,
});
// Send
const options = { messageType: 'pairing-request' };

@ -14,6 +14,7 @@
"postinstall": "electron-builder install-app-deps && rimraf node_modules/dtrace-provider",
"start": "electron .",
"start-multi": "NODE_APP_INSTANCE=1 electron .",
"start-multi2": "NODE_APP_INSTANCE=2 electron .",
"start-prod": "NODE_ENV=production NODE_APP_INSTANCE=devprod LOKI_DEV=1 electron .",
"start-prod-multi": "NODE_ENV=production NODE_APP_INSTANCE=devprod1 LOKI_DEV=1 electron .",
"grunt": "grunt",

Loading…
Cancel
Save