rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat: snjs with auto integrity resolution (#912)

Browse Source
This commit is contained in:
Mo
2022-03-07 10:34:23 -06:00
committed by GitHub
parent 39c503ca1d
commit ae5b182ac1
14 changed files with 78 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/preferences/panes/Extensions.tsx
View File

@@ -74,7 +74,7 @@ export const Extensions: FunctionComponent<{
const confirmExtension = async () => {
await application.insertItem(confirmableExtension as SNComponent);
application.sync();
application.sync.sync();
setExtensions(loadExtensions(application));
};

10
app/assets/javascripts/preferences/panes/account/Sync.tsx
View File

@@ -24,22 +24,22 @@ export const Sync: FunctionComponent<Props> = observer(
({ application }: Props) => {
const [isSyncingInProgress, setIsSyncingInProgress] = useState(false);
const [lastSyncDate, setLastSyncDate] = useState(
formatLastSyncDate(application.getLastSyncDate() as Date)
formatLastSyncDate(application.sync.getLastSyncDate() as Date)
);
const doSynchronization = async () => {
setIsSyncingInProgress(true);
const response = await application.sync({
const response = await application.sync.sync({
queueStrategy: SyncQueueStrategy.ForceSpawnNew,
checkIntegrity: true,
});
setIsSyncingInProgress(false);
if (response && response.error) {
application.alertService!.alert(STRING_GENERIC_SYNC_ERROR);
if (response && (response as any).error) {
application.alertService.alert(STRING_GENERIC_SYNC_ERROR);
} else {
setLastSyncDate(
formatLastSyncDate(application.getLastSyncDate() as Date)
formatLastSyncDate(application.sync.getLastSyncDate() as Date)
);
}
};