diff options
Diffstat (limited to 'Source/Android/app/src/main/java')
11 files changed, 38 insertions, 52 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java index f90956dd9a..b11e7cbd8c 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java @@ -479,7 +479,7 @@ public final class EmulationActivity extends AppCompatActivity return super.dispatchKeyEvent(event); } - int action = 0; + int action; switch (event.getAction()) { @@ -501,8 +501,7 @@ public final class EmulationActivity extends AppCompatActivity return false; } InputDevice input = event.getDevice(); - boolean handled = NativeLibrary.onGamePadEvent(input.getDescriptor(), event.getKeyCode(), action); - return handled; + return NativeLibrary.onGamePadEvent(input.getDescriptor(), event.getKeyCode(), action); } @Override diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/MotionAlertDialog.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/MotionAlertDialog.java index cb74a00208..dd16ca8af3 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/MotionAlertDialog.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/MotionAlertDialog.java @@ -25,7 +25,7 @@ public final class MotionAlertDialog extends AlertDialog private final Preference inputPref; private boolean firstEvent = true; - private final ArrayList<Float> m_values = new ArrayList<Float>(); + private final ArrayList<Float> m_values = new ArrayList<>(); /** * Constructor @@ -105,19 +105,13 @@ public final class MotionAlertDialog extends AlertDialog @Override public boolean dispatchKeyEvent(KeyEvent event) { - if (onKeyDown(event.getKeyCode(), event)) - return true; - - return super.dispatchKeyEvent(event); + return onKeyDown(event.getKeyCode(), event) || super.dispatchKeyEvent(event); } @Override public boolean dispatchGenericMotionEvent(MotionEvent event) { - if (onMotionEvent(event)) - return true; - - return super.dispatchGenericMotionEvent(event); + return onMotionEvent(event) || super.dispatchGenericMotionEvent(event); } /** diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java index 58d1ddde30..4fad5256bb 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java @@ -26,15 +26,12 @@ public final class EmulationFragment extends Fragment implements SurfaceHolder.C private SharedPreferences mPreferences; - private SurfaceView mSurfaceView; private Surface mSurface; private InputOverlay mInputOverlay; private Thread mEmulationThread; - private String mPath; - private boolean mEmulationStarted; private boolean mEmulationRunning; @@ -70,15 +67,15 @@ public final class EmulationFragment extends Fragment implements SurfaceHolder.C @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - mPath = getArguments().getString(ARGUMENT_GAME_PATH); - NativeLibrary.SetFilename(mPath); + String path = getArguments().getString(ARGUMENT_GAME_PATH); + NativeLibrary.SetFilename(path); View contents = inflater.inflate(R.layout.fragment_emulation, container, false); - mSurfaceView = (SurfaceView) contents.findViewById(R.id.surface_emulation); + SurfaceView surfaceView = (SurfaceView) contents.findViewById(R.id.surface_emulation); mInputOverlay = (InputOverlay) contents.findViewById(R.id.surface_input_overlay); - mSurfaceView.getHolder().addCallback(this); + surfaceView.getHolder().addCallback(this); // If the input overlay was previously disabled, then don't show it. if (mInputOverlay != null) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/Game.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/Game.java index 33a9f27c54..500e329dd9 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/Game.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/Game.java @@ -2,6 +2,7 @@ package org.dolphinemu.dolphinemu.model; import android.content.ContentValues; import android.database.Cursor; +import android.os.Environment; public final class Game { @@ -26,7 +27,7 @@ public final class Game public static final int COUNTRY_WORLD = 12; public static final int COUNTRY_UNKNOWN = 13; - private static final String PATH_SCREENSHOT_FOLDER = "file:///sdcard/dolphin-emu/ScreenShots/"; + private static final String PATH_SCREENSHOT_FOLDER = Environment.getExternalStorageDirectory().getPath() + "/dolphin-emu/ScreenShots/"; private String mTitle; private String mDescription; diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameDatabase.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameDatabase.java index b9af9ee631..44b1c2b9c6 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameDatabase.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameDatabase.java @@ -251,7 +251,7 @@ public final class GameDatabase extends SQLiteOpenHelper } } - + fileCursor.close(); folderCursor.close(); database.close(); } diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameProvider.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameProvider.java index f60e2ca8e6..61abb0ab00 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameProvider.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameProvider.java @@ -5,6 +5,7 @@ import android.content.ContentValues; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.net.Uri; +import android.support.annotation.NonNull; import org.dolphinemu.dolphinemu.BuildConfig; import org.dolphinemu.dolphinemu.utils.Log; @@ -39,7 +40,7 @@ public final class GameProvider extends ContentProvider } @Override - public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) + public Cursor query(@NonNull Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) { Log.info("[GameProvider] Querying URI: " + uri); @@ -60,7 +61,7 @@ public final class GameProvider extends ContentProvider } @Override - public String getType(Uri uri) + public String getType(@NonNull Uri uri) { Log.verbose("[GameProvider] Getting MIME type for URI: " + uri); String lastSegment = uri.getLastPathSegment(); @@ -85,7 +86,7 @@ public final class GameProvider extends ContentProvider } @Override - public Uri insert(Uri uri, ContentValues values) + public Uri insert(@NonNull Uri uri, ContentValues values) { Log.info("[GameProvider] Inserting row at URI: " + uri); @@ -134,14 +135,14 @@ public final class GameProvider extends ContentProvider } @Override - public int delete(Uri uri, String selection, String[] selectionArgs) + public int delete(@NonNull Uri uri, String selection, String[] selectionArgs) { Log.error("[GameProvider] Delete operations unsupported. URI: " + uri); return 0; } @Override - public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) + public int update(@NonNull Uri uri, ContentValues values, String selection, String[] selectionArgs) { Log.error("[GameProvider] Update operations unsupported. URI: " + uri); return 0; diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java index fc1a75cd0f..2617491890 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java @@ -36,8 +36,8 @@ import java.util.Set; */ public final class InputOverlay extends SurfaceView implements OnTouchListener { - private final Set<InputOverlayDrawableButton> overlayButtons = new HashSet<InputOverlayDrawableButton>(); - private final Set<InputOverlayDrawableJoystick> overlayJoysticks = new HashSet<InputOverlayDrawableJoystick>(); + private final Set<InputOverlayDrawableButton> overlayButtons = new HashSet<>(); + private final Set<InputOverlayDrawableJoystick> overlayJoysticks = new HashSet<>(); /** * Resizes a {@link Bitmap} by a given scale factor @@ -53,11 +53,10 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener // Retrieve screen dimensions. DisplayMetrics dm = context.getResources().getDisplayMetrics(); - Bitmap bitmapResized = Bitmap.createScaledBitmap(bitmap, + return Bitmap.createScaledBitmap(bitmap, (int)(dm.heightPixels * scale), (int)(dm.heightPixels * scale), true); - return bitmapResized; } /** diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/AssetCopyService.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/AssetCopyService.java index dec5f53b68..d8c39459f6 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/AssetCopyService.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/AssetCopyService.java @@ -54,14 +54,14 @@ public final class AssetCopyService extends IntentService SharedPreferences.Editor editor = preferences.edit(); editor.putBoolean("assetsCopied", true); - editor.commit(); + editor.apply(); } private void copyAsset(String asset, String output, Boolean overwrite) { Log.verbose("[AssetCopyService] Copying File " + asset + " to " + output); - InputStream in = null; - OutputStream out = null; + InputStream in; + OutputStream out; try { diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/EGLHelper.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/EGLHelper.java index aab32a6bb9..30b6b9c9cf 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/EGLHelper.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/EGLHelper.java @@ -120,14 +120,12 @@ public final class EGLHelper */ public String[] getEGLInfo() { - String[] info = { + return new String[] { mGL.glGetString(GL10.GL_VENDOR), mGL.glGetString(GL10.GL_VERSION), mGL.glGetString(GL10.GL_RENDERER), mGL.glGetString(GL10.GL_EXTENSIONS), }; - - return info; } /** @@ -243,10 +241,10 @@ public final class EGLHelper return false; } - for (int i = 0; i < mEGLConfigs.length; i++) + for (EGLConfig mEGLConfig : mEGLConfigs) { int[] attribVal = new int[1]; - boolean ret = mEGL.eglGetConfigAttrib(mDisplay, mEGLConfigs[i], EGL10.EGL_RENDERABLE_TYPE, attribVal); + boolean ret = mEGL.eglGetConfigAttrib(mDisplay, mEGLConfig, EGL10.EGL_RENDERABLE_TYPE, attribVal); if (ret) { if ((attribVal[0] & EGL_OPENGL_BIT) != 0) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_GCAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_GCAdapter.java index 37ab4c6b5f..d7731b6040 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_GCAdapter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_GCAdapter.java @@ -32,7 +32,7 @@ public class Java_GCAdapter { HashMap<String, UsbDevice> devices = manager.getDeviceList(); for (Map.Entry<String, UsbDevice> pair : devices.entrySet()) { - UsbDevice dev = (UsbDevice) pair.getValue(); + UsbDevice dev = pair.getValue(); if (dev.getProductId() == 0x0337 && dev.getVendorId() == 0x057e) { if (!manager.hasPermission(dev)) @@ -58,7 +58,7 @@ public class Java_GCAdapter { HashMap<String, UsbDevice> devices = manager.getDeviceList(); for (Map.Entry<String, UsbDevice> pair : devices.entrySet()) { - UsbDevice dev = (UsbDevice) pair.getValue(); + UsbDevice dev = pair.getValue(); if (dev.getProductId() == 0x0337 && dev.getVendorId() == 0x057e) { if (manager.hasPermission(dev)) @@ -77,24 +77,21 @@ public class Java_GCAdapter { } public static int Input() { - int read = usb_con.bulkTransfer(usb_in, controller_payload, controller_payload.length, 16); - return read; + return usb_con.bulkTransfer(usb_in, controller_payload, controller_payload.length, 16); } public static int Output(byte[] rumble) { - int size = usb_con.bulkTransfer(usb_out, rumble, 5, 16); - return size; + return usb_con.bulkTransfer(usb_out, rumble, 5, 16); } public static boolean OpenAdapter() { HashMap<String, UsbDevice> devices = manager.getDeviceList(); - Iterator it = devices.entrySet().iterator(); - while (it.hasNext()) + for (Map.Entry<String, UsbDevice> pair : devices.entrySet()) { - HashMap.Entry pair = (HashMap.Entry)it.next(); - UsbDevice dev = (UsbDevice)pair.getValue(); - if (dev.getProductId() == 0x0337 && dev.getVendorId() == 0x057e) { + UsbDevice dev = pair.getValue(); + if (dev.getProductId() == 0x0337 && dev.getVendorId() == 0x057e) + { if (manager.hasPermission(dev)) { usb_con = manager.openDevice(dev); diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter.java index 049f930cba..3664fd6abf 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter.java @@ -38,7 +38,7 @@ public class Java_WiimoteAdapter HashMap<String, UsbDevice> devices = manager.getDeviceList(); for (Map.Entry<String, UsbDevice> pair : devices.entrySet()) { - UsbDevice dev = (UsbDevice) pair.getValue(); + UsbDevice dev = pair.getValue(); if (dev.getProductId() == NINTENDO_WIIMOTE_PRODUCT_ID && dev.getVendorId() == NINTENDO_VENDOR_ID) { if (!manager.hasPermission(dev)) @@ -59,7 +59,7 @@ public class Java_WiimoteAdapter HashMap<String, UsbDevice> devices = manager.getDeviceList(); for (Map.Entry<String, UsbDevice> pair : devices.entrySet()) { - UsbDevice dev = (UsbDevice) pair.getValue(); + UsbDevice dev = pair.getValue(); if (dev.getProductId() == NINTENDO_WIIMOTE_PRODUCT_ID && dev.getVendorId() == NINTENDO_VENDOR_ID) { if (manager.hasPermission(dev)) @@ -114,7 +114,7 @@ public class Java_WiimoteAdapter HashMap<String, UsbDevice> devices = manager.getDeviceList(); for (Map.Entry<String, UsbDevice> pair : devices.entrySet()) { - UsbDevice dev = (UsbDevice) pair.getValue(); + UsbDevice dev = pair.getValue(); if (dev.getProductId() == NINTENDO_WIIMOTE_PRODUCT_ID && dev.getVendorId() == NINTENDO_VENDOR_ID) { if (manager.hasPermission(dev)) |