diff options
| author | JosJuice <josjuice@gmail.com> | 2021-01-17 22:15:13 +0100 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2021-01-27 20:10:05 +0100 |
| commit | 80b56b657598c44e88de781f05c7ef3c687b0597 (patch) | |
| tree | 024f9f478c0510d10c93ca055cca2a0d96fa5c20 /Source/Android/app/src/main/java | |
| parent | 2ada5b422db91115dab9d25b8c4bb7fcbf97c9f3 (diff) | |
Android: Move InstallWAD to a new WiiUtils class
I'm trying to move away from dumping every native method
in NativeLibrary.
Diffstat (limited to 'Source/Android/app/src/main/java')
3 files changed, 8 insertions, 5 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java index 425551ff77..9a779e7f6b 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java @@ -444,8 +444,6 @@ public final class NativeLibrary public static native void ReloadLoggerConfig(); - public static native boolean InstallWAD(String file); - public static native boolean ConvertDiscImage(String inPath, String outPath, int platform, int format, int blockSize, int compression, int compressionLevel, boolean scrub, CompressCallback callback); diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java index 1ded576794..9344a61e48 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java @@ -13,7 +13,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.localbroadcastmanager.content.LocalBroadcastManager; import org.dolphinemu.dolphinemu.BuildConfig; -import org.dolphinemu.dolphinemu.NativeLibrary; import org.dolphinemu.dolphinemu.R; import org.dolphinemu.dolphinemu.features.settings.model.BooleanSetting; import org.dolphinemu.dolphinemu.features.settings.ui.MenuTag; @@ -22,9 +21,9 @@ import org.dolphinemu.dolphinemu.services.GameFileCacheService; import org.dolphinemu.dolphinemu.utils.AfterDirectoryInitializationRunner; import org.dolphinemu.dolphinemu.utils.ContentHandler; import org.dolphinemu.dolphinemu.utils.FileBrowserHelper; +import org.dolphinemu.dolphinemu.utils.WiiUtils; import java.util.Arrays; -import java.util.Set; public final class MainPresenter { @@ -162,7 +161,7 @@ public final class MainPresenter Thread installWADThread = new Thread(() -> { - if (NativeLibrary.InstallWAD(file)) + if (WiiUtils.installWAD(file)) { mainPresenterActivity.runOnUiThread( () -> Toast.makeText(mContext, R.string.wad_install_success, Toast.LENGTH_SHORT) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/WiiUtils.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/WiiUtils.java new file mode 100644 index 0000000000..6fc0b6d9ea --- /dev/null +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/WiiUtils.java @@ -0,0 +1,6 @@ +package org.dolphinemu.dolphinemu.utils; + +public final class WiiUtils +{ + public static native boolean installWAD(String file); +} |
