flutter/bluebubbles-app
1
0
Fork 0
mirror of https://github.com/BlueBubblesApp/bluebubbles-app.git synced 2025-07-01 21:06:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Limit scheduled messages & unsend to newer server versions

Browse Source
This commit is contained in:
Tanay Neotia
2022-12-20 12:34:15 -05:00
parent 23351ad993
commit cde5e41493
3 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/app/layouts/conversation_view/widgets/message/popup/message_popup.dart
View File

@ -275,7 +275,7 @@ class _MessagePopupState extends OptimizedState<MessagePopup> with SingleTickerP
style: context.textTheme.bodyLarge!.apply(color: context.theme.colorScheme.properOnSurface), style: context.textTheme.bodyLarge!.apply(color: context.theme.colorScheme.properOnSurface),
), ),
), ),
if (ss.isMinVenturaSync && message.isFromMe!) if (ss.isMinVenturaSync && message.isFromMe! && ss.serverDetailsSync().item4 >= 148)
PopupMenuItem( PopupMenuItem(
value: 6, value: 6,
child: Text( child: Text(
@ -1118,7 +1118,7 @@ class _MessagePopupState extends OptimizedState<MessagePopup> with SingleTickerP
), ),
), ),
), ),
if (ss.isMinVenturaSync && message.isFromMe!) if (ss.isMinVenturaSync && message.isFromMe! && ss.serverDetailsSync().item4 >= 148)
Material( Material(
color: Colors.transparent, color: Colors.transparent,
child: InkWell( child: InkWell(

48
lib/app/layouts/settings/settings_page.dart
View File

@ -181,31 +181,33 @@ class _SettingsPageState extends OptimizedState<SettingsPage> {
trailing: nextIcon, trailing: nextIcon,
); );
}), }),
Container( if (ss.serverDetailsSync().item4 >= 205)
color: tileColor, Container(
child: Padding( color: tileColor,
padding: const EdgeInsets.only(left: 65.0), child: Padding(
child: SettingsDivider(color: context.theme.colorScheme.surfaceVariant), padding: const EdgeInsets.only(left: 65.0),
child: SettingsDivider(color: context.theme.colorScheme.surfaceVariant),
),
), ),
), if (ss.serverDetailsSync().item4 >= 205)
SettingsTile( SettingsTile(
backgroundColor: tileColor, backgroundColor: tileColor,
title: "Scheduled Messages", title: "Scheduled Messages",
subtitle: "Schedule your server to send a message in the future or at set intervals", subtitle: "Schedule your server to send a message in the future or at set intervals",
isThreeLine: true, isThreeLine: true,
onTap: () { onTap: () {
ns.pushAndRemoveSettingsUntil( ns.pushAndRemoveSettingsUntil(
context, context,
ScheduledMessagesPanel(), ScheduledMessagesPanel(),
(route) => route.isFirst, (route) => route.isFirst,
); );
}, },
trailing: nextIcon, trailing: nextIcon,
leading: const SettingsLeadingIcon( leading: const SettingsLeadingIcon(
iosIcon: CupertinoIcons.calendar_today, iosIcon: CupertinoIcons.calendar_today,
materialIcon: Icons.schedule_send_outlined, materialIcon: Icons.schedule_send_outlined,
),
), ),
),
], ],
), ),
SettingsHeader( SettingsHeader(

3
lib/services/backend/settings/settings_service.dart
View File

@ -103,6 +103,9 @@ class SettingsService extends GetxService {
} }
} }
Tuple4<int, int, String, int> serverDetailsSync() =>
Tuple4(prefs.getInt("macos-version") ?? 11, prefs.getInt("macos-minor-version") ?? 0, prefs.getString("server-version") ?? "0.0.0", prefs.getInt("server-version-code") ?? 0);
Future<bool> get isMinSierra async { Future<bool> get isMinSierra async {
final val = await getServerDetails(); final val = await getServerDetails();
return val.item1 > 10 || (val.item1 == 10 && val.item2 > 11); return val.item1 > 10 || (val.item1 == 10 && val.item2 > 11);