self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-29 22:48:10 +02:00
Code Issues Releases Activity

Made dispatching of sync events more consistent

Browse Source
This commit is contained in:
Laurent Cozic
2017-07-17 23:43:29 +01:00
parent 268dfec554
commit e19ed03b90
5 changed files with 76 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
ReactNativeClient/root.js
View File

@@ -48,6 +48,8 @@ let defaultState = {
orderBy: 'updated_time',
orderByDir: 'DESC',
},
syncStarted: false,
syncReport: {},
};
const initialRoute = {
@@ -264,6 +266,24 @@ const reducer = (state = defaultState, action) => {
newState.showSideMenu = false
break;
case 'SYNC_STARTED':
newState = Object.assign({}, state);
newState.syncStarted = true;
break;
case 'SYNC_COMPLETED':
newState = Object.assign({}, state);
newState.syncStarted = false;
break;
case 'SYNC_REPORT_UPDATE':
newState = Object.assign({}, state);
newState.syncReport = action.report;
break;
}
} catch (error) {
error.message = 'In reducer: ' + error.message;
@@ -307,7 +327,7 @@ async function initialize(dispatch, backButtonHandler) {
dbLogger.addTarget('database', { database: logDatabase, source: 'm' });
if (Setting.value('env') == 'dev') {
dbLogger.addTarget('console');
dbLogger.setLevel(Logger.LEVEL_DEBUG); // Set to LEVEL_DEBUG for full SQL queries
dbLogger.setLevel(Logger.LEVEL_INFO); // Set to LEVEL_DEBUG for full SQL queries
} else {
dbLogger.setLevel(Logger.LEVEL_INFO);
}
@@ -316,6 +336,7 @@ async function initialize(dispatch, backButtonHandler) {
db.setLogger(dbLogger);
reg.setDb(db);
reg.dispatch = dispatch;
BaseModel.dispatch = dispatch;
NotesScreenUtils.dispatch = dispatch;
NotesScreenUtils.store = store;
@@ -332,7 +353,8 @@ async function initialize(dispatch, backButtonHandler) {
if (Setting.value('env') == 'prod') {
await db.open({ name: 'joplin.sqlite' })
} else {
await db.open({ name: 'joplin-55.sqlite' })
//await db.open({ name: 'joplin-56.sqlite' })
await db.open({ name: 'joplin-56.sqlite' })
// await db.exec('DELETE FROM notes');
// await db.exec('DELETE FROM folders');
@@ -379,6 +401,11 @@ async function initialize(dispatch, backButtonHandler) {
class AppComponent extends React.Component {
constructor() {
super();
this.lastSyncStarted_ = defaultState.syncStarted;
}
async componentDidMount() {
await initialize(this.props.dispatch, this.backButtonHandler.bind(this));
reg.scheduleSync();
@@ -398,6 +425,13 @@ class AppComponent extends React.Component {
return false;
}
componentWillReceiveProps(newProps) {
if (newProps.syncStarted != this.lastSyncStarted_) {
if (!newProps.syncStarted) FoldersScreenUtils.refreshFolders();
this.lastSyncStarted_ = newProps.syncStarted;
}
}
sideMenu_change(isOpen) {
// Make sure showSideMenu property of state is updated
// when the menu is open/closed.
@@ -433,6 +467,7 @@ const mapStateToProps = (state) => {
return {
historyCanGoBack: state.historyCanGoBack,
showSideMenu: state.showSideMenu,
syncStarted: state.syncStarted,
};
};