android: save tool running state before onStop and restore onStart

This prevents the app from acquiring data in the background Signed-off-by: Adrian Suciu <[email protected]>
csarip · Apr 5, 2022 · 67cd6f0 · 67cd6f0
1 parent 64b5e20
commit 67cd6f0
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 2 deletions.
diff --git a/android/src/org/adi/scopy/ScopyActivity.java b/android/src/org/adi/scopy/ScopyActivity.java
@@ -34,6 +34,8 @@
 public class ScopyActivity extends QtActivity
 {
 	public static native void saveSessionJavaHelper();
+	public static native void saveAndStopRunningToolsJNI();
+	public static native void restoreRunningToolsJNI();
 	boolean initialized;
 
 	@Override
@@ -50,13 +52,19 @@ protected void onStart()
 	{
 		System.out.println("-- ScopyActivity: onStart");
 		super.onStart();
+		if(initialized) {
+			restoreRunningToolsJNI();
+		}
 	}
 
 	@Override
 	protected void onStop()
 	{
 		System.out.println("-- ScopyActivity: onStop");
 		super.onStop();
+		if(initialized) {
+			saveAndStopRunningToolsJNI();
+		}
 	}
 
 	protected void onPause(){

diff --git a/src/tool_launcher.cpp b/src/tool_launcher.cpp
@@ -1460,6 +1460,29 @@ bool ToolLauncher::loadDecoders(QString path)
 	return true;
 }
 
+void adiscope::ToolLauncher::saveRunningTools() {
+	for(auto &tool : toolList) {
+		if(tool->isRunning()) {
+			running_tools.push_back(tool);
+		}
+	}
+}
+
+void adiscope::ToolLauncher::stopRunningTools() {
+	for(auto &tool : running_tools) {
+		tool->stop();
+	}
+}
+
+void adiscope::ToolLauncher::restoreRunningTools() {
+	while(!running_tools.empty())
+	{
+		Tool* tool = running_tools.back();
+		running_tools.pop_back();
+		tool->run();
+	}
+}
+
 
 void adiscope::ToolLauncher::saveRunningToolsBeforeCalibration()
 {
@@ -2063,7 +2086,7 @@ bool ToolLauncher::eventFilter(QObject *watched, QEvent *event)
 #ifdef __ANDROID__
 
 void ToolLauncher::saveSessionJavaHelper(JNIEnv *env, jobject /*thiz*/) {
-	qDebug()<<"-- Saving session";
+	qDebug()<<"-- Saving session JNI";
 	ToolLauncher* tl = getToolLauncherInstance();
 	if(tl)
 	{
@@ -2072,9 +2095,32 @@ void ToolLauncher::saveSessionJavaHelper(JNIEnv *env, jobject /*thiz*/) {
 	}
 }
 
+
+void ToolLauncher::saveAndStopRunningToolsJNI(JNIEnv *env, jobject /*thiz*/) {
+	qDebug()<<"-- Saving and stopping tools JNI";
+	ToolLauncher* tl = getToolLauncherInstance();
+	if(tl)
+	{
+		getToolLauncherInstance()->saveRunningTools();
+		getToolLauncherInstance()->stopRunningTools();
+	}
+}
+
+void ToolLauncher::restoreRunningToolsJNI(JNIEnv *env, jobject /*thiz*/) {
+	qDebug()<<"-- Saving and stopping tools JNI";
+	ToolLauncher* tl = getToolLauncherInstance();
+	if(tl)
+	{
+		getToolLauncherInstance()->restoreRunningTools();
+	}
+}
+
+
 void ToolLauncher::registerNativeMethods()
 {
-	JNINativeMethod methods[] = {{"saveSessionJavaHelper", "()V", reinterpret_cast<void*>(saveSessionJavaHelper) }};
+	JNINativeMethod methods[] = {{"saveSessionJavaHelper", "()V", reinterpret_cast<void*>(saveSessionJavaHelper) },
+				     {"saveAndStopRunningToolsJNI", "()V", reinterpret_cast<void*>(saveAndStopRunningToolsJNI) },
+				     {"restoreRunningToolsJNI", "()V", reinterpret_cast<void*>(restoreRunningToolsJNI) }};
 
 	QAndroidJniObject activity = QtAndroid::androidActivity();
 	QAndroidJniEnvironment env;

diff --git a/src/tool_launcher.hpp b/src/tool_launcher.hpp
@@ -173,6 +173,7 @@ private Q_SLOTS:
 	void calibrationSuccessCallback();
 	void calibrationThreadWatcherFinished();
 private:
+	QList<Tool*> running_tools;
 	QList<Tool*> calibration_saved_tools;
 	void loadToolTips(bool connected);
 	QVector<QString> searchDevices();
@@ -206,6 +207,8 @@ private Q_SLOTS:
 #ifdef __ANDROID__
 	void registerNativeMethods();
 	static void saveSessionJavaHelper(JNIEnv *env, jobject /*thiz*/);
+	static void saveAndStopRunningToolsJNI(JNIEnv *env, jobject /*thiz*/);
+	static void restoreRunningToolsJNI(JNIEnv *env, jobject /*thiz*/);
 #endif
 
 private:
@@ -293,6 +296,10 @@ private Q_SLOTS:
 	void saveRunningToolsBeforeCalibration();
 	void stopToolsBeforeCalibration();
 
+	void saveRunningTools();
+	void restoreRunningTools();
+	void stopRunningTools();
+
 	QNetworkAccessManager* networkAccessManager;
 	PhoneHome* m_phoneHome;