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

Avoid NPEs when servicing gestures

Browse Source
This commit is contained in:
Aaron Culliney 2015-04-04 22:36:04 -07:00
parent 985cec7725
commit 10590052f2
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -295,7 +295,7 @@ public class Apple2Activity extends Activity {
break;
}
printSamples(event);
//printSamples(event);
int action = event.getActionMasked();
int pointerIndex = event.getActionIndex();
int pointerCount = event.getPointerCount();
@ -309,7 +309,7 @@ public class Apple2Activity extends Activity {
break;
}
//this.mDetector.onTouchEvent(event);
this.mDetector.onTouchEvent(event);
} while (false);
return super.onTouchEvent(event);
@ -326,6 +326,9 @@ public class Apple2Activity extends Activity {
@Override
public boolean onFling(MotionEvent event1, MotionEvent event2, float velocityX, float velocityY) {
if ((event1 == null) || (event2 == null)) {
return false;
}
if (mSwipeTogglesSpeed) {
float ev1X = event1.getX();
float ev2X = event2.getX();
@ -340,6 +343,9 @@ public class Apple2Activity extends Activity {
@Override
public boolean onSingleTapConfirmed(MotionEvent event) {
if (event == null) {
return false;
}
Log.d(TAG, "onSingleTapConfirmed: " + event.toString());
Apple2MainMenu mainMenu = Apple2Activity.this.mView.getMainMenu();
if (mainMenu.isShowing()) {
@ -357,6 +363,9 @@ public class Apple2Activity extends Activity {
@Override
public boolean onDoubleTap(MotionEvent event) {
if (event == null) {
return false;
}
if (mDoubleTapShowsKeyboard) {
Log.d(TAG, "onDoubleTap: " + event.toString());
if (!Apple2Activity.this.isSoftKeyboardShowing()) {