Start preparing notify service for it's real aim

Move autologin stuff to it's own component
Use TokensManager singleton like qml app

retroshare-android-notify-service/src/AutologinManager.qml

@@ -0,0 +1,167 @@
+/*
+ * RetroShare Android Autologin Service
+ * Copyright (C) 2017  Gioacchino Mazzurco <gio@eigenlab.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQml 2.2
+import org.retroshare.qml_components.LibresapiLocalClient 1.0
+
+QtObject
+{
+	id: am
+
+	property bool coreReady: false
+
+	property string profileName
+	property string profileSslId
+	property string hardcodedPassword: "hardcoded default password"
+	property int loginAttemptCount: 0
+	property bool attemptingLogin: false
+
+	function delay(msecs, func)
+	{
+		var tmr = Qt.createQmlObject("import QtQml 2.2; Timer {}", am);
+		tmr.interval = msecs;
+		tmr.repeat = false;
+		tmr.triggered.connect(function() { func(); tmr.destroy(msecs) });
+		tmr.start();
+	}
+
+	property Timer runStateTimer: Timer
+	{
+		repeat: true
+		interval: 5000
+		triggeredOnStart: true
+		Component.onCompleted: start()
+		onTriggered:
+			rsApi.request("/control/runstate/", "", am.runStateCallback)
+	}
+
+	function runStateCallback(par)
+	{
+		var jsonReponse = JSON.parse(par.response)
+		var runState = jsonReponse.data.runstate
+		if(typeof(runState) !== 'string')
+		{
+			console.log("runStateCallback(...) Core is hanged")
+			return
+		}
+
+		switch(runState)
+		{
+		case "waiting_init":
+			coreReady = false
+			console.log("Core is starting")
+			break
+		case "fatal_error":
+			coreReady = false
+			console.log("Core hanged")
+			break
+		case "waiting_account_select":
+			coreReady = false
+			if(!attemptingLogin && loginAttemptCount < 5)
+				rsApi.request("/control/locations/", "", requestLocationsListCB)
+			break
+		case "waiting_startup":
+			coreReady = false
+			break
+		case "running_ok":
+		case "running_ok_no_full_control":
+			coreReady = true
+			runStateTimer.interval = 30000
+			break
+		}
+	}
+
+	function requestLocationsListCB(par)
+	{
+		console.log("requestLocationsListCB")
+		var jsonData = JSON.parse(par.response).data
+		if(jsonData.length === 1)
+		{
+			// There is only one location so we can attempt autologin
+			var location = jsonData[0]
+			profileName = location.name
+			profileSslId = location.peer_id
+			if(!attemptingLogin && loginAttemptCount < 5) attemptLogin()
+		}
+		else if (jsonData.length === 0)
+		{
+			console.log("requestLocationsListCB 0")
+			// The user haven't created a location yet
+			// TODO: notify user to create a location
+		}
+		else
+		{
+			console.log("requestLocationsListCB *")
+			// There is more then one location to choose from
+			// TODO: notify user to login manually
+		}
+	}
+
+	function attemptLogin()
+	{
+		console.log("attemptLogin")
+		attemptingLogin = true
+		++loginAttemptCount
+		rsApi.request(
+					"/control/login/", JSON.stringify({ id: profileSslId }),
+					attemptLoginCB)
+	}
+
+	function attemptLoginCB(par)
+	{
+		console.log("attemptLoginCB")
+		var jsonRet = JSON.parse(par.response).returncode
+		if (jsonRet === "ok") attemptPassTimer.start()
+		else console.log("Login hanged!")
+	}
+
+	property Timer attemptPassTimer: Timer
+	{
+		interval: 700
+		repeat: true
+		triggeredOnStart: true
+		onTriggered: rsApi.request("/control/password/", "", attemptPasswordCB)
+
+		function attemptPasswordCB(par)
+		{
+			if(JSON.parse(par.response).data.want_password)
+			{
+				console.log("attemptPasswordCB want_password")
+				rsApi.request(
+							"/control/password/",
+							JSON.stringify({ password: am.hardcodedPassword }),
+							attemptPasswordCBCB)
+			}
+		}
+
+		function attemptPasswordCBCB()
+		{
+			console.log("attemptPasswordCBCB")
+			stop()
+			am.runStateTimer.stop()
+
+			/* Wait 10 seconds so the core has time to process login and update
+			 * runstate */
+			delay(10000, function()
+			{
+				am.attemptingLogin = false
+				am.runStateTimer.start()
+			})
+		}
+	}
+}

retroshare-android-notify-service/src/TokensManager.qml

@@ -0,0 +1 @@
+../../retroshare-qml-app/src/qml/TokensManager.qml

retroshare-android-notify-service/src/notify.qml

@@ -18,134 +18,33 @@
 
 import QtQml 2.2
 import org.retroshare.qml_components.LibresapiLocalClient 1.0
+import "." //Needed for TokensManager singleton
 
 QtObject
 {
-	id: mo
+	id: notifyRoot
 
-	property string profileName
+	property alias coreReady: coreWatcher.coreReady
-	property string profileSslId
-	property string hardcodedPassword: "hardcoded default password"
-	property int loginAttemptCount: 0
-	property bool attemptingLogin: false
 
-	property Timer runStateTimer: Timer
+	property AutologinManager _aM: AutologinManager { id: coreWatcher }
-	{
-		repeat: true
-		interval: 5000
-		triggeredOnStart: true
-		Component.onCompleted: start()
-		onTriggered:
-			rsApi.request("/control/runstate/", "", mo.runStateCallback)
-	}
 
-	function runStateCallback(par)
+	onCoreReadyChanged: if(coreReady) refreshUnread()
-	{
-		var jsonReponse = JSON.parse(par.response)
-		var runState = jsonReponse.data.runstate
-		if(typeof(runState) !== 'string')
-		{
-			console.log("runStateCallback(...) Core is hanged")
-			return
-		}
 
-		switch(runState)
+	function refreshUnreadCallback(par)
 	{
-		case "waiting_init":
+		console.log("notifyRoot.refreshUnreadCB()")
-			console.log("Core is starting")
+		var json = JSON.parse(par.response)
-			break
+		TokensManager.registerToken(json.statetoken, refreshUnread)
-		case "fatal_error":
+		if(json.data.length > 0)
-			console.log("Core hanged")
-			break
-		case "waiting_account_select":
-			if(!attemptingLogin && loginAttemptCount < 5)
-				rsApi.request("/control/locations/", "", requestLocationsListCB)
-			break
-		case "waiting_startup":
-			break
-		case "running_ok":
-		case "running_ok_no_full_control":
-			runStateTimer.interval = 30000
-			break
-		}
-	}
-
-	function requestLocationsListCB(par)
 		{
-		console.log("requestLocationsListCB")
+			console.log("notifyRoot.refreshUnreadCB() got", json.data.length,
-		var jsonData = JSON.parse(par.response).data
+						"unread messages")
-		if(jsonData.length === 1)
+			//TODO: display android notification
+		}
+	}
+	function refreshUnread()
 	{
-			// There is only one location so we can attempt autologin
+		console.log("notifyRoot.refreshUnread()")
-			var location = jsonData[0]
+		rsApi.request("/chat/unread_msgs", "", refreshUnreadCallback)
-			profileName = location.name
-			profileSslId = location.peer_id
-			if(!attemptingLogin && loginAttemptCount < 5) attemptLogin()
-		}
-		else if (jsonData.length === 0)
-		{
-			console.log("requestLocationsListCB 0")
-			// The user haven't created a location yet
-			// TODO: notify user to create a location
-		}
-		else
-		{
-			console.log("requestLocationsListCB *")
-			// There is more then one location to choose from
-			// TODO: notify user to login manually
-		}
-	}
-
-	function attemptLogin()
-	{
-		console.log("attemptLogin")
-		attemptingLogin = true
-		++loginAttemptCount
-		rsApi.request(
-					"/control/login/", JSON.stringify({ id: profileSslId }),
-					attemptLoginCB)
-	}
-
-	function attemptLoginCB(par)
-	{
-		console.log("attemptLoginCB")
-		var jsonRet = JSON.parse(par.response).returncode
-		if (jsonRet === "ok") attemptPassTimer.start()
-		else console.log("Login hanged!")
-	}
-
-	property Timer attemptPassTimer: Timer
-	{
-		interval: 700
-		repeat: true
-		triggeredOnStart: true
-		onTriggered: rsApi.request("/control/password/", "", attemptPasswordCB)
-
-		function attemptPasswordCB(par)
-		{
-			console.log("attemptPasswordCB", mo.attemptPassTimer, "running?", running)
-			if(JSON.parse(par.response).data.want_password)
-			{
-				console.log("attemptPasswordCB want_password")
-				rsApi.request(
-							"/control/password/",
-							JSON.stringify({ password: mo.hardcodedPassword }),
-							attemptPasswordCBCB)
-			}
-		}
-
-		function attemptPasswordCBCB()
-		{
-			console.log("attemptPasswordCBCB")
-			stop()
-
-			/* Wait 10 seconds so the core has time to process login and update
-			 * runstate */
-			var timeStart = new Date().getTime();
-			while (new Date().getTime() - timeStart < 10000) {}
-
-			mo.attemptingLogin = false
-			rsApi.request("/control/runstate/", "", mo.runStateCallback)
-		}
 	}
 }

retroshare-android-notify-service/src/qml.qrc

@@ -1,5 +1,8 @@
 <RCC>
     <qresource prefix="/">
         <file>notify.qml</file>
+        <file>TokensManager.qml</file>
+        <file>AutologinManager.qml</file>
+        <file>qmldir</file>
     </qresource>
 </RCC>

retroshare-android-notify-service/src/qmldir

@@ -0,0 +1 @@
+singleton TokensManager 1.0 TokensManager.qml