Merge pull request #61 from nickpisacane/minor-fixes

Fix start() if running, and start() and kill() when keepAlive is true.

Author: fchasen

index.js

@@ -54,20 +54,19 @@ class StaticServer {
 
 		this.started = false;
 		this._origin = undefined;
+		this._handleAppStateChangeFn = this._handleAppStateChange.bind(this);
 	}
 
 	start() {
 		if( this.running ){
-			return new Promise((resolve, reject) => {
-				resolve(this.origin);
-			});
+			return Promise.resolve(this.origin);
 		}
 
 		this.started = true;
 		this.running = true;
 
 		if (!this.keepAlive && (Platform.OS === 'android')) {
-			AppState.addEventListener('change', this._handleAppStateChange.bind(this));
+			AppState.addEventListener('change', this._handleAppStateChangeFn);
 		}
 
 		return FPStaticServer.start(this.port, this.root, this.localOnly, this.keepAlive)
@@ -87,7 +86,7 @@ class StaticServer {
 		this.stop();
 		this.started = false;
 		this._origin = undefined;
-		AppState.removeEventListener('change', this._handleAppStateChange.bind(this));
+		AppState.removeEventListener('change', this._handleAppStateChangeFn);
 	}
 
 	_handleAppStateChange(appState) {