Merge remote-tracking branch 'origin/development' into feature/bordea…

…ux/widget-rewrites # Conflicts: # lib/app/layouts/settings/pages/desktop/desktop_panel.dart # lib/app/layouts/settings/pages/server/server_management_panel.dart # lib/app/layouts/settings/pages/theming/avatar/avatar_crop.dart # lib/blocs/chat_bloc.dart # lib/blocs/setup_bloc.dart # lib/helpers/attachment_helper.dart # lib/helpers/attachment_sender.dart # lib/helpers/themes.dart # lib/helpers/utils.dart # lib/layouts/conversation_details/attachment_details_card.dart # lib/layouts/conversation_details/contact_tile.dart # lib/layouts/conversation_details/conversation_details.dart # lib/layouts/conversation_view/text_field/attachments/picker/text_field_attachment_picker.dart # lib/layouts/conversation_view/text_field/blue_bubbles_text_field.dart # lib/layouts/image_viewer/image_viewer.dart # lib/layouts/scrollbar_wrapper.dart # lib/layouts/settings/settings_panel.dart # lib/layouts/settings/theme_panel.dart # lib/layouts/settings/troubleshoot_panel.dart # lib/layouts/setup/qr_scan/qr_scan.dart # lib/layouts/testing_mode.dart # lib/layouts/theming/theming_color_options_list.dart # lib/layouts/widgets/message_widget/message_content/media_players/balloon_bundle_widget.dart # lib/layouts/widgets/message_widget/message_content/media_players/image_widget.dart # lib/layouts/widgets/message_widget/message_content/media_players/regular_file_opener.dart # lib/layouts/widgets/message_widget/message_content/media_players/video_widget.dart # lib/layouts/widgets/message_widget/message_content/message_attachment.dart # lib/layouts/widgets/message_widget/message_details_popup.dart # lib/layouts/widgets/message_widget/sent_message.dart # lib/layouts/widgets/message_widget/show_reply_thread.dart # lib/layouts/widgets/send_effect_picker.dart # lib/main.dart # lib/managers/chat/chat_manager.dart # lib/managers/life_cycle_manager.dart # lib/managers/notification_manager.dart # lib/models/io/message.dart # lib/repository/models/settings.dart # lib/services/backend/sync/full_sync_manager.dart # lib/services/network/http_service.dart # lib/utils/window_effects.dart # macos/Flutter/GeneratedPluginRegistrant.swift # pubspec.lock # pubspec.yaml
Fathi123-max · Dec 9, 2022 · aa9243a · aa9243a
2 parents 03695f2 + 530e972
commit aa9243a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/lib/utils/logger.dart b/lib/utils/logger.dart
@@ -36,14 +36,14 @@ class BaseLogger extends GetxService {
  Future<void> init() async {
  // For now, only do logs on desktop
  if (kIsDesktop) {
- String startupPath = (await getDownloadsDirectory())!.path;
+ String startupPath = (await getApplicationSupportDirectory()).path;
  startupPath = join(startupPath, "BlueBubbles_Logs_Startup.txt");
- startupFile = File(startupPath);
- if (await startupFile.exists()) {
- await startupFile.writeAsString("", mode: FileMode.writeOnly);
- startup.listen((val) async {
+ startupFile = File(startupPath)..createSync();
+ if (startupFile.existsSync()) {
+ startupFile.writeAsStringSync("", mode: FileMode.writeOnly);
+ startup.listen((val) {
  if (val) {
- await writeToStartupFile('----------------${DateTime.now().toLocal()}----------------');
+ writeToStartupFile('----------------${DateTime.now().toLocal()}----------------');
  }
  });
  }
@@ -76,9 +76,9 @@ class BaseLogger extends GetxService {
  logs.clear();
  }
 
- Future<void> writeToStartupFile(String log) async {
- if (kIsDesktop && await startupFile.exists()) {
- await startupFile.writeAsString('$log\n', mode: FileMode.writeOnlyAppend);
+ void writeToStartupFile(String log) {
+ if (kIsDesktop && startupFile.existsSync()) {
+ startupFile.writeAsStringSync('$log\n', mode: FileMode.writeOnlyAppend);
  }
  }
 
@@ -103,11 +103,11 @@ class BaseLogger extends GetxService {
  filePath = fs.appDocDir.path;
  DateTime now = DateTime.now().toLocal();
  filePath = join(filePath, "Saved Logs",
- "BlueBubbles_Logs_${now.year}${now.month}${now.day}_${now.hour}${now.minute}${now.second}.txt");
+ "BlueBubbles_Logs_${now.year}-${now.month}-${now.day}_${now.hour}-${now.minute}-${now.second}.txt");
  }
  File file = File(filePath);
- await file.create(recursive: true);
- await file.writeAsString(logs.join('\n'));
+ file.createSync(recursive: true);
+ file.writeAsStringSync(logs.join('\n'));
 
  // Show the snackbar when finished
  showSnackbar(

diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc
@@ -63,13 +63,13 @@ IDI_APP_ICON ICON "resources\\app_icon.ico"
 #ifdef FLUTTER_BUILD_NUMBER
 #define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER
 #else
-#define VERSION_AS_NUMBER 1,9,102,0
+#define VERSION_AS_NUMBER 1,10,1,0
 #endif
 
 #ifdef FLUTTER_BUILD_NAME
 #define VERSION_AS_STRING #FLUTTER_BUILD_NAME
 #else
-#define VERSION_AS_STRING "1.9.102.0"
+#define VERSION_AS_STRING "1.10.1.0"
 #endif
 
 VS_VERSION_INFO VERSIONINFO