keejef
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop
2
0
Fork 0
Code Issues 8 Projects Releases Wiki Activity

Show Optimization Message During Database Migration (#2165)

Browse Source
pull/1/head
Daniel Gasienica 8 years ago committed by GitHub
parent d35e365507 90de9d85a3
commit a3d43a56a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File

4
_locales/en/messages.json
Unescape Escape View File

@ -39,6 +39,10 @@
"message": "Loading...", "message": "Loading...",
"description": "Message shown on the loading screen before we've loaded any messages" "description": "Message shown on the loading screen before we've loaded any messages"
}, },
"optimizingApplication": {
"message": "Optimizing application...",
"description": "Message shown on the loading screen while we are doing application optimizations"
},
"chooseDirectory": { "chooseDirectory": {
"message": "Choose folder", "message": "Choose folder",
"description": "Button to allow the user to find a folder on disk" "description": "Button to allow the user to find a folder on disk"

5
background.html
Unescape Escape View File

@ -951,7 +951,6 @@
<script type='text/javascript' src='js/wall_clock_listener.js'></script> <script type='text/javascript' src='js/wall_clock_listener.js'></script>
<script type='text/javascript' src='js/rotate_signed_prekey_listener.js'></script> <script type='text/javascript' src='js/rotate_signed_prekey_listener.js'></script>
<script type='text/javascript' src='js/keychange_listener.js'></script> <script type='text/javascript' src='js/keychange_listener.js'></script>
<script type='text/javascript' src='js/background.js'></script>
</head> </head>
<body> <body>
<div class='app-loading-screen'> <div class='app-loading-screen'>
@ -962,8 +961,10 @@
<span class='dot'></span> <span class='dot'></span>
<span class='dot'></span> <span class='dot'></span>
</div> </div>
<div class='message'>Loading...</div> <div class='message'></div>
</div> </div>
</div> </div>
<script type='text/javascript' src='js/background.js'></script>
</body> </body>
</html> </html>

4
js/background.js
Unescape Escape View File

@ -17,6 +17,7 @@
const { IdleDetector, MessageDataMigrator } = Signal.Workflow; const { IdleDetector, MessageDataMigrator } = Signal.Workflow;
const { Errors, Message } = window.Signal.Types; const { Errors, Message } = window.Signal.Types;
const { upgradeMessageSchema } = window.Signal.Migrations; const { upgradeMessageSchema } = window.Signal.Migrations;
const { Views } = window.Signal;
// Implicitly used in `indexeddb-backbonejs-adapter`: // Implicitly used in `indexeddb-backbonejs-adapter`:
// https://github.com/signalapp/Signal-Desktop/blob/4033a9f8137e62ed286170ed5d4941982b1d3a64/components/indexeddb-backbonejs-adapter/backbone-indexeddb.js#L569 // https://github.com/signalapp/Signal-Desktop/blob/4033a9f8137e62ed286170ed5d4941982b1d3a64/components/indexeddb-backbonejs-adapter/backbone-indexeddb.js#L569
@ -74,6 +75,8 @@
return accountManager; return accountManager;
}; };
const cancelInitializationMessage = Views.Initialization.setMessage();
console.log('Start IndexedDB migrations');
storage.fetch(); storage.fetch();
@ -163,6 +166,7 @@
connect(true); connect(true);
}); });
cancelInitializationMessage();
var appView = window.owsDesktopApp.appView = new Whisper.AppView({el: $('body')}); var appView = window.owsDesktopApp.appView = new Whisper.AppView({el: $('body')});
Whisper.WallClockListener.init(Whisper.events); Whisper.WallClockListener.init(Whisper.events);

30
js/modules/views/initialization.js
Unescape Escape View File

@ -0,0 +1,30 @@
/* eslint-env browser */
/* global i18n: false */
const OPTIMIZATION_MESSAGE_DISPLAY_THRESHOLD = 1000; // milliseconds
const setMessage = () => {
const message = document.querySelector('.app-loading-screen .message');
if (!message) {
return () => {};
}
message.innerText = i18n('loading');
const optimizingMessageTimeoutId = setTimeout(() => {
const innerMessage = document.querySelector('.app-loading-screen .message');
if (!innerMessage) {
return;
}
innerMessage.innerText = i18n('optimizingApplication');
}, OPTIMIZATION_MESSAGE_DISPLAY_THRESHOLD);
return () => {
clearTimeout(optimizingMessageTimeoutId);
};
};
module.exports = {
setMessage,
};

6
preload.js
Unescape Escape View File

@ -124,7 +124,7 @@
const { IdleDetector} = require('./js/modules/idle_detector'); const { IdleDetector} = require('./js/modules/idle_detector');
window.Signal = window.Signal || {}; window.Signal = {};
window.Signal.Backup = require('./js/modules/backup'); window.Signal.Backup = require('./js/modules/backup');
window.Signal.Crypto = require('./js/modules/crypto'); window.Signal.Crypto = require('./js/modules/crypto');
window.Signal.Logs = require('./js/modules/logs'); window.Signal.Logs = require('./js/modules/logs');
@ -134,12 +134,14 @@
window.Signal.Migrations.upgradeMessageSchema = upgradeMessageSchema; window.Signal.Migrations.upgradeMessageSchema = upgradeMessageSchema;
window.Signal.Migrations.V17 = require('./js/modules/migrations/17'); window.Signal.Migrations.V17 = require('./js/modules/migrations/17');
window.Signal.OS = require('./js/modules/os'); window.Signal.OS = require('./js/modules/os');
window.Signal.Types = window.Signal.Types || {}; window.Signal.Types = {};
window.Signal.Types.Attachment = Attachment; window.Signal.Types.Attachment = Attachment;
window.Signal.Types.Errors = require('./js/modules/types/errors'); window.Signal.Types.Errors = require('./js/modules/types/errors');
window.Signal.Types.Message = Message; window.Signal.Types.Message = Message;
window.Signal.Types.MIME = require('./js/modules/types/mime'); window.Signal.Types.MIME = require('./js/modules/types/mime');
window.Signal.Types.Settings = require('./js/modules/types/settings'); window.Signal.Types.Settings = require('./js/modules/types/settings');
window.Signal.Views = {};
window.Signal.Views.Initialization = require('./js/modules/views/initialization');
window.Signal.Workflow = {}; window.Signal.Workflow = {};
window.Signal.Workflow.IdleDetector = IdleDetector; window.Signal.Workflow.IdleDetector = IdleDetector;
window.Signal.Workflow.MessageDataMigrator = window.Signal.Workflow.MessageDataMigrator =

Write Preview
Loading…
Cancel
Save