Restore remote config before connecting to server
This commit is contained in:
parent
abcf392e55
commit
7a9e51f5ad
2 changed files with 7 additions and 1 deletions
|
@ -57,8 +57,12 @@ type ConfigListenersMapType = {
|
||||||
let config: ConfigMapType = {};
|
let config: ConfigMapType = {};
|
||||||
const listeners: ConfigListenersMapType = {};
|
const listeners: ConfigListenersMapType = {};
|
||||||
|
|
||||||
export async function initRemoteConfig(server: WebAPIType): Promise<void> {
|
export function restoreRemoteConfigFromStorage(): void {
|
||||||
config = window.storage.get('remoteConfig') || {};
|
config = window.storage.get('remoteConfig') || {};
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function initRemoteConfig(server: WebAPIType): Promise<void> {
|
||||||
|
restoreRemoteConfigFromStorage();
|
||||||
await maybeRefreshRemoteConfig(server);
|
await maybeRefreshRemoteConfig(server);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -209,6 +209,7 @@ import { AttachmentBackupManager } from './jobs/AttachmentBackupManager';
|
||||||
import { getConversationIdForLogging } from './util/idForLogging';
|
import { getConversationIdForLogging } from './util/idForLogging';
|
||||||
import { encryptConversationAttachments } from './util/encryptConversationAttachments';
|
import { encryptConversationAttachments } from './util/encryptConversationAttachments';
|
||||||
import { DataReader, DataWriter } from './sql/Client';
|
import { DataReader, DataWriter } from './sql/Client';
|
||||||
|
import { restoreRemoteConfigFromStorage } from './RemoteConfig';
|
||||||
|
|
||||||
export function isOverHourIntoPast(timestamp: number): boolean {
|
export function isOverHourIntoPast(timestamp: number): boolean {
|
||||||
return isNumber(timestamp) && isOlderThan(timestamp, HOUR);
|
return isNumber(timestamp) && isOlderThan(timestamp, HOUR);
|
||||||
|
@ -501,6 +502,7 @@ export async function startApp(): Promise<void> {
|
||||||
}
|
}
|
||||||
first = false;
|
first = false;
|
||||||
|
|
||||||
|
restoreRemoteConfigFromStorage();
|
||||||
server = window.WebAPI.connect({
|
server = window.WebAPI.connect({
|
||||||
...window.textsecure.storage.user.getWebAPICredentials(),
|
...window.textsecure.storage.user.getWebAPICredentials(),
|
||||||
hasStoriesDisabled: window.storage.get('hasStoriesDisabled', false),
|
hasStoriesDisabled: window.storage.get('hasStoriesDisabled', false),
|
||||||
|
|
Loading…
Add table
Reference in a new issue