From 871cff5e63f8b3b2309a1660e6df630b47a9af1f Mon Sep 17 00:00:00 2001 From: Xele02 Date: Wed, 25 Sep 2024 19:52:27 +0200 Subject: [PATCH 1/2] Enable log in thread --- Unity/Assets/Scripts/UMOLogWritter.cs | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/Unity/Assets/Scripts/UMOLogWritter.cs b/Unity/Assets/Scripts/UMOLogWritter.cs index 20b41604b..817926669 100644 --- a/Unity/Assets/Scripts/UMOLogWritter.cs +++ b/Unity/Assets/Scripts/UMOLogWritter.cs @@ -31,12 +31,14 @@ void OnEnable() if(filecreated) { Application.logMessageReceived += HandleLog; + Application.logMessageReceivedThreaded += HandleLog; } } void OnDisable() { Application.logMessageReceived -= HandleLog; + Application.logMessageReceivedThreaded -= HandleLog; } public void CheckEnabled() @@ -47,17 +49,20 @@ public void CheckEnabled() void HandleLog(string logString, string stackTrace, LogType type) { - if(!starting) + lock(logFile) { - if(!RuntimeSettings.CurrentSettings.EnableInfoLog && (type == LogType.Log || type == LogType.Warning)) - return; - if(!RuntimeSettings.CurrentSettings.EnableErrorLog && type != LogType.Log && type != LogType.Warning) - return; + if(!starting) + { + if(!RuntimeSettings.CurrentSettings.EnableInfoLog && (type == LogType.Log || type == LogType.Warning)) + return; + if(!RuntimeSettings.CurrentSettings.EnableErrorLog && type != LogType.Log && type != LogType.Warning) + return; + } + sw.Write("["+type+"] "+logString); + sw.Write(stackTrace); + sw.Write("\n\n"); + sw.Flush(); + logFile.Flush(); } - sw.Write("["+type+"] "+logString); - sw.Write(stackTrace); - sw.Write("\n\n"); - sw.Flush(); - logFile.Flush(); } } \ No newline at end of file From 405a26dc12b9542126b870e797e91d4ba2ffde80 Mon Sep 17 00:00:00 2001 From: Xele02 Date: Wed, 25 Sep 2024 19:53:16 +0200 Subject: [PATCH 2/2] Remove unused code which crash on Android 11 --- Unity/Assets/UMAssets/Scripts/BBGDKLLEPIB.cs | 2 +- Unity/Assets/UMAssets/Scripts/KEHOJEJMGLJ.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Unity/Assets/UMAssets/Scripts/BBGDKLLEPIB.cs b/Unity/Assets/UMAssets/Scripts/BBGDKLLEPIB.cs index 458ccefae..061d5f222 100644 --- a/Unity/Assets/UMAssets/Scripts/BBGDKLLEPIB.cs +++ b/Unity/Assets/UMAssets/Scripts/BBGDKLLEPIB.cs @@ -426,7 +426,7 @@ public void CIDPPOGCODB(Dictionary FAOOOLDDBBB) if(item.Value == 1) { string path = OGCDNCDMLCA_MxDir + item.Key; - File.SetAttributes(path, FileAttributes.Normal); + //File.SetAttributes(path, FileAttributes.Normal); TodoLogger.Log(TodoLogger.Filesystem, "Delete File " + path); //File.Delete(path); } diff --git a/Unity/Assets/UMAssets/Scripts/KEHOJEJMGLJ.cs b/Unity/Assets/UMAssets/Scripts/KEHOJEJMGLJ.cs index 72cef88d8..3740cf505 100644 --- a/Unity/Assets/UMAssets/Scripts/KEHOJEJMGLJ.cs +++ b/Unity/Assets/UMAssets/Scripts/KEHOJEJMGLJ.cs @@ -771,7 +771,7 @@ public void CIDPPOGCODB(Dictionary FAOOOLDDBBB) else if (FAOOOLDDBBB[strs[i]] == 1) { string path = JCMJBMBMJAK_PersistentDataPath + strs[i]; - File.SetAttributes(path, FileAttributes.Normal); + //File.SetAttributes(path, FileAttributes.Normal); TodoLogger.Log(TodoLogger.Filesystem, "Would delete " + path); //INLICKMJHHK_DeleteFile(path); } @@ -806,7 +806,7 @@ public void CIDPPOGCODB(Dictionary FAOOOLDDBBB) for(int j = 0; j < l[i].IBGNDNLAHOE.Count; j++) { string path = JCMJBMBMJAK_PersistentDataPath + l[i].IBGNDNLAHOE[j]; - File.SetAttributes(path, FileAttributes.Normal); + //File.SetAttributes(path, FileAttributes.Normal); TodoLogger.Log(TodoLogger.Filesystem, "Would delete " + path); //INLICKMJHHK_DeleteFile(path); KLIJFOBEKBE.OJCJPCHFPGO_DeleteFileInfo(l[i].IBGNDNLAHOE[j]);