use Context.getFilesDir() instead of "/data/data" to fix file access problems on some devices (e.g. Galaxy Tab S);

release version 1.49

Author: gerhard.kalab

AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     android:installLocation="auto"
     package="org.scid.android"
-    android:versionCode="48"
-    android:versionName="1.48" >
+    android:versionCode="49"
+    android:versionName="1.49" >
 
     <uses-sdk
         android:minSdkVersion="4"

src/org/scid/android/ScidAndroidActivity.java

@@ -108,9 +108,8 @@ public void onCreate(Bundle savedInstanceState) {
 		if (!scidFileDir.exists()) {
 			scidFileDir.mkdirs();
 		}
+		engineManager = new EngineManager(this);
 		checkUciEngine();
-		engineManager = EngineManager.getInstance();
-		engineManager.setContext(this);
 		preferences = PreferenceManager.getDefaultSharedPreferences(this);
 		preferences.registerOnSharedPreferenceChangeListener(new OnSharedPreferenceChangeListener() {
 			@Override
@@ -207,8 +206,8 @@ private boolean isXChessType() {
 	}
 
 	private void checkUciEngine() {
-		// check if engine exists in /data/data/org.scid.android
-		File engine = new File(EngineManager.getDefaultEngine()
+		// check if engine exists in the files directory
+		File engine = new File(engineManager.getDefaultEngine()
 				.getExecutablePath());
 		if (engine.exists()) {
 			try {
@@ -224,14 +223,13 @@ private void checkUciEngine() {
 				Log.e(TAG, e.getMessage(), e);
 			}
 		} else {
-
 			Log.d(TAG, "Engine is missing from data. Intializing...");
 			try {
 				InputStream istream = new FileInputStream(getApplicationInfo().dataDir
 								+ File.separator
 								+ "lib"
 								+ File.separator
-								+ EngineManager.getInstance().getInternalEngineFileName());
+								+ EngineManager.getInternalEngineFileName());
 				FileOutputStream fout = new FileOutputStream(
 						engine.getAbsolutePath());
 				byte[] b = new byte[1024];
@@ -242,7 +240,7 @@ private void checkUciEngine() {
 				istream.close();
 				fout.close();
 				Log.d(TAG, engine.getName()
-						+ " copied to /data/data/org.scid.android/");
+						+ " copied to files directory");
 				try {
 					String cmd[] = { "chmod", "744", engine.getAbsolutePath() };
 					Process process = Runtime.getRuntime().exec(cmd);
@@ -932,7 +930,7 @@ private final void readPrefs() {
 		ColorTheme.instance().readColors(preferences);
 		cb.setColors();
 
-		String engineName = preferences.getString(ANALYSIS_ENGINE, EngineManager
+		String engineName = preferences.getString(ANALYSIS_ENGINE, engineManager
 				.getDefaultEngine().getName());
 		engineManager.setCurrentEngineName(engineName);
 
@@ -1474,7 +1472,7 @@ public void engineChanged(EngineChangeEvent event) {
 										&& event.getSuccess()) {
 									Editor editor = preferences.edit();
 									editor.putString(ANALYSIS_ENGINE,
-											EngineManager.getDefaultEngine()
+											engineManager.getDefaultEngine()
 													.getName());
 									editor.commit();
 								}

src/org/scid/android/StartEngineTask.java

@@ -42,11 +42,10 @@ private void ensureEngine(String engineName, String engineFileName,
 		}
 		if (pkg != null && pkg.length() > 0) {
 			int newVersion = resolver.ensureEngineVersion(engineFileName, pkg,
-					engineVersion, new File(EngineManager.DATA_PATH));
-			File engineFile = new File(EngineManager.DATA_PATH + File.separator
-					+ engineFileName);
+					engineVersion, activity.getFilesDir());
+			File engineFile = new File(activity.getFilesDir(),engineFileName);
 			if (newVersion > engineVersion && engineFile.exists()) {
-				new EngineManager()
+				new EngineManager(activity)
 						.saveToConfiguration(engineName,
 								engineFile.getAbsolutePath(), pkg,
 								newVersion);

src/org/scid/android/engine/EngineManager.java

@@ -39,7 +39,6 @@
  * Class to manage UCI chess engines.
  */
 public class EngineManager {
-	public static final String DATA_PATH = "/data/data/org.scid.android/";
 	private static final String ENGINE_DATA_FILE = "engines.xml";
 	private static final String INTERNAL_ENGINE_NAME = "Stockfish 5";
 	private static EngineConfig defaultEngine;
@@ -85,32 +84,15 @@ public interface EngineChangeListener {
 		public void engineChanged(EngineChangeEvent event);
 	}
 
-	private static EngineManager instance = new EngineManager();
-
-	/**
-	 * Gets the singleton instance of the manager.
-	 *
-	 * @return The manager singleton.
-	 */
-	public static EngineManager getInstance() {
-		return instance;
-	}
-
-	public EngineManager() {
+	public EngineManager(Context context) {
+		this.context = context;
 		// Establish the default engine
-		defaultEngine = new EngineConfig(INTERNAL_ENGINE_NAME, DATA_PATH
-				+ getInternalEngineFileName(), null, 0);
+		defaultEngine = new EngineConfig(INTERNAL_ENGINE_NAME, context
+				.getFilesDir().getPath() + getInternalEngineFileName(), null, 0);
 	}
 
-	/**
-	 * Sets the application context for the manager to use. The application
-	 * context is needed for displaying dialogs and accessing resource strings.
-	 *
-	 * @param context
-	 *            The application context.
-	 */
-	public void setContext(Context context) {
-		this.context = context;
+	public String getFilesDir() {
+		return context.getFilesDir().getPath();
 	}
 
 	public void addEngineChangeListener(EngineChangeListener listener) {
@@ -135,7 +117,7 @@ public void removeEngineChangeListener(EngineChangeListener listener) {
 	 *
 	 * @return The default EngineConfig.
 	 */
-	public static EngineConfig getDefaultEngine() {
+	public EngineConfig getDefaultEngine() {
 		return defaultEngine;
 	}
 
@@ -234,7 +216,7 @@ public boolean addEngine(String engineName, String executable,
 			String enginePackage, int engineVersion) {
 		EngineConfig engine = getEnginesList().get(engineName);
 		if (engine == null) {
-			File engineFile = new File(DATA_PATH + executable);
+			File engineFile = new File(context.getFilesDir(), executable);
 			String engineAbsPath = engineFile.getAbsolutePath();
 			boolean engineExists = engineFile.exists();
 			if (!engineExists) {
@@ -290,7 +272,7 @@ private void addOpenExchangeEngine(String executable, String engineAbsPath,
 				found = true;
 				try {
 					openEngine.copyToFiles(context.getContentResolver(),
-							new File(DATA_PATH));
+							context.getFilesDir());
 					Toast.makeText(
 							context,
 							context.getString(R.string.engine_added_copied,
@@ -429,7 +411,8 @@ private void saveEngineData(Map<String, EngineConfig> enginesList) {
 			if (Log.isLoggable("SCID", Log.DEBUG))
 				Log.d("SCID", "Engine XML: " + writer.toString());
 
-			File engineDataFile = new File(DATA_PATH + ENGINE_DATA_FILE);
+			File engineDataFile = new File(context.getFilesDir(),
+					ENGINE_DATA_FILE);
 			fw = new FileWriter(engineDataFile);
 			fw.write(writer.toString());
 			fw.close();
@@ -464,7 +447,7 @@ private Map<String, EngineConfig> getEnginesList() {
 	 */
 	private void loadEngineData() {
 		TreeMap<String, EngineConfig> list = new TreeMap<String, EngineConfig>();
-		File engineDataFile = new File(DATA_PATH + ENGINE_DATA_FILE);
+		File engineDataFile = new File(context.getFilesDir(), ENGINE_DATA_FILE);
 		if (engineDataFile.exists()) {
 			FileReader fr = null;
 			try {
@@ -584,7 +567,7 @@ protected Boolean doInBackground(File... params) {
 				if (!canceled) {
 					if (Log.isLoggable("SCID", Log.INFO))
 						Log.i("SCID", srcFile.getName() + " copied to "
-								+ DATA_PATH);
+								+ context.getFilesDir().getPath());
 					result = Boolean.TRUE;
 				}
 			} catch (IOException e) {