[Scummvm-git-logs] scummvm branch-2-2 -> 0a7dd239e744b8601ec2c4691ac6fc572c28dca7

[antoniou79]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0a7dd239e7 ANDROID: Added a note comment about scummvm.ini location


Commit: 0a7dd239e744b8601ec2c4691ac6fc572c28dca7
    https://github.com/scummvm/scummvm/commit/0a7dd239e744b8601ec2c4691ac6fc572c28dca7
Author: antoniou (a.antoniou79 at gmail.com)
Date: 2020-11-13T10:48:00+02:00

Commit Message:
ANDROID: Added a note comment about scummvm.ini location

Location is directly inside the app's internal storage folder

I am not sure if I did this by mistake, because I think it would be better for it
to be under the subpath ".config/scummvm" which we do create earlier.
However, this *mistake* makes the file easier accessible via the "LAN" feature,
since otherwise the user has to also enable the "show hidden files" option
and navigate specifically to the ".config/scummvm" subpath
to set it as root for the LAN server, in order to see the scummvm.ini.
In the current way, the user simply has to set the internal app folder
as root for the LAN server.

Changed paths:
    backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java


diff --git a/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java b/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
index 6a590d60c5..16a6a970f5 100644
--- a/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
+++ b/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
@@ -1564,6 +1564,14 @@ public class ScummVMActivity extends Activity implements OnKeyboardVisibilityLis
 		final Version version2_2_1_forPatch = new Version("2.2.1"); // patch for 2.2.1 Beta1 purposes
 		boolean existingConfigInScummVMDataDirReplacedOnce = false; // patch for 2.2.1 Beta1 purposes
 
+		// NOTE: our config file scummvm.ini is created directly inside the ScummVM internal app path
+		//       this is probably due to a mistake (?), since we do create a config path for it above
+		//       ( in File internalScummVMConfigDir , the sub-path ".config/scummvm")
+		//       However, this is harmless, so we can keep it this way.
+		//       Or we could change it in a future version.
+		//       Keep in mind that changing the scummvm.ini config file location would require at the very least:
+		//       - Moving the old scummvm.ini (if upgrading) to the new location and deleting it from the old one
+		//       - Updating the ScummVM documentation about the new location
 		_configScummvmFile = new File(_actualScummVMDataDir, "scummvm.ini");
 
 		try {