multi server login is now officially a supported feature

Author: ComputerElite

README.md

@@ -13,12 +13,14 @@ A web version (for IOS, ...) can be found [here](https://computerelite.github.io
 # Features
 ShockAlarm is a powerful tool for controlling your Shockers via OpenShock. It allows you to fully manage your shockers, logs, shares, hubs, share links, tokens and sessions.
 
-There is advanced functionaity like controling multiple shockers at the same time, specifying a random interval for intensity, duration and a delay (if you're into that), live controls with patterns and alarms.
+There is advanced functionaity like controling multiple shockers at the same time, specifying a random interval for intensity, duration and a delay, live controls with patterns and alarms.
 
 It's fully material you themed just like the standard Android apps you're already used to and provides a responsive ui with a nice design.
 
 Furthermore it fixes some layout flaws of the official OpenShock Frontend like having shared and own shockers in seperate tabs (which is annoying). On top it also has lots of info buttons you can press to get more insight on what something does.
 
+You can also log in on multiple OpenShock instances at once. ShockAlarm will show all shockers from all instances seamlessly at a glance!
+
 # Installation on Android
 ## Through Obtainium (recommended as you get the updates the fastest)
 [<img src="https://github.com/user-attachments/assets/713d71c5-3dec-4ec4-a3f2-8d28d025a9c6"

fastlane/metadata/android/en-US/changelogs/28.txt

@@ -0,0 +1,4 @@
+**Changelog:**
+- Change send interval from 50ms to whatever the hub requests
+- Fixed logs not loading on second entering
+- Added refined support for multi server login

lib/components/live_controls.dart

@@ -224,7 +224,7 @@ class _LiveControlsState extends State<LiveControls> {
                   isPlaying: isPlaying,
                   pattern: pattern,
                   logEvent: (duration, intensity) => widget.liveEventDone?.call(type, duration, intensity),
-                  respondInterval: 50,
+                  respondInterval: getRequestedTps(), // 10 tps from LCG
                   intensityLimit: widget.intensityLimit,
                 )
               ],
@@ -287,6 +287,14 @@ class _LiveControlsState extends State<LiveControls> {
               ],
             ));
   }
+  
+  double getRequestedTps() {
+    int highestTps = 4;
+    AlarmListManager.getInstance().liveControlGatewayConnections.values.forEach((element) {
+      if(element.tps > highestTps) highestTps = element.tps;
+    });
+    return 1000 / highestTps;
+  }
 }
 
 class PatternPreview extends StatelessWidget {

lib/components/shocker_details.dart

@@ -2,14 +2,16 @@ import 'dart:math';
 
 import 'package:flutter/material.dart';
 import 'package:shock_alarm_app/dialogs/ErrorDialog.dart';
+import 'package:shock_alarm_app/stores/alarm_store.dart';
 
 import '../services/openshock.dart';
 
 class ShockerDetails extends StatefulWidget {
   OpenShockShocker shocker;
+  int? apiTokenId;
   List<OpenShockDevice> devices;
 
-  ShockerDetails({required this.shocker, required this.devices});
+  ShockerDetails({required this.shocker, required this.devices, this.apiTokenId});
   @override
   ShockerDetailsState createState() => ShockerDetailsState();
 }
@@ -42,7 +44,7 @@ class ShockerDetailsState extends State<ShockerDetails> {
               },
               initialSelection: widget.shocker.device,
               dropdownMenuEntries: [
-                for (OpenShockDevice device in widget.devices)
+                for (OpenShockDevice device in widget.devices.where((x) => widget.apiTokenId == null || (x.apiTokenReference?.id ?? 0) == widget.apiTokenId))
                   DropdownMenuEntry(label: device.name, value: device.id),
               ]),
           DropdownMenu<String>(

lib/components/shocker_item.dart

@@ -47,7 +47,7 @@ class ShockerItem extends StatefulWidget {
               context: context,
               builder: (context) => AlertDialog.adaptive(
                     title: Text("Edit shocker"),
-                    content: ShockerDetails(shocker: s, devices: devices),
+                    content: ShockerDetails(shocker: s, devices: devices, apiTokenId: shocker.apiTokenId,),
                     actions: [
                       TextButton(
                           onPressed: () {

lib/components/token_item.dart

@@ -101,7 +101,7 @@ class TokenItemState extends State<TokenItem> {
                         token.name,
                         style: t.textTheme.headlineSmall?.copyWith(fontWeight: FontWeight.bold),
                       ),
-                      Text(token.tokenType==TokenType.openshock? "OpenShock" : "AlarmServer")
+                      Text("${token.tokenType==TokenType.openshock? "OpenShock" : "AlarmServer"} (${token.server.replaceAll("http://", "").replaceAll("https://", "")})", style: t.textTheme.labelSmall,),
                     ],
                   ),
                   Row(

lib/main.dart

@@ -14,7 +14,7 @@ import 'package:android_alarm_manager_plus/android_alarm_manager_plus.dart';
 const String issues_url = "https://github.com/ComputerElite/ShockAlarmApp/issues";
 
 String GetUserAgent() {
-  return "ShockAlarm/0.2.3";
+  return "ShockAlarm/0.2.4";
 }
 
 bool isAndroid() {

lib/screens/home.dart

@@ -171,7 +171,7 @@ class ScreenSelectorState extends State<ScreenSelector> {
       if (index != -1) {
         _selectedIndex = min(index, screens.length);
       } else {
-        if (manager.getAnyUserToken() == null) _selectedIndex = 3;
+        if (!manager.hasValidAccount()) _selectedIndex = 3;
         if (!supportsAlarms) _selectedIndex -= 1;
       }
       setState(() {});
@@ -243,7 +243,7 @@ class ScreenSelectorState extends State<ScreenSelector> {
 
   @override
   Widget build(BuildContext context) {
-    manager.startAnyWS();
+    manager.startAllWS();
     return Scaffold(
         body: Padding(
           padding: const EdgeInsets.only(

lib/screens/logs.dart

@@ -34,10 +34,12 @@ class LogScreenState extends State<LogScreen> {
     initialLoading = true;
     manager.reloadShockerLogs = () {
       List<ShockerLog> newLogs = [];
-      for (var shocker in shockers)
+      for (var shocker in shockers) {
         newLogs.addAll(manager.shockerLog[shocker.id] ?? []);
+      }
       newLogs.sort((a, b) => b.createdOn.compareTo(a.createdOn));
       setState(() {
+        initialLoading = false;
         logs = newLogs;
       });
       if(reloadShockerLogs != null) {
@@ -46,6 +48,8 @@ class LogScreenState extends State<LogScreen> {
     };
     if(needsToLoadLogsOnStart()) {
       loadLogs();
+    } else {
+      manager.reloadShockerLogs?.call();
     }
   }
 

lib/screens/share_link_edit.dart

@@ -49,7 +49,7 @@ class ShareLinkEditScreenState extends State<ShareLinkEditScreen> {
     List<Shocker> ownShockers = await AlarmListManager.getInstance()
         .shockers
         .where((element) =>
-            element.isOwn && !existingShockers.contains(element.id))
+            element.isOwn && !existingShockers.contains(element.id) && element.apiTokenId == widget.shareLink.tokenId )
         .toList();
     Shocker? selectedShocker = null;
     OpenShockShareLimits limits = OpenShockShareLimits();