AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-07 22:34:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Android: Fix dialogs not blocking calling thread (especially important for crash dialog box)

Browse Source
This commit is contained in:
UnknownShadow200 2021-03-29 22:06:14 +11:00
parent 9a4d5e3bcc
commit 0daa115ed0
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
android/app/src/main/java/com/classicube/MainActivity.java
View File

@ -268,7 +268,9 @@ public class MainActivity extends Activity {
@Override
protected void onStop() {
super.onStop();
pushCmd(CMD_APP_STOP);
pushCmd(CMD_APP_STOP);
// In case game thread is blocked on showing dialog
releaseDialogSem();
}
@Override
@ -281,7 +283,7 @@ public class MainActivity extends Activity {
@Override
protected void onPause() {
// setContentView - API level 1
// can't use null.. TODO is there a better way?
// Can't use null.. TODO is there a better way?
setContentView(new View(this));
super.onPause();
pushCmd(CMD_APP_PAUSE);
@ -405,6 +407,9 @@ public class MainActivity extends Activity {
//08-02 21:03:02.968: E/SurfaceFlinger(1350): Failed to find layer (SurfaceView - com.classicube.ClassiCube/com.classicube.MainActivity#0) in layer parent (no-parent).
MainActivity.this.pushCmd(CMD_WIN_DESTROYED);
// In case game thread is blocked showing a dialog on main thread
releaseDialogSem();
// per the android docs for SurfaceHolder.Callback
// "If you have a rendering thread that directly accesses the surface, you must ensure
// that thread is no longer touching the Surface before returning from this function."
@ -678,6 +683,12 @@ public class MainActivity extends Activity {
public float getDpiY() { return getMetrics().density; }
final Semaphore dialogSem = new Semaphore(0, true);
void releaseDialogSem() {
// Only release when no free permits (otherwise showAlert doesn't block when called)
if (dialogSem.availablePermits() > 0) return;
dialogSem.release();
}
void showAlertAsync(final String title, final String message) {
//final Activity activity = this;
@ -687,10 +698,9 @@ public class MainActivity extends Activity {
AlertDialog.Builder dlg = new AlertDialog.Builder(MainActivity.this);
dlg.setTitle(title);
dlg.setMessage(message);
dlg.setPositiveButton("Close", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialogSem.release();
}
public void onClick(DialogInterface dialog, int id) { releaseDialogSem(); }
});
dlg.setCancelable(false);
dlg.create().show();
@ -701,8 +711,9 @@ public class MainActivity extends Activity {
public void showAlert(final String title, final String message) {
showAlertAsync(title, message);
// wait for dialog to be closed
// TODO: this fails because multiple dialog boxes show
try {
dialogSem.acquire(); // Block game thread
} catch (InterruptedException e) { }
}
public int getWindowState() { return fullscreen ? 1 : 0; }

2
src/Window.c
View File

@ -3773,6 +3773,8 @@ static void ShowDialogCore(const char* title, const char* msg) {
Platform_LogConst(title);
Platform_LogConst(msg);
/* in case surface destroyed message has arrived */
Window_ProcessEvents();
args[0].l = JavaMakeConst(env, title);
args[1].l = JavaMakeConst(env, msg);