Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2025-02-10 10:30:44 +00:00
Code Issues Projects Releases Wiki Activity

Attempt to handle link/load errors gracefully

Browse Source
This commit is contained in:
Aaron Culliney 2015-09-27 13:34:58 -07:00
parent 339d037d4e
commit 0da8282b49
2 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Activity.java
View File

@ -53,8 +53,17 @@ public class Apple2Activity extends Activity {
private float[] mXCoords = new float[MAX_FINGERS];
private float[] mYCoords = new float[MAX_FINGERS];
// non-null if we failed to load/link the native code ... likely we are running on some bizarre 'droid variant
private static Throwable sNativeBarfedThrowable = null;
private static boolean sNativeBarfed = false;
static {
System.loadLibrary("apple2ix");
try {
System.loadLibrary("apple2ix");
} catch (Throwable barf) {
sNativeBarfed = true;
sNativeBarfedThrowable = barf;
}
}
public final static long NATIVE_TOUCH_HANDLED = (1 << 0);
@ -123,6 +132,12 @@ public class Apple2Activity extends Activity {
Log.e(TAG, "onCreate()");
Apple2CrashHandler.getInstance().setCustomExceptionHandler(this);
if (sNativeBarfed) {
Log.e(TAG, "NATIVE BARFED...", sNativeBarfedThrowable);
View view = new View(this);
setContentView(view);
return;
}
// run first-time initializations
if (!Apple2Preferences.FIRST_TIME_CONFIGURED.booleanValue(this)) {
@ -170,6 +185,11 @@ public class Apple2Activity extends Activity {
@Override
protected void onResume() {
super.onResume();
if (sNativeBarfed) {
Apple2CrashHandler.getInstance().abandonAllHope(this, sNativeBarfedThrowable);
return;
}
Log.d(TAG, "onResume()");
mView.onResume();
nativeOnResume(/*isSystemResume:*/true);
@ -178,6 +198,9 @@ public class Apple2Activity extends Activity {
@Override
protected void onPause() {
super.onPause();
if (sNativeBarfed) {
return;
}
boolean wasPausing = mPausing.getAndSet(true);
if (wasPausing) {
@ -203,6 +226,9 @@ public class Apple2Activity extends Activity {
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (sNativeBarfed) {
return true;
}
if ((keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) || (keyCode == KeyEvent.KEYCODE_VOLUME_MUTE) || (keyCode == KeyEvent.KEYCODE_VOLUME_UP)) {
return false;
}
@ -212,6 +238,9 @@ public class Apple2Activity extends Activity {
@Override
public boolean onKeyUp(int keyCode, KeyEvent event) {
if (sNativeBarfed) {
return true;
}
if (keyCode == KeyEvent.KEYCODE_BACK) {
Apple2MenuView apple2MenuView = peekApple2View();
if (apple2MenuView == null) {
@ -231,6 +260,7 @@ public class Apple2Activity extends Activity {
}
}
/*
private String actionToString(int action) {
switch (action) {
case MotionEvent.ACTION_CANCEL:
@ -250,7 +280,6 @@ public class Apple2Activity extends Activity {
}
}
/*
private void printSamples(MotionEvent ev) {
final int historySize = ev.getHistorySize();
final int pointerCount = ev.getPointerCount();
@ -274,6 +303,9 @@ public class Apple2Activity extends Activity {
public boolean onTouchEvent(MotionEvent event) {
do {
if (sNativeBarfed) {
break;
}
if (mMainMenu == null) {
break;
}

6
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2CrashHandler.java
View File

@ -108,6 +108,12 @@ public class Apple2CrashHandler {
});
}
public void abandonAllHope(Apple2Activity activity, Throwable nativeBarfed) {
// write out the early link crash and send this through the main crash processing code
onUncaughtException(Thread.currentThread(), nativeBarfed);
checkForCrashes(activity);
}
public boolean areJavaCrashesPresent(Apple2Activity activity) {
File javaCrash = _javaCrashFile(activity);
return javaCrash.exists();