Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Abtract backend stuff #2711

Open
wants to merge 3 commits into
base: development
Choose a base branch
from
Open

Abtract backend stuff #2711

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0257c9
Merge pull request #2685 from BlueBubblesApp/development
zlshames Feb 24, 2024
d07939e
Abtract backend stuff
TaeHagen Apr 5, 2024
965030e
Abstractions p2
TaeHagen May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
122 changes: 61 additions & 61 deletions lib/app/layouts/chat_creator/chat_creator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import 'package:bluebubbles/app/layouts/conversation_view/pages/messages_view.da
import 'package:bluebubbles/app/wrappers/stateful_boilerplate.dart';
import 'package:bluebubbles/main.dart';
import 'package:bluebubbles/models/models.dart';
import 'package:bluebubbles/services/network/backend_service.dart';
TaeHagen marked this conversation as resolved.
Show resolved Hide resolved
import 'package:bluebubbles/services/services.dart';
import 'package:bluebubbles/utils/string_utils.dart';
import 'package:dio/dio.dart';
Expand Down Expand Up @@ -72,7 +73,7 @@ class ChatCreatorState extends OptimizedState<ChatCreator> {

final messageNode = FocusNode();

bool canCreateGroupChats = ss.canCreateGroupChatSync();
bool canCreateGroupChats = backend.canCreateGroupChats();

@override
void initState() {
Expand Down Expand Up @@ -147,8 +148,7 @@ class ChatCreatorState extends OptimizedState<ChatCreator> {
void addSelected(SelectedContact c) async {
selectedContacts.add(c);
try {
final response = await http.handleiMessageState(c.address);
c.iMessage.value = response.data["data"]["available"];
c.iMessage.value = await backend.handleiMessageState(c.address);
} catch (_) {}
addressController.text = "";
findExistingChat();
Expand Down Expand Up @@ -450,59 +450,60 @@ class ChatCreatorState extends OptimizedState<ChatCreator> {
],
),
),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 15.0).add(const EdgeInsets.only(bottom: 5.0)),
child: ToggleButtons(
constraints: BoxConstraints(minWidth: (ns.width(context) - 35) / 2),
fillColor: context.theme.colorScheme.bubble(context, iMessage).withOpacity(0.2),
splashColor: context.theme.colorScheme.bubble(context, iMessage).withOpacity(0.2),
children: [
const Row(
children: [
Padding(
padding: EdgeInsets.all(8.0),
child: Text("iMessage"),
),
Icon(CupertinoIcons.chat_bubble, size: 16),
],
),
const Row(
children: [
Padding(
padding: EdgeInsets.all(8.0),
child: Text("SMS Forwarding"),
),
Icon(Icons.messenger_outline, size: 16),
],
),
],
borderRadius: BorderRadius.circular(20),
selectedBorderColor: context.theme.colorScheme.bubble(context, iMessage),
selectedColor: context.theme.colorScheme.bubble(context, iMessage),
isSelected: [iMessage, sms],
onPressed: (index) async {
selectedContacts.clear();
addressController.text = "";
if (index == 0) {
setState(() {
iMessage = true;
sms = false;
filteredChats = List<Chat>.from(existingChats.where((e) => e.isIMessage));
});
await cm.setAllInactive();
fakeController.value = null;
} else {
setState(() {
iMessage = false;
sms = true;
filteredChats = List<Chat>.from(existingChats.where((e) => !e.isIMessage));
});
await cm.setAllInactive();
fakeController.value = null;
}
},
if (backend.supportsSmsForwarding())
Padding(
padding: const EdgeInsets.symmetric(horizontal: 15.0).add(const EdgeInsets.only(bottom: 5.0)),
child: ToggleButtons(
constraints: BoxConstraints(minWidth: (ns.width(context) - 35) / 2),
fillColor: context.theme.colorScheme.bubble(context, iMessage).withOpacity(0.2),
splashColor: context.theme.colorScheme.bubble(context, iMessage).withOpacity(0.2),
children: [
const Row(
children: [
Padding(
padding: EdgeInsets.all(8.0),
child: Text("iMessage"),
),
Icon(CupertinoIcons.chat_bubble, size: 16),
],
),
const Row(
children: [
Padding(
padding: EdgeInsets.all(8.0),
child: Text("SMS Forwarding"),
),
Icon(Icons.messenger_outline, size: 16),
],
),
],
borderRadius: BorderRadius.circular(20),
selectedBorderColor: context.theme.colorScheme.bubble(context, iMessage),
selectedColor: context.theme.colorScheme.bubble(context, iMessage),
isSelected: [iMessage, sms],
onPressed: (index) async {
selectedContacts.clear();
addressController.text = "";
if (index == 0) {
setState(() {
iMessage = true;
sms = false;
filteredChats = List<Chat>.from(existingChats.where((e) => e.isIMessage));
});
await cm.setAllInactive();
fakeController.value = null;
} else {
setState(() {
iMessage = false;
sms = true;
filteredChats = List<Chat>.from(existingChats.where((e) => !e.isIMessage));
});
await cm.setAllInactive();
fakeController.value = null;
}
},
),
tneotia marked this conversation as resolved.
Show resolved Hide resolved
),
),
Expanded(
child: Theme(
data: context.theme.copyWith(
Expand Down Expand Up @@ -669,10 +670,10 @@ class ChatCreatorState extends OptimizedState<ChatCreator> {
addressOnSubmitted();
final chat = fakeController.value?.chat ?? await findExistingChat(checkDeleted: true, update: false);
bool existsOnServer = false;
if (chat != null) {
if (chat != null && backend.getRemoteService() != null) {
// if we don't error, then the chat exists
try {
await http.singleChat(chat.guid);
await backend.getRemoteService()!.singleChat(chat.guid);
existsOnServer = true;
} catch (_) {}
}
Expand Down Expand Up @@ -739,9 +740,8 @@ class ChatCreatorState extends OptimizedState<ChatCreator> {
),
);
});
http.createChat(participants, textController.text, method).then((response) async {
backend.createChat(participants, textController.text, method).then((newChat) async {
// Load the chat data and save it to the DB
Chat newChat = Chat.fromMap(response.data["data"]);
newChat = newChat.save();

// Fetch the newly saved chat data from the DB
Expand All @@ -756,8 +756,8 @@ class ChatCreatorState extends OptimizedState<ChatCreator> {
chats.updateChat(newChat);

// Fetch the last message for the chat and save it.
final messageRes = await http.chatMessages(newChat.guid, limit: 1);
if (messageRes.data["data"].length > 0) {
final messageRes = await backend.getRemoteService()?.chatMessages(newChat.guid, limit: 1);
if (messageRes != null && messageRes.data["data"].length > 0) {
tneotia marked this conversation as resolved.
Show resolved Hide resolved
final messages = (messageRes.data["data"] as List<dynamic>).map((e) => Message.fromMap(e)).toList();
await Chat.bulkSyncMessages(newChat, messages);
}
Expand Down
7 changes: 4 additions & 3 deletions lib/app/layouts/conversation_details/conversation_details.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import 'package:bluebubbles/app/layouts/settings/widgets/settings_widgets.dart';
import 'package:bluebubbles/app/wrappers/stateful_boilerplate.dart';
import 'package:bluebubbles/main.dart';
import 'package:bluebubbles/models/models.dart';
import 'package:bluebubbles/services/network/backend_service.dart';
import 'package:bluebubbles/services/services.dart';
import 'package:collection/collection.dart';
import 'package:flutter/cupertino.dart';
Expand Down Expand Up @@ -278,7 +279,7 @@ class _ConversationDetailsState extends OptimizedState<ConversationDetails> with
);
}, childCount: clippedParticipants.length + 2),
),
if (chat.participants.length > 2 && ss.settings.enablePrivateAPI.value && ss.serverDetailsSync().item4 >= 226)
if (chat.participants.length > 2 && ss.settings.enablePrivateAPI.value && backend.canLeaveChat())
SliverToBoxAdapter(
child: Builder(
builder: (context) {
Expand Down Expand Up @@ -321,8 +322,8 @@ class _ConversationDetailsState extends OptimizedState<ConversationDetails> with
);
}
);
final response = await http.leaveChat(chat.guid);
if (response.statusCode == 200) {
final response = await backend.leaveChat(chat);
if (response) {
Get.back();
showSnackbar("Notice", "Left chat successfully!");
} else {
Expand Down
5 changes: 3 additions & 2 deletions lib/app/layouts/conversation_details/dialogs/add_participant.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:bluebubbles/helpers/helpers.dart';
import 'package:bluebubbles/models/models.dart';
import 'package:bluebubbles/services/network/backend_service.dart';
import 'package:bluebubbles/services/services.dart';
import 'package:bluebubbles/utils/string_utils.dart';
import 'package:flutter/material.dart';
Expand Down Expand Up @@ -127,8 +128,8 @@ void showAddParticipant(BuildContext context, Chat chat) {
);
}
);
final response = await http.chatParticipant("add", chat.guid, participantController.text);
if (response.statusCode == 200) {
final response = await backend.chatParticipant(ParticipantOp.Add, chat, participantController.text);
if (response) {
Get.back();
Get.back();
showSnackbar("Notice", "Added ${participantController.text} successfully!");
Expand Down
5 changes: 3 additions & 2 deletions lib/app/layouts/conversation_details/dialogs/change_name.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:bluebubbles/helpers/helpers.dart';
import 'package:bluebubbles/models/models.dart';
import 'package:bluebubbles/services/network/backend_service.dart';
import 'package:bluebubbles/services/services.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
Expand Down Expand Up @@ -39,8 +40,8 @@ void showChangeName(Chat chat, String method, BuildContext context) {
);
}
);
final response = await http.updateChat(chat.guid, controller.text);
if (response.statusCode == 200) {
final response = await backend.renameChat(chat, controller.text);
if (response) {
Get.back();
Get.back();
chat.changeName(controller.text);
Expand Down
21 changes: 9 additions & 12 deletions lib/app/layouts/conversation_details/widgets/chat_info.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import 'package:bluebubbles/helpers/helpers.dart';
import 'package:bluebubbles/app/components/avatars/contact_avatar_group_widget.dart';
import 'package:bluebubbles/app/wrappers/stateful_boilerplate.dart';
import 'package:bluebubbles/models/models.dart';
import 'package:bluebubbles/services/network/backend_service.dart';
import 'package:bluebubbles/services/services.dart';
import 'package:defer_pointer/defer_pointer.dart';
import 'package:flutter/cupertino.dart';
Expand Down Expand Up @@ -88,7 +89,7 @@ class _ChatInfoState extends OptimizedState<ChatInfo> {
if (result != null) {
chat.customAvatarPath = result;
}
if (papi && ss.settings.enablePrivateAPI.value && result != null && (await ss.isMinBigSur) && ss.serverDetailsSync().item4 >= 226) {
if (papi && ss.settings.enablePrivateAPI.value && result != null && await backend.canUploadGroupPhotos()) {
showDialog(
context: context,
builder: (BuildContext context) {
Expand All @@ -110,8 +111,8 @@ class _ChatInfoState extends OptimizedState<ChatInfo> {
);
}
);
final response = await http.setChatIcon(chat.guid, chat.customAvatarPath!);
if (response.statusCode == 200) {
final response = await backend.setChatIcon(chat);
if (response) {
Get.back();
showSnackbar("Notice", "Updated group photo successfully!");
} else {
Expand All @@ -127,15 +128,11 @@ class _ChatInfoState extends OptimizedState<ChatInfo> {
papi = await showMethodDialog("Group Icon Deletion Method");
}
if (papi == null) return;
try {
File file = File(chat.customAvatarPath!);
file.delete();
} catch (_) {}
chat.customAvatarPath = null;
chat.removeProfilePhoto();
tneotia marked this conversation as resolved.
Show resolved Hide resolved
chat.save(updateCustomAvatarPath: true);
if (papi && ss.settings.enablePrivateAPI.value && (await ss.isMinBigSur) && ss.serverDetailsSync().item4 >= 226) {
final response = await http.deleteChatIcon(chat.guid);
if (response.statusCode == 200) {
if (papi && ss.settings.enablePrivateAPI.value && await backend.canUploadGroupPhotos()) {
final response = await backend.deleteChatIcon(chat);
if (response) {
showSnackbar("Notice", "Deleted group photo successfully!");
} else {
showSnackbar("Error", "Failed to delete group photo!");
Expand Down Expand Up @@ -328,7 +325,7 @@ class _ChatInfoState extends OptimizedState<ChatInfo> {
child: Row(
mainAxisAlignment: kIsWeb || kIsDesktop ? MainAxisAlignment.center : MainAxisAlignment.spaceBetween,
children: intersperse(const SizedBox(width: 5), [
if (!kIsWeb && !kIsDesktop && !chat.chatIdentifier!.startsWith("urn:biz")
if (!kIsWeb && !kIsDesktop && !(chat.chatIdentifier?.startsWith("urn:biz") ?? false)
TaeHagen marked this conversation as resolved.
Show resolved Hide resolved
&& ((chat.participants.first.contact?.phones.isNotEmpty ?? false)
|| !chat.participants.first.address.contains("@")))
Expanded(
Expand Down