Move stop ungrouping logic from calling functions to AlarmListManager.sendControls so it's applied everywhere automatically

Author: ComputerElite

README.md

@@ -22,7 +22,7 @@ Furthermore it fixes some layout flaws of the official OpenShock Frontend like h
 You can also log in on multiple OpenShock instances at once. ShockAlarm will show all shockers from all instances seamlessly at a glance!
 
 ## Other information
-- I cannot guarentee that all features work with all possible configurations. I try to make them work with each other but sometimes I miss them. For example a random intensity won't work with the shock confirmation dialog. However a hard limit will.
+I cannot guarentee that all features work with all possible configurations. I try to make them work with each other but sometimes I miss them. For example a random intensity won't work with the shock confirmation dialog. However a hard limit will.
 
 ### Not supported in Web Version
 Everything with websockets is currently not supported due to authentication problems with websockets. This includes:
@@ -125,7 +125,7 @@ You can download a Portable version (zip file) from the [releases](https://githu
 - [x] Add global limit for self.
 - [x] Stop live playback when changing type
 - [x] Make sure text in popups is scrollable so it can be read completely
-- [ ] Implement login V2
+- [ ] Implement login V2 (how am I supposed to reliably extract sideKeys for turnstile on any OpenShock instance)
 - [ ] Implement Shares V2 (once officially declared done in backend and implementation in official frontend exists. Can't make sense of the api rn without explenation)
 
 # Planned settings

lib/components/desktop_mobile_refresh_indicator.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:shock_alarm_app/services/alarm_list_manager.dart';
 
 class DesktopMobileRefreshIndicator extends StatefulWidget {

lib/components/page_padding.dart

@@ -1,6 +1,4 @@
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:shock_alarm_app/screens/screen_selector.dart';
 
 class PagePadding extends StatefulWidget {
   final Widget child;

lib/components/predefined_spacing.dart

@@ -2,7 +2,7 @@ import 'package:flutter/widgets.dart';
 
 class PredefinedSpacing extends StatelessWidget {
   EdgeInsets? padding;
-  PredefinedSpacing({this.padding = null});
+  PredefinedSpacing({this.padding});
   static EdgeInsets paddingExtraSmall() => EdgeInsets.all(5);
   static EdgeInsets paddingSmall() => EdgeInsets.all(10);
   static EdgeInsets paddingMedium() => EdgeInsets.all(15);

lib/screens/shockers/grouped/grouped_shockers.dart

@@ -53,13 +53,6 @@ class _GroupedShockerScreenState extends State<GroupedShockerScreen> {
     for (Shocker s in AlarmListManager.getInstance().getSelectedShockers()) {
       controls.add(s.getLimitedControls(type, intensity, duration));
     }
-    if (type == ControlType.stop) {
-      // Temporary workaround until OpenShock fixed the issue with stop. So for now we send them individually
-      for (Control c in controls) {
-        AlarmListManager.getInstance().sendControls([c]);
-      }
-      return 0;
-    }
     AlarmListManager.getInstance().sendControls(controls);
     return duration;
   }
@@ -73,13 +66,6 @@ class _GroupedShockerScreenState extends State<GroupedShockerScreen> {
     for (Shocker s in AlarmListManager.getInstance().getSelectedShockers()) {
       controls.add(s.getLimitedControls(type, intensity, 300));
     }
-    if (type == ControlType.stop) {
-      // Temporary workaround until OpenShock fixed the issue with stop. So for now we send them individually
-      for (Control c in controls) {
-        AlarmListManager.getInstance().sendControls([c]);
-      }
-      return;
-    }
     AlarmListManager.getInstance().sendLiveControls(controls);
   }
 

lib/screens/shockers/individual/shockers.dart

@@ -279,6 +279,7 @@ class ShockerScreenState extends State<ShockerScreen> {
     List<Control> controls = [];
     int highestDuration = 0;
     for (Shocker s in shockers ?? AlarmListManager.getInstance().getSelectedShockers()) {
+      if(s.paused) continue;
       Control c = s.getLimitedControls(type, AlarmListManager.getInstance().settings.useSeperateSliders && type == ControlType.vibrate ? s.controls.getRandomVibrateIntensity() : s.controls.getRandomIntensity(), s.controls.getRandomDuration());
       if (c.duration > highestDuration) {
         highestDuration = c.duration;

lib/screens/shockers/shocker_item.dart

@@ -464,13 +464,6 @@ class ShockerItemState extends State<ShockerItem>
 
   void onSendLive(ControlType type, int intensity) {
     List<Control> controls = [widget.shocker.getLimitedControls(type, intensity, 300)];
-    if (type == ControlType.stop) {
-      // Temporary workaround until OpenShock fixed the issue with stop. So for now we send them individually
-      for (Control c in controls) {
-        widget.manager.sendControls([c]);
-      }
-      return;
-    }
     widget.manager.sendLiveControls(controls);
   }
 }

lib/screens/tools/random_shocks/random_shocks.dart

@@ -78,13 +78,6 @@ class _RandomShocksScreenState extends State<RandomShocksScreen> {
     for (Shocker s in AlarmListManager.getInstance().getSelectedShockers()) {
       controls.add(s.getLimitedControls(type, intensity, duration));
     }
-    if (type == ControlType.stop) {
-      // Temporary workaround until OpenShock fixed the issue with stop. So for now we send them individually
-      for (Control c in controls) {
-        AlarmListManager.getInstance().sendControls([c]);
-      }
-      return;
-    }
     AlarmListManager.getInstance().sendControls(controls);
   }
 

lib/services/alarm_list_manager.dart

@@ -792,19 +792,34 @@ class AlarmListManager {
   Future<String?> sendControls(List<Control> controls,
       {String? customName, bool useWs = true}) async {
     Map<int, List<Control>> controlsByToken = {};
+    Map<int, List<Control>> stopControlsByToken = {};
     for (var control in controls) {
-      controlsByToken.putIfAbsent(control.apiTokenId, () => []).add(control);
+      // put stop controls into seperate list
+      (control.type == ControlType.stop ? stopControlsByToken : controlsByToken).putIfAbsent(control.apiTokenId, () => []).add(control);
     }
     OpenShockClient client = OpenShockClient();
+    bool stopControlFailed = false;
+    // first do stop controls
     for (var token in getTokens()) {
-      if (controlsByToken.containsKey(token.id)) {
-        if (!await client.sendControls(token, controlsByToken[token.id]!, this,
+      if (!stopControlsByToken.containsKey(token.id)) continue;
+      for(Control stopControl in stopControlsByToken[token.id]!) {
+        if (!await client.sendControls(token, [stopControl], this,
             customName: customName,
             useWs: !settings.useHttpShocking && useWs)) {
-          return "Failed to send shock to at least 1 shocker, is your token still valid?";
+          stopControlFailed = true; // make sure we also try to send the other stops
         }
       }
     }
+    if(stopControlFailed) return "Failed to send stop to at least 1 shocker";
+    // then the other ones
+    for (var token in getTokens()) {
+      if (!controlsByToken.containsKey(token.id)) continue;
+      if (!await client.sendControls(token, controlsByToken[token.id]!, this,
+          customName: customName,
+          useWs: !settings.useHttpShocking && useWs)) {
+        return "Failed to send shock to at least 1 shocker, is your token still valid?";
+      }
+    }
     return null;
   }