Various changes

CliClient/app/fuzzing.js

@@ -63,7 +63,7 @@ function randomWord() {
 
 function execCommand(client, command, options = {}) {
 	let exePath = 'node ' + joplinAppPath;
-	let cmd = exePath + ' --profile ' + client.profileDir + ' ' + command;
+	let cmd = exePath + ' --env dev --profile ' + client.profileDir + ' ' + command;
 	logger.info(client.id + ': ' + command);
 
 	if (options.killAfter) {
@@ -80,7 +80,7 @@ function execCommand(client, command, options = {}) {
 					reject(error);
 				}
 			} else {
-				resolve(stdout);
+				resolve(stdout.trim());
 			}
 		});
 

CliClient/app/main.js

@@ -40,6 +40,7 @@ const packageJson = require('./package.json');
 
 let initArgs = {
 	profileDir: null,
+	env: 'prod',
 }
 
 const fsDriver = new FsDriverNode();
@@ -821,6 +822,13 @@ async function handleStartFlags(argv) {
 			continue;
 		}
 
+		if (arg == '--env') {
+			if (!nextArg) throw new Error(_('Usage: --env <dev|prod>'));
+			initArgs.env = nextArg;
+			argv.splice(0, 2);
+			continue;
+		}
+
 		if (arg == '--redraw-disabled') {
 			vorpalUtils.setRedrawEnabled(false);
 			argv.splice(0, 1);
@@ -913,27 +921,19 @@ async function main() {
 
 	let argv = process.argv;
 	argv = await handleStartFlags(argv);
-
 	if (argv.length) showPromptString = false;
 
 	const profileDir = initArgs.profileDir ? initArgs.profileDir : os.homedir() + '/.config/' + Setting.value('appName');
 	const resourceDir = profileDir + '/resources';
-	const tempDir = profileDir + '/tmp';
 
+	Setting.setConstant('env', initArgs.env);
 	Setting.setConstant('profileDir', profileDir);
 	Setting.setConstant('resourceDir', resourceDir);
-	Setting.setConstant('tempDir', tempDir);
 
 	await fs.mkdirp(profileDir, 0o755);
 	await fs.mkdirp(resourceDir, 0o755);
-	await fs.mkdirp(tempDir, 0o755);
-
-	// let logDatabase = new Database(new DatabaseDriverNode());
-	// await logDatabase.open({ name: profileDir + '/database-log.sqlite' });
-	// await logDatabase.exec(Logger.databaseCreateTableSql());
 
 	logger.addTarget('file', { path: profileDir + '/log.txt' });
-	// logger.addTarget('database', { database: logDatabase, source: 'main' });
 	logger.setLevel(logLevel);
 
 	dbLogger.addTarget('file', { path: profileDir + '/log-database.txt' });
@@ -943,6 +943,7 @@ async function main() {
 	syncLogger.setLevel(logLevel);
 
 	logger.info(sprintf('Starting %s %s...', packageJson.name, packageJson.version));
+	logger.info('Environment: ' + Setting.value('env'));
 	logger.info('Profile directory: ' + profileDir);
 
 	// That's not good, but it's to avoid circular dependency issues
@@ -969,7 +970,9 @@ async function main() {
 
 	// If we still have arguments, pass it to Vorpal and exit
 	if (argv.length) {
-		vorpal.show();
+		//vorpal.delimiter(' AAAAAAAAAAAAAAAAAAAAA');
+		//console.info(vorpal.ui.inquirer);
+		//vorpal.show();
 		let cmd = shellArgsToString(argv);
 		await vorpal.exec(cmd);
 		await vorpal.exec('exit');

CliClient/run.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
 CLIENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-bash $CLIENT_DIR/build.sh && NODE_PATH="$CLIENT_DIR/build/" node build/main.js --profile ~/Temp/TestNotes2 --stack-trace-enabled --log-level debug --redraw-disabled "$@"
+bash $CLIENT_DIR/build.sh && NODE_PATH="$CLIENT_DIR/build/" node build/main.js --profile ~/Temp/TestNotes2 --stack-trace-enabled --log-level debug --redraw-disabled --env dev "$@"
 #bash $CLIENT_DIR/build.sh && NODE_PATH="$CLIENT_DIR/build/" node build/main.js --profile ~/Temp/TestNotes import-enex --fuzzy-matching /home/laurent/Desktop/afaire.enex afaire
 #bash $CLIENT_DIR/build.sh && NODE_PATH="$CLIENT_DIR/build/" node build/main.js --profile ~/Temp/TestNotes import-enex --fuzzy-matching /home/laurent/Desktop/Laurent.enex laurent

CliClient/test.txt

@@ -0,0 +1 @@
+[]

ReactNativeClient/android/app/BUCK

@@ -45,12 +45,12 @@ android_library(
 
 android_build_config(
     name = "build_config",
-    package = "com.awesomeproject",
+    package = "net.cozic.joplin",
 )
 
 android_resource(
     name = "res",
-    package = "com.awesomeproject",
+    package = "net.cozic.joplin",
     res = "src/main/res",
 )
 

ReactNativeClient/android/app/build.gradle

@@ -75,7 +75,7 @@ apply from: "../../node_modules/react-native/react.gradle"
  * Upload all the APKs to the Play Store and people will download
  * the correct one based on the CPU architecture of their device.
  */
-def enableSeparateBuildPerCPUArchitecture = false
+def enableSeparateBuildPerCPUArchitecture = true
 
 /**
  * Run Proguard to shrink the Java bytecode in release builds.
@@ -87,11 +87,11 @@ android {
 	buildToolsVersion "23.0.1"
 
 	defaultConfig {
-		applicationId "com.awesomeproject"
+		applicationId "net.cozic.joplin"
 		minSdkVersion 16
 		targetSdkVersion 22
-		versionCode 1
-		versionName "1.0"
+		versionCode 2
+		versionName "0.8.0"
 		ndk {
 			abiFilters "armeabi-v7a", "x86"
 		}

ReactNativeClient/android/app/src/main/AndroidManifest.xml

@@ -1,12 +1,14 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.awesomeproject"
-    android:versionCode="1"
-    android:versionName="1.0">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="net.cozic.joplin"
+    android:versionCode="2"
+    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.READ_PHONE_STATE" tools:node="remove"/>
 
     <uses-sdk
         android:minSdkVersion="16"

ReactNativeClient/android/app/src/main/java/com/awesomeproject/MainActivity.java

@@ -1,4 +1,4 @@
-package com.awesomeproject;
+package net.cozic.joplin;
 
 import com.facebook.react.ReactActivity;
 
@@ -10,6 +10,6 @@ public class MainActivity extends ReactActivity {
 	 */
 	@Override
 	protected String getMainComponentName() {
-		return "AwesomeProject";
+		return "Joplin";
 	}
 }

ReactNativeClient/android/app/src/main/java/com/awesomeproject/MainApplication.java

@@ -1,4 +1,4 @@
-package com.awesomeproject;
+package net.cozic.joplin;
 
 import android.app.Application;
 

ReactNativeClient/android/app/src/main/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">AwesomeProject</string>
+    <string name="app_name">Joplin</string>
 </resources>

ReactNativeClient/android/settings.gradle

@@ -1,4 +1,4 @@
-rootProject.name = 'AwesomeProject'
+rootProject.name = 'Joplin'
 include ':react-native-fs'
 project(':react-native-fs').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fs/android')
 

ReactNativeClient/app.json

@@ -1,10 +1,10 @@
 {
-  "name": "AwesomeProject",
-  "displayName": "AwesomeProject",
+  "name": "Joplin",
+  "displayName": "Joplin",
   "expo": {
-    "name": "AwesomeProject",
-    "description": "No description",
-    "slug": "AwesomeProject",
+    "name": "Joplin",
+    "description": "Joplin for Android",
+    "slug": "Joplin",
     "privacy": "public",
     "sdkVersion": "18.0.0",
     "version": "1.0.0",

ReactNativeClient/index.ios.js

@@ -12,7 +12,7 @@ import {
   View
 } from 'react-native';
 
-export default class AwesomeProject extends Component {
+export default class Joplin extends Component {
   render() {
     return (
       <View style={styles.container}>
@@ -50,4 +50,4 @@ const styles = StyleSheet.create({
   },
 });
 
-AppRegistry.registerComponent('AwesomeProject', () => AwesomeProject);
+AppRegistry.registerComponent('Joplin', () => Joplin);

ReactNativeClient/lib/components/screen-header.js

@@ -94,9 +94,7 @@ ScreenHeaderComponent.defaultProps = {
 };
 
 const ScreenHeader = connect(
-	(state) => {
-		return { user: state.user };
-	}
+	//(state) => {}
 )(ScreenHeaderComponent)
 
 export { ScreenHeader };

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

@@ -48,9 +48,7 @@ class SideMenuContentComponent extends Component {
 	}
 
 	folder_press(folder) {
-		this.props.dispatch({
-			type: 'SIDE_MENU_CLOSE',
-		});
+		this.props.dispatch({ type: 'SIDE_MENU_CLOSE' });
 
 		NotesScreenUtils.openNoteList(folder.id);
 	}
@@ -64,6 +62,7 @@ class SideMenuContentComponent extends Component {
 					line.push(_('Remote items to delete: %d/%d.', report.deleteRemote, report.remotesToDelete));
 					line.push(_('Items to download: %d/%d.', report.createLocal + report.updateLocal, report.localsToUdpate));
 					line.push(_('Local items to delete: %d/%d.', report.deleteLocal, report.localsToDelete));
+					line.push(_('Sync state: %s.', report.state));
 					this.setState({	syncReportText: line.join("\n") });
 				},
 			};
@@ -75,6 +74,8 @@ class SideMenuContentComponent extends Component {
 				Log.error(error);
 			}
 		} else {
+			this.props.dispatch({ type: 'SIDE_MENU_CLOSE' });
+
 			this.props.dispatch({
 				type: 'Navigation/NAVIGATE',
 				routeName: 'OneDriveLogin',

ReactNativeClient/lib/models/setting.js

@@ -144,7 +144,6 @@ class Setting extends BaseModel {
 }
 
 Setting.defaults_ = {
-	'clientId': { value: '', type: 'string', public: false },
 	'activeFolderId': { value: '', type: 'string', public: false },
 	'sync.onedrive.auth': { value: '', type: 'string', public: false },
 	'sync.local.path': { value: '', type: 'string', public: true },	
@@ -155,12 +154,12 @@ Setting.defaults_ = {
 // Contains constants that are set by the application and
 // cannot be modified by the user:
 Setting.constants_ = {
+	'env': 'SET_ME',
 	'appName': 'joplin',
 	'appId': 'SET_ME', // Each app should set this identifier
 	'appType': 'SET_ME', // 'cli' or 'mobile'
 	'resourceDir': '',
 	'profileDir': '',
-	'tempDir': '',
 }
 
 export { Setting };

ReactNativeClient/lib/onedrive-api.js

@@ -160,7 +160,7 @@ class OneDriveApi {
 				let errorResponse = await response.json();
 				let error = this.oneDriveErrorResponseToError(errorResponse);
 
-				if (error.code == 'InvalidAuthenticationToken') {
+				if (error.code == 'InvalidAuthenticationToken' || error.code == 'unauthenticated') {
 					await this.refreshAccessToken();
 					continue;
 				} else if (error && ((error.error && error.error.code == 'generalException') || (error.code == 'generalException'))) {