fix setting secondary carrier strength not working

eepiglet · May 29, 2023 · b132831 · b132831
1 parent 653a580
commit b132831
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 3 deletions.
diff --git a/Cowabunga.xcodeproj/project.pbxproj b/Cowabunga.xcodeproj/project.pbxproj
@@ -1527,7 +1527,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 10.3.1;
+				MARKETING_VERSION = 10.3.2;
 				OTHER_SWIFT_FLAGS = "-Xfrontend -debug-time-function-bodies";
 				PRODUCT_BUNDLE_IDENTIFIER = com.leemin.Cowabunga;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1577,7 +1577,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 10.3.1;
+				MARKETING_VERSION = 10.3.2;
 				OTHER_SWIFT_FLAGS = "-Xfrontend -debug-time-function-bodies";
 				PRODUCT_BUNDLE_IDENTIFIER = com.leemin.Cowabunga;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/lemin.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/lemin.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Cowabunga/Controllers/StatusManager/StatusSetter14.m b/Cowabunga/Controllers/StatusManager/StatusSetter14.m
@@ -531,12 +531,15 @@ - (void) setGsmSignalStrengthBars:(int)strength {
     StatusBarOverrideData *overrides = [self getOverrides];
     overrides->values.gsmSignalStrengthBars = strength;
     overrides->overrideGsmSignalStrengthBars = 1;
+    overrides->overrideItemIsEnabled[CellularSignalStrengthStatusBarItem] = 1;
+    overrides->values.itemIsEnabled[CellularSignalStrengthStatusBarItem] = 1;
     [self applyChanges:overrides];
 }
 
 - (void) unsetGsmSignalStrengthBars {
     StatusBarOverrideData *overrides = [self getOverrides];
     overrides->overrideGsmSignalStrengthBars = 0;
+    overrides->overrideItemIsEnabled[CellularSignalStrengthStatusBarItem] = 0;
     [self applyChanges:overrides];
 }
 
@@ -554,12 +557,15 @@ - (void) setSecondaryGsmSignalStrengthBars:(int)strength {
     StatusBarOverrideData *overrides = [self getOverrides];
     overrides->values.secondaryGsmSignalStrengthBars = strength;
     overrides->overrideSecondaryGsmSignalStrengthBars = 1;
+    overrides->overrideItemIsEnabled[SecondaryCellularSignalStrengthStatusBarItem] = 1;
+    overrides->values.itemIsEnabled[SecondaryCellularSignalStrengthStatusBarItem] = 1;
     [self applyChanges:overrides];
 }
 
 - (void) unsetSecondaryGsmSignalStrengthBars {
     StatusBarOverrideData *overrides = [self getOverrides];
     overrides->overrideSecondaryGsmSignalStrengthBars = 0;
+    overrides->overrideItemIsEnabled[SecondaryCellularSignalStrengthStatusBarItem] = 0;
     [self applyChanges:overrides];
 }
 

diff --git a/Cowabunga/Controllers/StatusManager/StatusSetter15.m b/Cowabunga/Controllers/StatusManager/StatusSetter15.m
@@ -560,12 +560,15 @@ - (void) setGsmSignalStrengthBars:(int)strength {
     StatusBarOverrideData *overrides = [self getOverrides];
     overrides->values.gsmSignalStrengthBars = strength;
     overrides->overrideGsmSignalStrengthBars = 1;
+    overrides->overrideItemIsEnabled[CellularSignalStrengthStatusBarItem] = 1;
+    overrides->values.itemIsEnabled[CellularSignalStrengthStatusBarItem] = 1;
     [self applyChanges:overrides];
 }
 
 - (void) unsetGsmSignalStrengthBars {
     StatusBarOverrideData *overrides = [self getOverrides];
     overrides->overrideGsmSignalStrengthBars = 0;
+    overrides->overrideItemIsEnabled[CellularSignalStrengthStatusBarItem] = 0;
     [self applyChanges:overrides];
 }
 
@@ -583,12 +586,15 @@ - (void) setSecondaryGsmSignalStrengthBars:(int)strength {
     StatusBarOverrideData *overrides = [self getOverrides];
     overrides->values.secondaryGsmSignalStrengthBars = strength;
     overrides->overrideSecondaryGsmSignalStrengthBars = 1;
+    overrides->overrideItemIsEnabled[SecondaryCellularSignalStrengthStatusBarItem] = 1;
+    overrides->values.itemIsEnabled[SecondaryCellularSignalStrengthStatusBarItem] = 1;
     [self applyChanges:overrides];
 }
 
 - (void) unsetSecondaryGsmSignalStrengthBars {
     StatusBarOverrideData *overrides = [self getOverrides];
     overrides->overrideSecondaryGsmSignalStrengthBars = 0;
+    overrides->overrideItemIsEnabled[SecondaryCellularSignalStrengthStatusBarItem] = 0;
     [self applyChanges:overrides];
 }
 

diff --git a/Cowabunga/Controllers/StatusManager/StatusSetter16.m b/Cowabunga/Controllers/StatusManager/StatusSetter16.m
@@ -565,12 +565,15 @@ - (void) setGsmSignalStrengthBars:(int)strength {
     StatusBarOverrideData *overrides = [self getOverrides];
     overrides->values.gsmSignalStrengthBars = strength;
     overrides->overrideGsmSignalStrengthBars = 1;
+    overrides->overrideItemIsEnabled[CellularSignalStrengthStatusBarItem] = 1;
+    overrides->values.itemIsEnabled[CellularSignalStrengthStatusBarItem] = 1;
     [self applyChanges:overrides];
 }
 
 - (void) unsetGsmSignalStrengthBars {
     StatusBarOverrideData *overrides = [self getOverrides];
     overrides->overrideGsmSignalStrengthBars = 0;
+    overrides->overrideItemIsEnabled[CellularSignalStrengthStatusBarItem] = 0;
     [self applyChanges:overrides];
 }
 
@@ -588,12 +591,15 @@ - (void) setSecondaryGsmSignalStrengthBars:(int)strength {
     StatusBarOverrideData *overrides = [self getOverrides];
     overrides->values.secondaryGsmSignalStrengthBars = strength;
     overrides->overrideSecondaryGsmSignalStrengthBars = 1;
+    overrides->overrideItemIsEnabled[SecondaryCellularSignalStrengthStatusBarItem] = 1;
+    overrides->values.itemIsEnabled[SecondaryCellularSignalStrengthStatusBarItem] = 1;
     [self applyChanges:overrides];
 }
 
 - (void) unsetSecondaryGsmSignalStrengthBars {
     StatusBarOverrideData *overrides = [self getOverrides];
     overrides->overrideSecondaryGsmSignalStrengthBars = 0;
+    overrides->overrideItemIsEnabled[SecondaryCellularSignalStrengthStatusBarItem] = 0;
     [self applyChanges:overrides];
 }
 

diff --git a/Cowabunga/Controllers/StatusManager/StatusSetter16_1.m b/Cowabunga/Controllers/StatusManager/StatusSetter16_1.m
@@ -567,12 +567,15 @@ - (void) setGsmSignalStrengthBars:(int)strength {
     StatusBarOverrideData *overrides = [self getOverrides];
     overrides->values.gsmSignalStrengthBars = strength;
     overrides->overrideGsmSignalStrengthBars = 1;
+    overrides->overrideItemIsEnabled[CellularSignalStrengthStatusBarItem] = 1;
+    overrides->values.itemIsEnabled[CellularSignalStrengthStatusBarItem] = 1;
     [self applyChanges:overrides];
 }
 
 - (void) unsetGsmSignalStrengthBars {
     StatusBarOverrideData *overrides = [self getOverrides];
     overrides->overrideGsmSignalStrengthBars = 0;
+    overrides->overrideItemIsEnabled[CellularSignalStrengthStatusBarItem] = 0;
     [self applyChanges:overrides];
 }
 
@@ -589,13 +592,16 @@ - (int) getSecondaryGsmSignalStrengthBarsOverride {
 - (void) setSecondaryGsmSignalStrengthBars:(int)strength {
     StatusBarOverrideData *overrides = [self getOverrides];
     overrides->values.secondaryGsmSignalStrengthBars = strength;
-    overrides->values.secondaryGsmSignalStrengthRaw = strength;
+    overrides->overrideSecondaryGsmSignalStrengthBars = 1;
+    overrides->overrideItemIsEnabled[SecondaryCellularSignalStrengthStatusBarItem] = 1;
+    overrides->values.itemIsEnabled[SecondaryCellularSignalStrengthStatusBarItem] = 1;
     [self applyChanges:overrides];
 }
 
 - (void) unsetSecondaryGsmSignalStrengthBars {
     StatusBarOverrideData *overrides = [self getOverrides];
     overrides->overrideSecondaryGsmSignalStrengthBars = 0;
+    overrides->overrideItemIsEnabled[SecondaryCellularSignalStrengthStatusBarItem] = 0;
     [self applyChanges:overrides];
 }