Various improvements

CliClient/app/app.js

@@ -39,6 +39,15 @@ class Application {
 		return this.currentFolder_;
 	}
 
+	async refreshCurrentFolder() {
+		let newFolder = null;
+		
+		if (this.currentFolder_) newFolder = await Folder.load(this.currentFolder_.id);
+		if (!newFolder) newFolder = await Folder.defaultFolder();
+
+		this.switchCurrentFolder(newFolder);
+	}
+
 	updatePrompt() {
 		if (!this.showPromptString_) return '';
 

CliClient/app/command-sync.js

@@ -44,6 +44,9 @@ class Command extends BaseCommand {
 
 		await sync.start(options);
 		vorpalUtils.redrawDone();
+
+		await app().refreshCurrentFolder();
+
 		this.log(_('Done.'));
 	}
 

CliClient/package.json

@@ -7,7 +7,7 @@
     "url": "https://github.com/laurent22/joplin"
   },
   "url": "git://github.com/laurent22/joplin.git",
-  "version": "0.8.41",
+  "version": "0.8.42",
   "bin": {
     "joplin": "./main_launcher.js"
   },

ReactNativeClient/android/app/build.gradle

@@ -90,8 +90,8 @@ android {
 		applicationId "net.cozic.joplin"
 		minSdkVersion 16
 		targetSdkVersion 22
-		versionCode 13
-		versionName "0.9.0"
+		versionCode 14
+		versionName "0.9.1"
 		ndk {
 			abiFilters "armeabi-v7a", "x86"
 		}

ReactNativeClient/lib/components/screens/notes-utils.js

@@ -30,6 +30,7 @@ class NotesScreenUtils {
 
 	static async openDefaultNoteList() {
 		const selectedFolder = await Folder.defaultFolder();
+		
 		if (selectedFolder) {
 			this.openNoteList(selectedFolder.id);
 		} else {

ReactNativeClient/lib/components/screens/notes.js

@@ -23,7 +23,6 @@ class NotesScreenComponent extends BaseScreenComponent {
 		dialogs.confirm(this, _('Delete notebook?')).then((ok) => {
 			if (!ok) return;
 
-
 			Folder.delete(folderId).then(() => {
 				return NotesScreenUtils.openDefaultNoteList();
 			}).catch((error) => {
@@ -51,6 +50,12 @@ class NotesScreenComponent extends BaseScreenComponent {
 
 	render() {
 		let folder = Folder.byId(this.props.folders, this.props.selectedFolderId);
+
+		if (!folder) {
+			NotesScreenUtils.openDefaultNoteList();
+			return null;
+		}
+
 		let title = folder ? folder.title : null;
 		const addFolderNoteButtons = folder.id != Folder.conflictFolderId();
 

ReactNativeClient/lib/components/side-menu-content.js

@@ -108,7 +108,7 @@ class SideMenuContentComponent extends Component {
 			);
 		}
 
-		items.push(<View style={{ height: 50, flex: -1 }} key='divider_1'></View>); // DIVIDER
+		if (items.length) items.push(<View style={{ height: 50, flex: -1 }} key='divider_1'></View>); // DIVIDER
 
 		items.push(<Button title="Synchronize" onPress={() => { this.synchronize_press() }} key='synchronize' />);
 

ReactNativeClient/lib/models/base-item.js

@@ -65,7 +65,9 @@ class BaseItem extends BaseModel {
 
 	static async syncedCount() {
 		const ItemClass = this.itemClass(this.modelType());
-		const r = await this.db().selectOne('SELECT count(*) as total FROM `' + ItemClass.tableName() + '` WHERE updated_time <= sync_time');
+		let sql = 'SELECT count(*) as total FROM `' + ItemClass.tableName() + '` WHERE updated_time <= sync_time';
+		if (this.modelType() == BaseModel.TYPE_NOTE) sql += ' AND is_conflict = 0';
+		const r = await this.db().selectOne(sql);
 		return r.total;
 	}
 

ReactNativeClient/lib/onedrive-api.js

@@ -170,8 +170,8 @@ class OneDriveApi {
 				if (error.message == 'Network request failed') {
 					// Unfortunately the error 'Network request failed' doesn't have a type
 					// or error code, so hopefully that message won't change and is not localized
-					this.logger().info('Got error below - retrying...');
-					this.logger().info(error);
+					this.logger().warn('Got error below - retrying...');
+					this.logger().warn(error);
 					await time.sleep((i + 1) * 3);
 					continue;
 				} else {
@@ -202,8 +202,8 @@ class OneDriveApi {
 					//   type: 'system',
 					//   errno: 'EAGAIN',
 					//   code: 'EAGAIN' }
-					this.logger().info('Got error below - retrying...');
-					this.logger().info(error);
+					this.logger().warn('Got error below - retrying...');
+					this.logger().warn(error);
 					await time.sleep((i + 1) * 3);
 					continue;
 				} else if (error.code == 'itemNotFound' && method == 'DELETE') {

ReactNativeClient/lib/services/report.js

@@ -26,8 +26,10 @@ class ReportService {
 			syncedCount += o.synced;
 		}
 
+		let conflictedCount = await Note.conflictedCount();
+
 		output.total = {
-			total: itemCount,
+			total: itemCount - conflictedCount,
 			synced: syncedCount,
 		};
 

ReactNativeClient/root.js

@@ -120,6 +120,7 @@ const reducer = (state = defaultState, action) => {
 					// If the current screen is already the requested screen, don't do anything
 				} else {
 					newState.route = action;
+					if (action.routeName == 'Welcome') navHistory = [];
 					navHistory.push(action);
 				}