From 846edc61d3bd138ae86eba1a8a529a3220928e91 Mon Sep 17 00:00:00 2001 From: TwistedUmbrella Date: Wed, 1 Oct 2014 10:08:16 -0400 Subject: [PATCH] Update Moga lib, Refresh home between windows --- shell/android/libs/com.bda.controller.jar | Bin 30211 -> 30211 bytes .../src/com/reicast/emulator/FileBrowser.java | 2 +- .../com/reicast/emulator/MainActivity.java | 29 ++++++++++-------- .../emulator/config/InputFragment.java | 2 +- .../emulator/config/OptionsFragment.java | 2 ++ 5 files changed, 21 insertions(+), 14 deletions(-) diff --git a/shell/android/libs/com.bda.controller.jar b/shell/android/libs/com.bda.controller.jar index 7a708c0929b2cda21cb269e2ccae15b14eb7acba..f71dbece3486a143c4fe6feba4152a71587ebba6 100644 GIT binary patch delta 474 zcmW-b%}WAd5XN1#SieZck}W!P**bVJ3rn(tR3Jer6>8a+S?1Teeg#4|A(J48w}W~K zgraM_r?5l&S4apQgdjo)sY7@lo|$=OrqpFhT}I)a+ zOqojZ1qD+kH9Jp)KA^hq`=jXQr>NNaX0i95Blu_S<`2G2LT)jk2=Dy|mME!lX=1>E>jJI2$> zMifVTVG%2Jjwj~@J*^(N@QZfr5HGkAi@>wQ9`HTk0XmXfz-kinx8xDfmx=-(QX$}w zume06!oX)?8#t5p0xRhNu#@%!9byD{En@dq3<3k0ec)pTHxFlVGMB|lD~pxs99AxJ byTFg!3UEG;-A3LA{L14ke*v%D6*m6>nyRh8 delta 474 zcmW-b%}WAd5XN1#SY0I*ODsBc**bVJ3rn(tR3Jer6>8a+S*EV*`V|P>gh+xQ-VW*| z5Q?txp2808Um+oM5P}FHqz=&`n(6YJd1mIBnR1sYcNxyVtWuj5EXyjmOU}!1_vubMizKMya>I!GM&NC^dA1T?0ua4XcJw(#O#9GT^{qGR;CDy(mwftXg_v zenr`|{YzrWnCY$M6Ww*|sSd&zZ@|@);~fx#6F0cAX}ju!;GdLmPhpht{8 zI|=9XbZSnGKG|WXN%s#6Y0YUTNw$T^KcF)^Es@va#)$pW91^h a3;f8h0Ot$XZ4?5)uL9l*7V*kmaq|!BPLQtv diff --git a/shell/android/src/com/reicast/emulator/FileBrowser.java b/shell/android/src/com/reicast/emulator/FileBrowser.java index cb5095ecb..d77d4c418 100644 --- a/shell/android/src/com/reicast/emulator/FileBrowser.java +++ b/shell/android/src/com/reicast/emulator/FileBrowser.java @@ -149,7 +149,7 @@ public class FileBrowser extends Fragment { * findViewById(R.id.about).setOnTouchListener(viblist); */ - File home = new File(home_directory); + File home = new File(mPrefs.getString(Config.pref_home, home_directory)); if (!home.exists() || !home.isDirectory()) { Toast.makeText(getActivity(), R.string.config_home, Toast.LENGTH_LONG).show(); diff --git a/shell/android/src/com/reicast/emulator/MainActivity.java b/shell/android/src/com/reicast/emulator/MainActivity.java index 68d9b7964..3b64076ee 100644 --- a/shell/android/src/com/reicast/emulator/MainActivity.java +++ b/shell/android/src/com/reicast/emulator/MainActivity.java @@ -6,6 +6,7 @@ import java.util.List; import android.annotation.SuppressLint; import android.app.AlertDialog; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; @@ -376,15 +377,19 @@ public class MainActivity extends SlidingFragmentActivity implements builder.show(); } - public static boolean isBiosExisting() { - File bios = new File(home_directory, "data/dc_boot.bin"); - return bios.exists(); - } + public static boolean isBiosExisting(Context context) { + SharedPreferences mPrefs = PreferenceManager.getDefaultSharedPreferences(context); + home_directory = mPrefs.getString("home_directory", home_directory); + File bios = new File(home_directory, "data/dc_boot.bin"); + return bios.exists(); + } - public static boolean isFlashExisting() { - File flash = new File(home_directory, "data/dc_flash.bin"); - return flash.exists(); - } + public static boolean isFlashExisting(Context context) { + SharedPreferences mPrefs = PreferenceManager.getDefaultSharedPreferences(context); + home_directory = mPrefs.getString("home_directory", home_directory); + File flash = new File(home_directory, "data/dc_flash.bin"); + return flash.exists(); + } public void onGameSelected(Uri uri) { if (Config.readOutput("uname -a").equals(getString(R.string.error_kernel))) { @@ -392,9 +397,9 @@ public class MainActivity extends SlidingFragmentActivity implements Toast.LENGTH_SHORT).show(); } String msg = null; - if (!isBiosExisting()) + if (!isBiosExisting(MainActivity.this)) msg = getString(R.string.missing_bios, home_directory); - else if (!isFlashExisting()) + else if (!isFlashExisting(MainActivity.this)) msg = getString(R.string.missing_flash, home_directory); if (msg != null) { @@ -402,9 +407,9 @@ public class MainActivity extends SlidingFragmentActivity implements this); // set title - if (!isBiosExisting()) + if (!isBiosExisting(MainActivity.this)) alertDialogBuilder.setTitle(R.string.missing_bios_title); - else if (!isFlashExisting()) + else if (!isFlashExisting(MainActivity.this)) alertDialogBuilder.setTitle(R.string.missing_flash_title); // set dialog message diff --git a/shell/android/src/com/reicast/emulator/config/InputFragment.java b/shell/android/src/com/reicast/emulator/config/InputFragment.java index f2340963f..b133a63c2 100644 --- a/shell/android/src/com/reicast/emulator/config/InputFragment.java +++ b/shell/android/src/com/reicast/emulator/config/InputFragment.java @@ -102,7 +102,7 @@ public class InputFragment extends Fragment { } }); - if (!MainActivity.isBiosExisting() || !MainActivity.isFlashExisting()) + if (!MainActivity.isBiosExisting(parentActivity) || !MainActivity.isFlashExisting(parentActivity)) buttonLaunchEditor.setEnabled(false); final TextView duration = (TextView) getView().findViewById(R.id.vibDuration_current); diff --git a/shell/android/src/com/reicast/emulator/config/OptionsFragment.java b/shell/android/src/com/reicast/emulator/config/OptionsFragment.java index 8c3985152..fe88e74e3 100644 --- a/shell/android/src/com/reicast/emulator/config/OptionsFragment.java +++ b/shell/android/src/com/reicast/emulator/config/OptionsFragment.java @@ -33,6 +33,7 @@ import android.widget.TextView; import com.reicast.emulator.R; import com.reicast.emulator.emu.GL2JNIView; +import com.reicast.emulator.emu.JNIdc; import de.ankri.views.Switch; @@ -119,6 +120,7 @@ public class OptionsFragment extends Fragment { } mPrefs.edit().putString("home_directory", home_directory) .commit(); + JNIdc.config(home_directory); } }