fix: scripting bug & code generator bug

timschneeb · May 12, 2024 · 6d91b5e · 6d91b5e
1 parent 16ed08f
commit 6d91b5e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 27 deletions.
diff --git a/GalaxyBudsClient/App.axaml.cs b/GalaxyBudsClient/App.axaml.cs
@@ -36,6 +36,8 @@ public class App : Application
             defaultBindingMode: BindingMode.OneWay, defaultValue: []);
     public NativeMenu TrayMenu => GetValue(TrayMenuProperty);
 
+    private readonly ExperimentManager _experimentManager = new();
+
     public override void Initialize()
     {
         DataContext = this;
@@ -68,12 +70,12 @@ public override void Initialize()
         MediaKeyRemote.Init();
         DeviceMessageCache.Init();
         BatteryHistoryManager.Init();
-        ExperimentManager.Init();
         ScriptManager.Instance.RegisterUserHooks();
 
         Settings.MainSettingsPropertyChanged += OnMainSettingsPropertyChanged;
 
         Log.Information("Translator mode file location: {File}", Loc.TranslatorModeFile);
+        Log.Debug("Environment: {Env}", _experimentManager.CurrentEnvironment());
     }
 
     public override void OnFrameworkInitializationCompleted()

diff --git a/GalaxyBudsClient/Model/Constants.cs b/GalaxyBudsClient/Model/Constants.cs
@@ -79,7 +79,7 @@ public enum Locales
             [Description("Chinese (Traditional)")]
             tw,
             [Description("Indonesian")]
-            @in,
+            in_,
             [Description("Vietnamese")]
             vn,
             [Description("Greek")]

diff --git a/GalaxyBudsClient/Model/Specifications/BudsDeviceSpec.cs b/GalaxyBudsClient/Model/Specifications/BudsDeviceSpec.cs
@@ -20,7 +20,8 @@ public class BudsDeviceSpec : IDeviceSpec
         { Features.Current, null },
         { Features.PairingMode, null },
         { Features.AmbientSoundVolume, null },
-        { Features.SppLegacyMessageHeader, null }
+        { Features.SppLegacyMessageHeader, null },
+        { Features.UsageReport, null },
     };
 
     public Models Device => Models.Buds;

diff --git a/GalaxyBudsClient/Scripting/Experiment/ExperimentManager.cs b/GalaxyBudsClient/Scripting/Experiment/ExperimentManager.cs
@@ -13,7 +13,7 @@ namespace GalaxyBudsClient.Scripting.Experiment;
 
 public class ExperimentManager
 {
-    private const int InitialScanTimeout = 5000; 
+    private const int InitialScanTimeout = 10000; 
     private readonly ExperimentClient _client = new();
     private ExperimentRequest? _activeExperiment;
     private IExperimentBase? _activeExperimentHook;
@@ -80,7 +80,7 @@ private void ExcludeExperiment(long id)
         Settings.Data.ExperimentsFinishedIds.Add(id);
     }
 
-    public static Environment CurrentEnvironment()
+    public Environment CurrentEnvironment()
     {
 #if DEBUG
         return Environment.Internal;
@@ -159,26 +159,4 @@ private void OnNewResultsFound(object? sender, IReadOnlyList<ExperimentRequest>
             LaunchExperiment(e[0]);
         }
     }
-
-    #region Singleton
-    private static readonly object Padlock = new();
-    private static ExperimentManager? _instance;
-    public static ExperimentManager Instance
-    {
-        get
-        {
-            lock (Padlock)
-            {
-                return _instance ??= new ExperimentManager();
-            }
-        }
-    }
-    public static void Init()
-    {
-        lock (Padlock)
-        { 
-            _instance ??= new ExperimentManager();
-        }
-    }
-    #endregion
 }