diff --git a/DroidFish/src/org/petero/droidfish/DroidFish.java b/DroidFish/src/org/petero/droidfish/DroidFish.java index acd9ef0..0ef73b1 100644 --- a/DroidFish/src/org/petero/droidfish/DroidFish.java +++ b/DroidFish/src/org/petero/droidfish/DroidFish.java @@ -825,6 +825,12 @@ public class DroidFish extends Activity implements GUIInterface { return true; } }); + thinking.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + openOptionsMenu(); + } + }); custom1Button = (ImageButton)findViewById(R.id.custom1Button); custom1ButtonActions.setImageButton(custom1Button, this); diff --git a/DroidFish/src/org/petero/droidfish/engine/ExternalEngine.java b/DroidFish/src/org/petero/droidfish/engine/ExternalEngine.java index a1e693a..2235abd 100644 --- a/DroidFish/src/org/petero/droidfish/engine/ExternalEngine.java +++ b/DroidFish/src/org/petero/droidfish/engine/ExternalEngine.java @@ -36,8 +36,6 @@ public class ExternalEngine extends UCIEngineBase { protected final Context context; private File engineFileName; - protected static final String intSfPath = "/data/data/org.petero.droidfish/internal_sf"; - private static final String exePath = "/data/data/org.petero.droidfish/engine.exe"; private final Report report; private Process engineProc; private Thread startupThread; @@ -62,10 +60,15 @@ public class ExternalEngine extends UCIEngineBase { isRunning = false; } + protected String internalSFPath() { + return context.getFilesDir().getAbsolutePath() + "/internal_sf"; + } + /** @inheritDoc */ @Override protected void startProcess() { try { + String exePath = context.getFilesDir().getAbsolutePath() + "/engine.exe"; copyFile(engineFileName, new File(exePath)); chmod(exePath); ProcessBuilder pb = new ProcessBuilder(exePath); @@ -256,7 +259,7 @@ public class ExternalEngine extends UCIEngineBase { } protected void copyFile(File from, File to) throws IOException { - new File(intSfPath).delete(); + new File(internalSFPath()).delete(); if (to.exists() && (from.length() == to.length()) && (from.lastModified() == to.lastModified())) return; if (to.exists()) diff --git a/DroidFish/src/org/petero/droidfish/engine/InternalStockFish.java b/DroidFish/src/org/petero/droidfish/engine/InternalStockFish.java index c3a381e..59b5c3f 100644 --- a/DroidFish/src/org/petero/droidfish/engine/InternalStockFish.java +++ b/DroidFish/src/org/petero/droidfish/engine/InternalStockFish.java @@ -105,7 +105,7 @@ public class InternalStockFish extends ExternalEngine { // The checksum test is to avoid writing to /data unless necessary, // on the assumption that it will reduce memory wear. - long oldCSum = readCheckSum(new File(intSfPath)); + long oldCSum = readCheckSum(new File(internalSFPath())); long newCSum = computeAssetsCheckSum(sfExe); if (oldCSum == newCSum) return; @@ -132,6 +132,6 @@ public class InternalStockFish extends ExternalEngine { if (os != null) try { os.close(); } catch (IOException ex) {} } - writeCheckSum(new File(intSfPath), newCSum); + writeCheckSum(new File(internalSFPath()), newCSum); } }