diff --git a/app/src/main/java/net/kdt/pojavlaunch/Tools.java b/app/src/main/java/net/kdt/pojavlaunch/Tools.java index 62b2e7983..ffdd17a90 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/Tools.java +++ b/app/src/main/java/net/kdt/pojavlaunch/Tools.java @@ -664,7 +664,7 @@ public final class Tools } - public static String read(InputStream is) throws Exception { + public static String read(InputStream is) throws IOException { String out = ""; int len; byte[] buf = new byte[512]; @@ -674,11 +674,11 @@ public final class Tools return out; } - public static String read(String path) throws Exception { + public static String read(String path) throws IOException { return read(new FileInputStream(path)); } - public static void write(String path, byte[] content) throws Exception + public static void write(String path, byte[] content) throws IOException { File outPath = new File(path); outPath.getParentFile().mkdirs(); @@ -689,8 +689,7 @@ public final class Tools fos.close(); } - public static void write(String path, String content) throws Exception - { + public static void write(String path, String content) throws IOException { write(path, content.getBytes()); } diff --git a/app/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlButton.java b/app/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlButton.java index b7ef43908..dbf1ff3bf 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlButton.java +++ b/app/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlButton.java @@ -147,35 +147,35 @@ public class ControlButton extends Button implements OnLongClickListener, OnTouc } return false; - } - - if (mGestureDetector.onTouchEvent(event)) { - mCanTriggerLongClick = true; - onLongClick(this); - } - - switch (event.getActionMasked()) { - case MotionEvent.ACTION_UP: - case MotionEvent.ACTION_DOWN: + } else { + if (mGestureDetector.onTouchEvent(event)) { mCanTriggerLongClick = true; - downX = event.getX(); - downY = event.getY(); - break; - - case MotionEvent.ACTION_MOVE: - mCanTriggerLongClick = false; - moveX += event.getX() - downX; - moveY += event.getY() - downY; + onLongClick(this); + } + + switch (event.getActionMasked()) { + case MotionEvent.ACTION_UP: + case MotionEvent.ACTION_DOWN: + mCanTriggerLongClick = true; + downX = event.getX(); + downY = event.getY(); + break; - if (!mProperties.isDynamicBtn) { - setTranslationX(moveX); - setTranslationY(moveY); - } - - break; + case MotionEvent.ACTION_MOVE: + mCanTriggerLongClick = false; + moveX += event.getX() - downX; + moveY += event.getY() - downY; + + if (!mProperties.isDynamicBtn) { + setTranslationX(moveX); + setTranslationY(moveY); + } + + break; + } + + return false; } - - return false; } public void setModifiable(boolean z) {