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

tons of refactors

Browse Source 
- centralized Database class
- centralized startup tasks
- renamed box variables
- removed all imports of main.dart
This commit is contained in:
zlshames
2024-08-15 09:40:01 -04:00
parent 35bff73056
commit bee39456e3
51 changed files with 725 additions and 622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/services/backend/java_dart_interop/background_isolate.dart
View File

@ -1,8 +1,8 @@
import 'dart:ui';
import 'package:bluebubbles/main.dart';
import 'package:bluebubbles/helpers/backend/startup_tasks.dart';
import 'package:bluebubbles/services/network/http_overrides.dart';
import 'package:bluebubbles/services/services.dart';
import 'package:bluebubbles/utils/logger/logger.dart';
import 'package:flutter/material.dart';
import 'package:universal_io/io.dart';
@ -20,12 +20,5 @@ backgroundIsolateEntrypoint() async {
WidgetsFlutterBinding.ensureInitialized();
HttpOverrides.global = BadCertOverride();
await fs.init(headless: true);
await Logger.init();
await ss.init(headless: true);
await initDatabase();
await mcs.init(headless: true);
await ls.init(headless: true);
await StartupTasks.initIsolateServices();
}

9
lib/services/backend/java_dart_interop/intents_service.dart
View File

@ -3,8 +3,9 @@ import 'dart:async';
import 'package:bluebubbles/app/layouts/settings/pages/scheduling/scheduled_messages_panel.dart';
import 'package:bluebubbles/app/layouts/settings/pages/server/server_management_panel.dart';
import 'package:bluebubbles/app/wrappers/theme_switcher.dart';
import 'package:bluebubbles/helpers/backend/startup_tasks.dart';
import 'package:bluebubbles/helpers/ui/facetime_helpers.dart';
import 'package:bluebubbles/main.dart';
import 'package:bluebubbles/utils/logger/logger.dart';
import 'package:bluebubbles/helpers/helpers.dart';
import 'package:bluebubbles/app/layouts/chat_creator/chat_creator.dart';
@ -101,7 +102,7 @@ class IntentsService extends GetxService {
ls.isBubble = bubble;
await openChat(guid);
} else if (intent.extra?["callUuid"] != null) {
await uiStartup.future;
await StartupTasks.waitForUI();
if (intent.extra?["answer"] == true) {
await answerFaceTime(intent.extra?["callUuid"]!);
} else {
@ -161,7 +162,7 @@ class IntentsService extends GetxService {
if (guid == null) {
Logger.debug("Awaiting UI startup...", tag: "IntentsService");
await uiStartup.future;
await StartupTasks.waitForUI();
Logger.debug("UI has completed startup. Pushing conversation route...", tag: "IntentsService");
ns.pushAndRemoveUntil(
Get.context!,
@ -204,7 +205,7 @@ class IntentsService extends GetxService {
if (!chatIsOpen) {
Logger.debug("Awaiting UI startup...", tag: "IntentsService");
await uiStartup.future;
await StartupTasks.waitForUI();
Logger.debug("UI has completed startup. Pushing conversation route...", tag: "IntentsService");
await ns.pushAndRemoveUntil(
Get.context!,

24
lib/services/backend/java_dart_interop/method_channel_service.dart
View File

@ -2,9 +2,9 @@ import 'dart:async';
import 'dart:convert';
import 'package:bluebubbles/helpers/backend/settings_helpers.dart';
import 'package:bluebubbles/models/database.dart';
import 'package:bluebubbles/utils/logger/logger.dart';
import 'package:bluebubbles/helpers/helpers.dart';
import 'package:bluebubbles/main.dart';
import 'package:bluebubbles/models/models.dart';
import 'package:bluebubbles/services/services.dart';
import 'package:flutter/foundation.dart';
@ -49,7 +49,7 @@ class MethodChannelService extends GetxService {
switch (call.method) {
case "NewServerUrl":
if (arguments == null) return false;
await storeStartup.future;
await Database.waitForInit();
String address = arguments["server_url"];
bool updated = await saveNewServerUrl(address, restartSocket: false);
@ -58,7 +58,7 @@ class MethodChannelService extends GetxService {
}
return true;
case "new-message":
await storeStartup.future;
await Database.waitForInit();
Logger.info("Received new message from MethodChannel");
// The socket will handle this event if the app is alive
@ -83,7 +83,7 @@ class MethodChannelService extends GetxService {
}
return true;
case "updated-message":
await storeStartup.future;
await Database.waitForInit();
Logger.info("Received updated message from MethodChannel");
// The socket will handle this event if the app is alive
@ -126,7 +126,7 @@ class MethodChannelService extends GetxService {
case "participant-removed":
case "participant-added":
case "participant-left":
await storeStartup.future;
await Database.waitForInit();
Logger.info("Received ${call.method} from MethodChannel");
// The socket will handle this event if the app is alive
@ -148,7 +148,7 @@ class MethodChannelService extends GetxService {
}
return true;
case "group-icon-changed":
await storeStartup.future;
await Database.waitForInit();
Logger.info("Received group icon change from MethodChannel");
// The socket will handle this event if the app is alive
@ -186,7 +186,7 @@ class MethodChannelService extends GetxService {
}
return true;
case "ReplyChat":
await storeStartup.future;
await Database.waitForInit();
Logger.info("Received reply to message from Kotlin");
final Map<String, dynamic>? data = arguments;
if (data == null) return false;
@ -219,7 +219,7 @@ class MethodChannelService extends GetxService {
}
case "MarkChatRead":
if (ls.isAlive) return true;
await storeStartup.future;
await Database.waitForInit();
Logger.info("Received markAsRead from Kotlin");
try {
final Map<String, dynamic>? data = arguments;
@ -236,7 +236,7 @@ class MethodChannelService extends GetxService {
return false;
case "chat-read-status-changed":
if (ls.isAlive) return true;
await storeStartup.future;
await Database.waitForInit();
Logger.info("Received chat status change from FCM");
try {
Map<String, dynamic>? data = arguments;
@ -256,7 +256,7 @@ class MethodChannelService extends GetxService {
return Future.error(e, s);
}
case "MediaColors":
await storeStartup.future;
await Database.waitForInit();
if (!ss.settings.colorsFromMedia.value) return false;
final Uint8List art = call.arguments["albumArt"];
if (Get.context != null && (!isRunning || art != previousArt)) {
@ -265,7 +265,7 @@ class MethodChannelService extends GetxService {
}
return true;
case "incoming-facetime":
await storeStartup.future;
await Database.waitForInit();
Logger.info("Received legacy incoming facetime from FCM");
try {
Map<String, dynamic>? data = arguments;
@ -279,7 +279,7 @@ class MethodChannelService extends GetxService {
return true;
case "ft-call-status-changed":
if (ls.isAlive) return true;
await storeStartup.future;
await Database.waitForInit();
Logger.info("Received facetime call status change from FCM");
try {
Map<String, dynamic>? data = arguments;