Code refactoring

Author: Szczyrk

Assets/PatchKit Patcher/Scripts/Debug/UnityMessageWriter.cs

@@ -18,9 +18,12 @@ public UnityMessageWriter([NotNull] IMessageFormatter formatter)
 
         public void Write(Message message, MessageContext messageContext)
         {
+            var text = _formatter.Format(message, messageContext);
             var patcher = Patcher.Instance;
-            var text = _formatter.Format(message, messageContext)
-                .Replace(patcher.AppSecret, patcher.TraceableAppSecret);
+            if (!string.IsNullOrEmpty(patcher.AppSecret))
+            {
+                text = text.Replace(patcher.AppSecret, patcher.TraceableAppSecret);
+            }
 
             switch (message.Type)
             {

Assets/PatchKit Patcher/Scripts/Patcher.cs

@@ -87,7 +87,20 @@ public static Patcher Instance
 
         private PatchKit.Unity.Patcher.Cancellation.CancellationTokenSource _updateAppCancellationTokenSource;
 
-        public string TraceableAppSecret { get; private set; }
+        public string TraceableAppSecret     
+        {
+            get
+            {
+                if (_traceableAppSecret == null)
+                {
+                    _traceableAppSecret = BuildTraceableAppSecret();
+                }
+
+                return _traceableAppSecret;
+            }
+        }
+
+        private string _traceableAppSecret;
 
         public string AppSecret { get; private set; }
 
@@ -517,8 +530,8 @@ private void ThreadLoadPatcherData()
                 _data.Value = inputArgumentsPatcherDataReader.Read();
 #endif
                 AppSecret = _data.Value.AppSecret;
-                BuildTraceableAppSecret(AppSecret);
-                DebugLogger.LogVariable(AppSecret, "Data.AppSecret");
+
+                DebugLogger.LogVariable(_data.Value.AppSecret, "Data.AppSecret");
                 DebugLogger.LogVariable(_data.Value.AppDataPath, "Data.AppDataPath");
                 DebugLogger.LogVariable(_data.Value.OverrideLatestVersionId, "Data.OverrideLatestVersionId");
                 DebugLogger.LogVariable(_data.Value.LockFilePath, "Data.LockFilePath");
@@ -960,10 +973,10 @@ private bool ThreadTryRestartWithRequestForPermissions()
             }
         }
 
-        private void BuildTraceableAppSecret(string appSecret)
+        private string BuildTraceableAppSecret()
         {
-            TraceableAppSecret = string.Format("{0}...{1}", appSecret.Substring(0, 6),
-                appSecret.Substring(appSecret.Length - 6));
+            return string.Format("{0}...{1}", AppSecret.Substring(0, 6),
+                AppSecret.Substring(AppSecret.Length - 6));
         }
     }
 }