android without qt initial commit

android/jni/DaemonAndroid.cpp

@@ -0,0 +1,170 @@
+#include "DaemonAndroid.h"
+#include "../../Daemon.h"
+//#include "mainwindow.h"
+
+namespace i2p
+{
+namespace android
+{
+/*	Worker::Worker (DaemonAndroidImpl& daemon):
+		m_Daemon (daemon)
+	{
+	}
+
+	void Worker::startDaemon()
+	{
+		Log.d(TAG"Performing daemon start...");
+		m_Daemon.start();
+		Log.d(TAG"Daemon started.");
+		emit resultReady();
+	}
+	void Worker::restartDaemon()
+	{
+		Log.d(TAG"Performing daemon restart...");
+		m_Daemon.restart();
+		Log.d(TAG"Daemon restarted.");
+		emit resultReady();
+	}
+	void Worker::stopDaemon() {
+		Log.d(TAG"Performing daemon stop...");
+		m_Daemon.stop();
+		Log.d(TAG"Daemon stopped.");
+		emit resultReady();
+	}
+
+    Controller::Controller(DaemonAndroidImpl& daemon):
+		m_Daemon (daemon)
+	{
+		Worker *worker = new Worker (m_Daemon);
+		worker->moveToThread(&workerThread);
+		connect(&workerThread, &QThread::finished, worker, &QObject::deleteLater);
+		connect(this, &Controller::startDaemon, worker, &Worker::startDaemon);
+		connect(this, &Controller::stopDaemon, worker, &Worker::stopDaemon);
+		connect(this, &Controller::restartDaemon, worker, &Worker::restartDaemon);
+		connect(worker, &Worker::resultReady, this, &Controller::handleResults);
+		workerThread.start();
+	}
+	Controller::~Controller()
+	{
+		Log.d(TAG"Closing and waiting for daemon worker thread...");
+		workerThread.quit();
+		workerThread.wait();
+		Log.d(TAG"Waiting for daemon worker thread finished.");
+        if(m_Daemon.isRunning())
+        {
+		    Log.d(TAG"Stopping the daemon...");
+            m_Daemon.stop();
+		    Log.d(TAG"Stopped the daemon.");
+		}
+	}
+*/
+	DaemonAndroidImpl::DaemonAndroidImpl ():
+        /*mutex(nullptr), */
+        m_IsRunning(false),
+        m_RunningChangedCallback(nullptr)
+	{
+	}
+
+	DaemonAndroidImpl::~DaemonAndroidImpl ()
+	{
+		//delete mutex;
+	}
+
+	bool DaemonAndroidImpl::init(int argc, char* argv[])
+	{
+		//mutex=new QMutex(QMutex::Recursive);
+		setRunningCallback(0);
+        m_IsRunning=false;
+		return Daemon.init(argc,argv);
+	}
+
+	void DaemonAndroidImpl::start()
+	{
+		//QMutexLocker locker(mutex);
+		setRunning(true);
+		Daemon.start();
+	}
+
+	void DaemonAndroidImpl::stop()
+	{
+		//QMutexLocker locker(mutex);
+		Daemon.stop();
+		setRunning(false);
+	}
+
+	void DaemonAndroidImpl::restart()
+	{
+		//QMutexLocker locker(mutex);
+		stop();
+		start();
+	}
+
+	void DaemonAndroidImpl::setRunningCallback(runningChangedCallback cb)
+	{
+		m_RunningChangedCallback = cb;
+	}
+
+	bool DaemonAndroidImpl::isRunning()
+	{
+        return m_IsRunning;
+	}
+
+	void DaemonAndroidImpl::setRunning(bool newValue)
+	{
+        bool oldValue = m_IsRunning;
+		if(oldValue!=newValue)
+		{
+            m_IsRunning = newValue;
+		    if(m_RunningChangedCallback)
+				m_RunningChangedCallback();
+		}
+	}
+
+	static DaemonAndroidImpl daemon;
+
+	/**
+	 * returns 1 if daemon init failed
+	 * returns 0 if daemon initialized and started okay
+	 */
+	int start(/*int argc, char* argv[]*/)
+	{
+		int result;
+
+		{
+			//Log.d(TAG"Initialising the daemon...");
+			bool daemonInitSuccess = daemon.init(0,0/*argc, argv*/);
+			if(!daemonInitSuccess)
+			{
+				//QMessageBox::critical(0, "Error", "Daemon init failed");
+				return 1;
+			}
+			//Log.d(TAG"Initialised, creating the main window...");
+			//MainWindow w;
+			//Log.d(TAG"Before main window.show()...");
+			//w.show ();
+
+			{
+				//i2p::qt::Controller daemonQtController(daemon);
+				//Log.d(TAG"Starting the daemon...");
+				//emit daemonQtController.startDaemon();
+				//daemon.start ();
+				//Log.d(TAG"Starting GUI event loop...");
+				//result = app.exec();
+				//daemon.stop ();
+				daemon.start();
+				return 0;
+			}
+		}
+
+		//QMessageBox::information(&w, "Debug", "demon stopped");
+		//Log.d(TAG"Exiting the application");
+		//return result;
+	}
+
+	void stop()
+	{
+		daemon.stop();
+	}
+}
+}
+