android/sdlsurfaceview: try to add a support of ondestroy event, to give some time to user for closing its application. But it's not working when Android is reclaiming the app :[

Author: tito

recipes/android/src/android.pyx

@@ -218,3 +218,12 @@ def action_send(mimetype, filename=None, subject=None, text=None,
         j_chooser_title = <bytes>chooser_title
     android_action_send(j_mimetype, j_filename, j_subject, j_text,
             j_chooser_title)
+
+cdef extern int android_checkstop()
+cdef extern void android_ackstop()
+
+def check_stop():
+    return android_checkstop()
+
+def ack_stop():
+    android_ackstop()

recipes/android/src/android_jni.c

@@ -218,6 +218,40 @@ void android_activate_input(void) {
     (*env)->CallStaticVoidMethod(env, cls, mid);
 }
 
+int android_checkstop(void) {
+    static JNIEnv *env = NULL;
+    static jclass *cls = NULL;
+    static jmethodID mid = NULL;
+
+    if (env == NULL) {
+        env = SDL_ANDROID_GetJNIEnv();
+        aassert(env);
+        cls = (*env)->FindClass(env, "org/renpy/android/SDLSurfaceView");
+        aassert(cls);
+        mid = (*env)->GetStaticMethodID(env, cls, "checkStop", "()I");
+        aassert(mid);
+    }
+
+    return (*env)->CallStaticIntMethod(env, cls, mid);
+}
+
+void android_ackstop(void) {
+    static JNIEnv *env = NULL;
+    static jclass *cls = NULL;
+    static jmethodID mid = NULL;
+
+    if (env == NULL) {
+        env = SDL_ANDROID_GetJNIEnv();
+        aassert(env);
+        cls = (*env)->FindClass(env, "org/renpy/android/SDLSurfaceView");
+        aassert(cls);
+        mid = (*env)->GetStaticMethodID(env, cls, "ackStop", "()I");
+        aassert(mid);
+    }
+
+    (*env)->CallStaticIntMethod(env, cls, mid);
+}
+
 void android_action_send(char *mimeType, char *filename, char *subject, char *text, char *chooser_title) {
     static JNIEnv *env = NULL;
     static jclass *cls = NULL;

src/src/org/renpy/android/PythonActivity.java

@@ -278,8 +278,7 @@ public boolean isPaused() {
 
     @Override
     public boolean onKeyDown(int keyCode, final KeyEvent event) {
-        Log.i("python", "key2 " + mView + " " + mView.mStarted);
-
+        //Log.i("python", "key2 " + mView + " " + mView.mStarted);
         if (mView != null && mView.mStarted && SDLSurfaceView.nativeKey(keyCode, 1, event.getUnicodeChar())) {
             return true;
         } else {
@@ -289,7 +288,7 @@ public boolean onKeyDown(int keyCode, final KeyEvent event) {
 
     @Override
     public boolean onKeyUp(int keyCode, final KeyEvent event) {
-        Log.i("python", "key up " + mView + " " + mView.mStarted);
+        //Log.i("python", "key up " + mView + " " + mView.mStarted);
         if (mView != null && mView.mStarted && SDLSurfaceView.nativeKey(keyCode, 0, event.getUnicodeChar())) {
             return true;
         } else {
@@ -308,9 +307,12 @@ public boolean dispatchTouchEvent(final MotionEvent ev) {
         }
     }
 
-    // Ensure we only have one task.
-    public void onDestroy() {
+	protected void onDestroy() {
+		if (mView != null) {
+			mView.onDestroy();
+		}
+		//Log.i(TAG, "on destroy (exit1)");
         System.exit(0);
-    }
-
+	}
 }
+

src/src/org/renpy/android/SDLSurfaceView.java

@@ -298,21 +298,23 @@ private void printConfig(EGL10 egl, EGLDisplay display,
     private EGLConfig mEglConfig = null;
 
     // The user program is not participating in the pause protocol.
-    public final int PAUSE_NOT_PARTICIPATING = 0;
+    static int PAUSE_NOT_PARTICIPATING = 0;
 
     // A pause has not been requested by the OS.
-    public final int PAUSE_NONE = 1;
+    static int PAUSE_NONE = 1;
 
     // A pause has been requested by Android, but the user program has
     // not bothered responding yet.
-    public final int PAUSE_REQUEST = 2;
+    static int PAUSE_REQUEST = 2;
 
     // The user program is waiting in waitForResume.
-    public final int PAUSE_WAIT_FOR_RESUME = 3;
+    static int PAUSE_WAIT_FOR_RESUME = 3;
 
-    // This stores the state of the pause system.
-    private int mPause = PAUSE_NOT_PARTICIPATING;
+	static int PAUSE_STOP_REQUEST = 4;
+	static int PAUSE_STOP_ACK = 5;
 
+    // This stores the state of the pause system.
+    static int mPause = PAUSE_NOT_PARTICIPATING;
 
     private PowerManager.WakeLock wakeLock;
 
@@ -330,9 +332,14 @@ private void printConfig(EGL10 egl, EGLDisplay display,
     // The resource manager we use.
     ResourceManager mResourceManager;
 
+	// Our own view
+	static SDLSurfaceView instance = null;
+
     public SDLSurfaceView(Activity act, String argument) {
         super(act);
 
+		SDLSurfaceView.instance = this;
+
         mActivity = act;
         mResourceManager = new ResourceManager(act);
 
@@ -435,18 +442,62 @@ public void onResume() {
         wakeLock.acquire();
     }
 
+	public void onDestroy() {
+		Log.w(TAG, "onDestroy() called");
+		synchronized (this) {
+			this.notifyAll();
+
+			if ( mPause == PAUSE_STOP_ACK ) {
+				Log.d(TAG, "onDestroy() app already leaved.");
+				return;
+			}
+
+			// application didn't leave, give 10s before closing.
+			// hopefully, this could be enough for launching the on_stop() trigger within the app.
+			mPause = PAUSE_STOP_REQUEST;
+			int i = 50;
+
+			Log.d(TAG, "onDestroy() stop requested, wait for an event from the app");
+			for (; i >= 0 && mPause == PAUSE_STOP_REQUEST; i--) {
+				try {
+					this.wait(200);
+				} catch (InterruptedException e) {
+					break;
+				}
+			}
+			Log.d(TAG, "onDestroy() stop finished waiting.");
+		}
+	}
+
+	static int checkStop() {
+        if (mPause == PAUSE_STOP_REQUEST)
+			return 1;
+		return 0;
+	}
+
+	static void ackStop() {
+		Log.d(TAG, "ackStop() notify");
+		synchronized (instance) {
+			mPause = PAUSE_STOP_ACK;
+			instance.notifyAll();
+		}
+	}
+
+
     /**
      * This method is part of the SurfaceHolder.Callback interface, and is
      * not normally called or subclassed by clients of GLSurfaceView.
      */
     public void surfaceCreated(SurfaceHolder holder) {
+		Log.i(TAG, "surfaceCreated() is not handled :|");
     }
 
     /**
      * This method is part of the SurfaceHolder.Callback interface, and is
      * not normally called or subclassed by clients of GLSurfaceView.
      */
     public void surfaceDestroyed(SurfaceHolder holder) {
+		Log.i(TAG, "surfaceDestroyed() is not handled :|");
     }
 
     /**
@@ -556,10 +607,12 @@ public void run() {
         nativeSetEnv("PYTHONOPTIMIZE", "2");
         nativeSetEnv("PYTHONHOME", mFilesDirectory);
         nativeSetEnv("PYTHONPATH", mArgument + ":" + mFilesDirectory + "/lib");
-        //nativeSetMouseUsed();
 		nativeSetMultitouchUsed();
         nativeInit();
 
+		mPause = PAUSE_STOP_ACK;
+
+		//Log.i(TAG, "End of native init, stop everything (exit0)");
         System.exit(0);
     }