From a9f7b0d5310ba4bad6b37fd21fab476acb5adc6b Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Sat, 8 Jul 2017 00:25:10 +0100
Subject: [PATCH] Various changes

---
 .../android/app/src/main/AndroidManifest.xml  |  6 +++---
 ReactNativeClient/clean_build.bat             |  4 ++++
 .../{debug-log.bat => debug_log.bat}          |  0
 ReactNativeClient/lib/components/item-list.js | 20 ++++++++++++-------
 .../lib/components/screen-header.js           |  1 +
 .../lib/components/screens/folders.js         |  2 +-
 .../lib/components/screens/log.js             |  7 ++++++-
 .../lib/components/screens/notes.js           |  2 +-
 .../lib/components/screens/onedrive-login.js  |  7 ++++++-
 ReactNativeClient/root.js                     | 14 ++++++-------
 ReactNativeClient/start_server.bat            |  2 ++
 11 files changed, 44 insertions(+), 21 deletions(-)
 create mode 100644 ReactNativeClient/clean_build.bat
 rename ReactNativeClient/{debug-log.bat => debug_log.bat} (100%)
 create mode 100644 ReactNativeClient/start_server.bat

diff --git a/ReactNativeClient/android/app/src/main/AndroidManifest.xml b/ReactNativeClient/android/app/src/main/AndroidManifest.xml
index 728a660ab..2b893b418 100644
--- a/ReactNativeClient/android/app/src/main/AndroidManifest.xml
+++ b/ReactNativeClient/android/app/src/main/AndroidManifest.xml
@@ -5,9 +5,9 @@
     android:versionName="0.8.0">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> 
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />  -->
+    <!-- <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/> -->
+    <!-- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> -->
     <uses-permission android:name="android.permission.READ_PHONE_STATE" tools:node="remove"/>
 
     <uses-sdk
diff --git a/ReactNativeClient/clean_build.bat b/ReactNativeClient/clean_build.bat
new file mode 100644
index 000000000..34101f004
--- /dev/null
+++ b/ReactNativeClient/clean_build.bat
@@ -0,0 +1,4 @@
+@echo off
+rmdir /s/q android\app\build
+rmdir /s/q android\build
+rmdir /s/q android\.gradle
\ No newline at end of file
diff --git a/ReactNativeClient/debug-log.bat b/ReactNativeClient/debug_log.bat
similarity index 100%
rename from ReactNativeClient/debug-log.bat
rename to ReactNativeClient/debug_log.bat
diff --git a/ReactNativeClient/lib/components/item-list.js b/ReactNativeClient/lib/components/item-list.js
index 53d9ab44f..21d8bee6f 100644
--- a/ReactNativeClient/lib/components/item-list.js
+++ b/ReactNativeClient/lib/components/item-list.js
@@ -59,13 +59,19 @@ class ItemListComponent extends Component {
 		}
 
 		// `enableEmptySections` is to fix this warning: https://github.com/FaridSafi/react-native-gifted-listview/issues/39
-		return (
-			<ListView
-				dataSource={this.state.dataSource}
-				renderRow={renderRow}
-				enableEmptySections={true}
-			/>
-		);
+
+		if (this.state.dataSource.getRowCount()) {
+			return (
+				<ListView
+					dataSource={this.state.dataSource}
+					renderRow={renderRow}
+					enableEmptySections={true}
+				/>
+			);
+		} else {
+			const noItemMessage = this.props.noItemMessage ? this.props.noItemMessage : '';
+			return <Text>{noItemMessage}</Text>;
+		}
 	}
 }
 
diff --git a/ReactNativeClient/lib/components/screen-header.js b/ReactNativeClient/lib/components/screen-header.js
index 7a2b2d6f0..141c94060 100644
--- a/ReactNativeClient/lib/components/screen-header.js
+++ b/ReactNativeClient/lib/components/screen-header.js
@@ -24,6 +24,7 @@ class ScreenHeaderComponent extends Component {
 		// Note: this is hardcoded for now because navigation.state doesn't tell whether
 		// it's possible to go back or not. Maybe it's possible to get this information
 		// from somewhere else.
+		return true;
 		return this.props.navState.routeName != 'Notes';
 	}
 
diff --git a/ReactNativeClient/lib/components/screens/folders.js b/ReactNativeClient/lib/components/screens/folders.js
index 340b76a93..e2ab75fae 100644
--- a/ReactNativeClient/lib/components/screens/folders.js
+++ b/ReactNativeClient/lib/components/screens/folders.js
@@ -17,7 +17,7 @@ class FoldersScreenComponent extends React.Component {
 		return (
 			<View style={{flex: 1}}>
 				<ScreenHeader navState={this.props.navigation.state} />
-				<FolderList style={{flex: 1}}/>
+				<FolderList noItemMessage={_('There is currently no notebook. Create one by clicking on the (+) button.')} style={{flex: 1}}/>
 				<ActionButton></ActionButton>
 			</View>
 		);
diff --git a/ReactNativeClient/lib/components/screens/log.js b/ReactNativeClient/lib/components/screens/log.js
index 1ee302010..49b705387 100644
--- a/ReactNativeClient/lib/components/screens/log.js
+++ b/ReactNativeClient/lib/components/screens/log.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { ListView, View, Text } from 'react-native';
+import { ListView, View, Text, Button } from 'react-native';
 import { connect } from 'react-redux'
 import { Log } from 'lib/log.js'
 import { reg } from 'lib/registry.js'
@@ -23,6 +23,10 @@ class LogScreenComponent extends React.Component {
 	}
 
 	componentWillMount() {
+		this.resfreshLogEntries();
+	}
+
+	resfreshLogEntries() {
 		reg.logger().lastEntries(1000).then((entries) => {
 			const newDataSource = this.state.dataSource.cloneWithRows(entries);
 			this.setState({ dataSource: newDataSource });
@@ -47,6 +51,7 @@ class LogScreenComponent extends React.Component {
 					renderRow={renderRow}
 					enableEmptySections={true}
 				/>
+				<Button title="Refresh" onPress={() => { this.resfreshLogEntries(); }}/>
 			</View>
 		);
 	}
diff --git a/ReactNativeClient/lib/components/screens/notes.js b/ReactNativeClient/lib/components/screens/notes.js
index d3e8ca112..32e339ca6 100644
--- a/ReactNativeClient/lib/components/screens/notes.js
+++ b/ReactNativeClient/lib/components/screens/notes.js
@@ -49,7 +49,7 @@ class NotesScreenComponent extends React.Component {
 		return (
 			<View style={{flex: 1}}>
 				<ScreenHeader title={title} navState={this.props.navigation.state} menuOptions={this.menuOptions()} />
-				<NoteList style={{flex: 1}}/>
+				<NoteList noItemMessage={_('There are currently no notes. Create one by clicking on the (+) button.')} style={{flex: 1}}/>
 				<ActionButton parentFolderId={this.props.selectedFolderId}></ActionButton>
 			</View>
 		);
diff --git a/ReactNativeClient/lib/components/screens/onedrive-login.js b/ReactNativeClient/lib/components/screens/onedrive-login.js
index 008b36819..fcb7b33ed 100644
--- a/ReactNativeClient/lib/components/screens/onedrive-login.js
+++ b/ReactNativeClient/lib/components/screens/onedrive-login.js
@@ -46,7 +46,12 @@ class OneDriveLoginScreenComponent extends React.Component {
 			let code = url.split('?code=');
 			this.authCode_ = code[1];
 
-			await reg.oneDriveApi().execTokenRequest(this.authCode_, this.redirectUrl(), true);
+			try {
+				await reg.oneDriveApi().execTokenRequest(this.authCode_, this.redirectUrl(), true);
+				this.props.dispatch({ type: 'Navigation/BACK' });
+			} catch (error) {
+				alert(error.message);
+			}
 
 			this.authCode_ = null;
 		}
diff --git a/ReactNativeClient/root.js b/ReactNativeClient/root.js
index aef742872..47d54c0bc 100644
--- a/ReactNativeClient/root.js
+++ b/ReactNativeClient/root.js
@@ -259,14 +259,14 @@ class AppComponent extends React.Component {
 			if (Setting.value('env') == 'prod') {
 				await db.open({ name: 'joplin.sqlite' })
 			} else {
-				await db.open({ name: 'joplin-51.sqlite' })
+				await db.open({ name: 'joplin-52.sqlite' })
 
-				// await db.exec('DELETE FROM notes');
-				// await db.exec('DELETE FROM folders');
-				// await db.exec('DELETE FROM tags');
-				// await db.exec('DELETE FROM note_tags');
-				// await db.exec('DELETE FROM resources');
-				// await db.exec('DELETE FROM deleted_items');
+				await db.exec('DELETE FROM notes');
+				await db.exec('DELETE FROM folders');
+				await db.exec('DELETE FROM tags');
+				await db.exec('DELETE FROM note_tags');
+				await db.exec('DELETE FROM resources');
+				await db.exec('DELETE FROM deleted_items');
 			}
 
 			reg.logger().info('Database is ready.');
diff --git a/ReactNativeClient/start_server.bat b/ReactNativeClient/start_server.bat
new file mode 100644
index 000000000..d84e1d40e
--- /dev/null
+++ b/ReactNativeClient/start_server.bat
@@ -0,0 +1,2 @@
+@echo off
+npm start -- --reset-cache
\ No newline at end of file