self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-16 00:14:34 +02:00
Code Issues Releases Activity

Android: Fixes #3800: Simplify initialisation code to prevent sharing

Browse Source 
with app to create multiple instance of app and break settings.

Revert "Mobile: Add startup screen to show progress of db migration"

This reverts commit 569355a318.
This commit is contained in:
Laurent Cozic
2020-10-08 11:35:29 +01:00
parent c2c7efee91
commit 73b33e8e32
8 changed files with 33 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ReactNativeClient/lib/joplin-database.js
View File

@ -3,7 +3,6 @@ const { Database } = require('lib/database.js');
const { sprintf } = require('sprintf-js');
const Resource = require('lib/models/Resource');
const { shim } = require('lib/shim.js');
const EventEmitter = require('events');
const structureSql = `
CREATE TABLE folders (
@ -127,11 +126,6 @@ class JoplinDatabase extends Database {
this.version_ = null;
this.tableFieldNames_ = {};
this.extensionToLoad = './build/lib/sql-extensions/spellfix';
this.eventEmitter_ = new EventEmitter();
}
eventEmitter() {
return this.eventEmitter_;
}
initialized() {
@ -361,8 +355,6 @@ class JoplinDatabase extends Database {
let queries = [];
this.eventEmitter_.emit('startMigration', { version: targetVersion });
if (targetVersion == 1) {
queries = this.wrapQueries(this.sqlStringToLines(structureSql));
}