[Scummvm-git-logs] scummvm master -> 75826f80fc07b120c32e43f34307ebba3e151faa

[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:
75826f80fc ANDROID: Comment out the logfile code


Commit: 75826f80fc07b120c32e43f34307ebba3e151faa
    https://github.com/scummvm/scummvm/commit/75826f80fc07b120c32e43f34307ebba3e151faa
Author: antoniou (a.antoniou79 at gmail.com)
Date: 2020-09-24T10:14:02+03:00

Commit Message:
ANDROID: Comment out the logfile code

Since currently the logFile stuff are specific to SDL_BACKED

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


diff --git a/backends/platform/android/android.h b/backends/platform/android/android.h
index 7f728e5275..bb4671b669 100644
--- a/backends/platform/android/android.h
+++ b/backends/platform/android/android.h
@@ -130,8 +130,7 @@ public:
 	virtual Audio::Mixer *getMixer();
 	virtual void getTimeAndDate(TimeDate &t) const;
 	virtual void logMessage(LogMessageType::Type type, const char *message);
-	virtual void addSysArchivesToSearchSet(Common::SearchSet &s,
-											int priority = 0);
+	virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0);
 	virtual bool openUrl(const Common::String &url);
 	virtual bool hasTextInClipboard();
 	virtual Common::U32String getTextFromClipboard();
diff --git a/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java b/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
index 19ed5160eb..a7ce50bd56 100644
--- a/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
+++ b/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
@@ -64,7 +64,7 @@ public class ScummVMActivity extends Activity implements OnKeyboardVisibilityLis
 	private File _configScummvmFile;
 	private File _actualScummVMDataDir;
 	private File _usingScummVMSavesDir;
-	private File _usingLogFile;
+//	private File _usingLogFile;
 
 
 	/**
@@ -272,6 +272,7 @@ public class ScummVMActivity extends Activity implements OnKeyboardVisibilityLis
 //			Log.d(ScummVM.LOG_TAG, "SAVEPATH: " +  _usingScummVMSavesDir.getPath());
 
 			// TODO log file setting via "--logfile=" + _usingLogFile.getPath() causes crash
+			//      probably because this option is specific to SDL_BACKEND (see: base/commandLine.cpp)
 			_scummvm.setArgs(new String[]{
 				"ScummVM",
 				"--config=" + _configScummvmFile.getPath(),
@@ -679,51 +680,51 @@ public class ScummVMActivity extends Activity implements OnKeyboardVisibilityLis
 			}
 		}
 
-		File internalScummVMLogsDir = new File(_actualScummVMDataDir, ".cache/scummvm/logs");
-		if (!internalScummVMLogsDir.exists() && internalScummVMLogsDir.mkdirs()) {
-			Log.d(ScummVM.LOG_TAG, "Created ScummVM Logs path: " + internalScummVMLogsDir.getPath());
-		} else if (internalScummVMLogsDir.isDirectory()) {
-			Log.d(ScummVM.LOG_TAG, "ScummVM Logs path already exists: " + internalScummVMLogsDir.getPath());
-		} else {
-			Log.e(ScummVM.LOG_TAG, "Could not create folder for ScummVM Logs path: " + internalScummVMLogsDir.getPath());
-			new AlertDialog.Builder(this)
-				.setTitle(R.string.no_log_file_title)
-				.setIcon(android.R.drawable.ic_dialog_alert)
-				.setMessage(R.string.no_log_file)
-				.setNegativeButton(R.string.quit,
-					new DialogInterface.OnClickListener() {
-						public void onClick(DialogInterface dialog, int which) {
-							finish();
-						}
-					})
-				.show();
-			return false;
-		}
-
-		_usingLogFile = new File(internalScummVMLogsDir, "scummvm.log");
-		try {
-			if (_usingLogFile.exists() || !_usingLogFile.createNewFile()) {
-				Log.d(ScummVM.LOG_TAG, "ScummVM Log file already exists!");
-				Log.d(ScummVM.LOG_TAG, "Existing ScummVM Log: " + _usingLogFile.getPath());
-			} else {
-				Log.d(ScummVM.LOG_TAG, "An empty ScummVM log file was created!");
-				Log.d(ScummVM.LOG_TAG, "New ScummVM Log: " + _usingLogFile.getPath());
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-			new AlertDialog.Builder(this)
-				.setTitle(R.string.no_log_file_title)
-				.setIcon(android.R.drawable.ic_dialog_alert)
-				.setMessage(R.string.no_log_file)
-				.setNegativeButton(R.string.quit,
-					new DialogInterface.OnClickListener() {
-						public void onClick(DialogInterface dialog, int which) {
-							finish();
-						}
-					})
-				.show();
-			return false;
-		}
+//		File internalScummVMLogsDir = new File(_actualScummVMDataDir, ".cache/scummvm/logs");
+//		if (!internalScummVMLogsDir.exists() && internalScummVMLogsDir.mkdirs()) {
+//			Log.d(ScummVM.LOG_TAG, "Created ScummVM Logs path: " + internalScummVMLogsDir.getPath());
+//		} else if (internalScummVMLogsDir.isDirectory()) {
+//			Log.d(ScummVM.LOG_TAG, "ScummVM Logs path already exists: " + internalScummVMLogsDir.getPath());
+//		} else {
+//			Log.e(ScummVM.LOG_TAG, "Could not create folder for ScummVM Logs path: " + internalScummVMLogsDir.getPath());
+//			new AlertDialog.Builder(this)
+//				.setTitle(R.string.no_log_file_title)
+//				.setIcon(android.R.drawable.ic_dialog_alert)
+//				.setMessage(R.string.no_log_file)
+//				.setNegativeButton(R.string.quit,
+//					new DialogInterface.OnClickListener() {
+//						public void onClick(DialogInterface dialog, int which) {
+//							finish();
+//						}
+//					})
+//				.show();
+//			return false;
+//		}
+//
+//		_usingLogFile = new File(internalScummVMLogsDir, "scummvm.log");
+//		try {
+//			if (_usingLogFile.exists() || !_usingLogFile.createNewFile()) {
+//				Log.d(ScummVM.LOG_TAG, "ScummVM Log file already exists!");
+//				Log.d(ScummVM.LOG_TAG, "Existing ScummVM Log: " + _usingLogFile.getPath());
+//			} else {
+//				Log.d(ScummVM.LOG_TAG, "An empty ScummVM log file was created!");
+//				Log.d(ScummVM.LOG_TAG, "New ScummVM Log: " + _usingLogFile.getPath());
+//			}
+//		} catch (Exception e) {
+//			e.printStackTrace();
+//			new AlertDialog.Builder(this)
+//				.setTitle(R.string.no_log_file_title)
+//				.setIcon(android.R.drawable.ic_dialog_alert)
+//				.setMessage(R.string.no_log_file)
+//				.setNegativeButton(R.string.quit,
+//					new DialogInterface.OnClickListener() {
+//						public void onClick(DialogInterface dialog, int which) {
+//							finish();
+//						}
+//					})
+//				.show();
+//			return false;
+//		}
 
 		File internalScummVMConfigDir = new File(_actualScummVMDataDir, ".config/scummvm");
 		if (!internalScummVMConfigDir.exists() && internalScummVMConfigDir.mkdirs()) {