resolve android thread issues by reorganizing app termination

livecodeian · livecodeian · commit 96e4c1862cb3 · 2013-05-01T14:51:49.000+01:00
diff --git a/engine/src/cmds.cpp b/engine/src/cmds.cpp
@@ -1179,9 +1179,9 @@ Exec_stat MCQuit::exec(MCExecPoint &ep)
 	default:
 		return ES_NORMAL;
 	}
-#ifndef TARGET_SUBPLATFORM_ANDROID
+	// IM-2013-05-01: [[ BZ 10586 ]] remove #ifdefs so this message is sent
+	// here on Android in the same place as (almost) everything else
 	MCdefaultstackptr->getcard()->message(MCM_shut_down);
-#endif
 #endif
 	if (retcode != NULL && retcode->eval(ep) == ES_NORMAL
 	        && ep.ton() == ES_NORMAL)
diff --git a/engine/src/mblandroiddc.cpp b/engine/src/mblandroiddc.cpp
@@ -960,6 +960,10 @@ static void *mobile_main(void *arg)
 	{
 		MCLog("X_init failed", 0);
 
+		// IM-2013-05-01: [[ BZ 10586 ]] signal java ui thread to exit
+		// finish LiveCodeActivity
+		MCAndroidEngineRemoteCall("finishActivity", "v", nil);
+		
 		// Yield for now as we don't detect error states correctly.
 		co_yield_to_android();
 
@@ -1001,16 +1005,17 @@ static void *mobile_main(void *arg)
 	}
 
 	MCLog("Shutting down project", 0);
-	MCexitall = False;
-	MCdefaultstackptr->getcard()->message(MCM_shut_down);
-	MCQuit();
-
-	while(s_engine_running)
-		X_main_loop_iteration();
-
+	
 	MCLog("Calling X_close", 0);
 	X_close();
 
+	// IM-2013-05-01: [[ BZ 10586 ]] signal java ui thread
+	// and wait for it to exit
+	MCAndroidEngineRemoteCall("finishActivity", "v", nil);
+	
+	while (s_engine_running)
+		co_yield_to_android();
+	
 	// Free argument.
 	MCCStringFree(t_args[0]);
 
@@ -1555,11 +1560,10 @@ JNIEXPORT void JNICALL Java_com_runrev_android_Engine_doDestroy(JNIEnv *env, job
 
 	s_engine_running = false;
 
-	// Set the global exit vars appropriately and yield to the engine thread
-	// which should heed them and exit.
+	// IM-2013-05-01: [[ BZ 10586 ]] we should now only be called when the
+	// engine thread is about to exit, so set s_engine_running to false & yield
+	// so it can finish terminating
 	MCLog("Yielding to engine thread to perform finalization phase", 0);
-	MCquit = True;
-	MCexitall = True;
 	co_yield_to_engine();
 
 	// Finalize bitmap mutex
diff --git a/engine/src/mblandroidmisc.cpp b/engine/src/mblandroidmisc.cpp
@@ -52,15 +52,17 @@ extern int32_t g_android_keyboard_type;
 
 void MCQuit(void)
 {
+	// IM-2013-05-01: [[ BZ 10586 ]] send shutdown message when closing due
+	// to unhandled backKey message
+	if (MCdefaultstackptr != nil)
+		MCdefaultstackptr->getcard()->message(MCM_shut_down);
 	MCquit = True;
 	MCexitall = True;
 	MCtracestackptr = NULL;
 	MCtraceabort = True;
 	MCtracereturn = True;
-
-	// finish LiveCodeActivity
-	MCLog("finishActivity() called", nil);
-	MCAndroidEngineRemoteCall("finishActivity", "v", nil);
+	// IM-2013-05-01: [[ BZ 10586 ]] No longer call finishActivity from here,
+	// instead wait for main loop to terminate in mobile_main()
 }
 
 class MCMessageEvent : public MCCustomEvent
