Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[multi-device] Disable sharing of contacts (TEMPORARY) and add start-multi2 #551

Merged
merged 2 commits into from Oct 4, 2019
Merged

[multi-device] Disable sharing of contacts (TEMPORARY) and add start-multi2 #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9002c34
TEMPORARY: Disabled sending of contact list sync message to have cons…
Oct 3, 2019
20b122e
Add yarn start-multi2 to allow for easier multi device testing (3 cli…
Oct 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions config/development-2.json
View file
Open in desktop
@@ -0,0 +1,12 @@
{
"storageProfile": "development2",
"localServerPort": "8083",
"seedNodeList": [
{
"ip": "storage.testnetseed1.loki.network",
"port": "38157"
}
],
"openDevTools": true,
"defaultPublicChatServer": "https://chat-dev.lokinet.org/"
}
5 changes: 3 additions & 2 deletions libloki/api.js
View file
Open in desktop
Expand Up @@ -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' };
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Expand Up @@ -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",
Expand Down