Browse Source

Move message http calls to service class

feature/add-notifications
Tovi Jaeschke-Rogers 2 years ago
parent
commit
e7465238e3
4 changed files with 179 additions and 180 deletions
  1. +175
    -0
      mobile/lib/services/messages_service.dart
  2. +0
    -176
      mobile/lib/utils/storage/messages.dart
  3. +2
    -2
      mobile/lib/views/main/conversation/detail.dart
  4. +2
    -2
      mobile/lib/views/main/home.dart

+ 175
- 0
mobile/lib/services/messages_service.dart View File

@ -0,0 +1,175 @@
import 'dart:convert';
import 'dart:io';
import 'package:http/http.dart' as http;
import 'package:sqflite/sqflite.dart';
import 'package:uuid/uuid.dart';
import '/database/models/messages.dart';
import '/database/models/image_message.dart';
import '/database/models/text_messages.dart';
import '/database/models/conversation_users.dart';
import '/database/models/conversations.dart';
import '/database/models/my_profile.dart';
import '/utils/storage/database.dart';
import '/utils/storage/session_cookie.dart';
import '/utils/storage/write_file.dart';
class MessagesService {
static Future<void> sendMessage(Conversation conversation, {
String? data,
List<File> files = const []
}) async {
MyProfile profile = await MyProfile.getProfile();
var uuid = const Uuid();
ConversationUser currentUser = await getConversationUser(conversation, profile.id);
List<Message> messages = [];
List<Map<String, dynamic>> messagesToSend = [];
final db = await getDatabaseConnection();
if (data != null) {
TextMessage message = TextMessage(
id: uuid.v4(),
symmetricKey: '',
userSymmetricKey: '',
senderId: currentUser.userId,
senderUsername: profile.username,
associationKey: currentUser.associationKey,
createdAt: DateTime.now().toIso8601String(),
failedToSend: false,
text: data,
);
messages.add(message);
messagesToSend.add(await message.payloadJson(
conversation,
));
await db.insert(
'messages',
message.toMap(),
conflictAlgorithm: ConflictAlgorithm.replace,
);
}
for (File file in files) {
String messageId = uuid.v4();
File writtenFile = await writeImage(
messageId,
file.readAsBytesSync(),
);
ImageMessage message = ImageMessage(
id: messageId,
symmetricKey: '',
userSymmetricKey: '',
senderId: currentUser.userId,
senderUsername: profile.username,
associationKey: currentUser.associationKey,
createdAt: DateTime.now().toIso8601String(),
failedToSend: false,
file: writtenFile,
);
messages.add(message);
messagesToSend.add(await message.payloadJson(
conversation,
));
await db.insert(
'messages',
message.toMap(),
conflictAlgorithm: ConflictAlgorithm.replace,
);
}
String sessionCookie = await getSessionCookie();
return http.post(
await MyProfile.getServerUrl('api/v1/auth/message'),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
'cookie': sessionCookie,
},
body: jsonEncode(messagesToSend),
)
.then((resp) {
if (resp.statusCode != 204) {
throw Exception('Unable to send message');
}
})
.catchError((exception) {
for (Message message in messages) {
message.failedToSend = true;
db.update(
'messages',
message.toMap(),
where: 'id = ?',
whereArgs: [message.id],
);
}
throw exception;
});
}
static Future<void> updateMessageThread(Conversation conversation, {MyProfile? profile}) async {
profile ??= await MyProfile.getProfile();
ConversationUser currentUser = await getConversationUser(conversation, profile.id);
var resp = await http.get(
await MyProfile.getServerUrl('api/v1/auth/messages/${currentUser.associationKey}'),
headers: {
'cookie': await getSessionCookie(),
}
);
if (resp.statusCode != 200) {
throw Exception(resp.body);
}
List<dynamic> messageThreadJson = jsonDecode(resp.body);
final db = await getDatabaseConnection();
for (var i = 0; i < messageThreadJson.length; i++) {
var messageJson = messageThreadJson[i] as Map<String, dynamic>;
var message = messageJson['message_data']['attachment_id'] != null ?
await ImageMessage.fromJson(
messageJson,
profile.privateKey!,
) :
TextMessage.fromJson(
messageJson,
profile.privateKey!,
);
ConversationUser messageUser = await getConversationUser(conversation, message.senderId);
message.senderUsername = messageUser.username;
await db.insert(
'messages',
message.toMap(),
conflictAlgorithm: ConflictAlgorithm.replace,
);
}
}
static Future<void> updateMessageThreads({List<Conversation>? conversations}) async {
MyProfile profile = await MyProfile.getProfile();
conversations ??= await getConversations();
for (var i = 0; i < conversations.length; i++) {
await updateMessageThread(conversations[i], profile: profile);
}
}
}

+ 0
- 176
mobile/lib/utils/storage/messages.dart View File

@ -1,176 +0,0 @@
import 'dart:convert';
import 'dart:io';
import 'package:Envelope/utils/storage/write_file.dart';
import 'package:http/http.dart' as http;
import 'package:sqflite/sqflite.dart';
import 'package:uuid/uuid.dart';
import '/database/models/messages.dart';
import '/database/models/image_message.dart';
import '/database/models/text_messages.dart';
import '/database/models/conversation_users.dart';
import '/database/models/conversations.dart';
import '/database/models/my_profile.dart';
import '/utils/storage/database.dart';
import '/utils/storage/session_cookie.dart';
Future<void> sendMessage(Conversation conversation, {
String? data,
List<File> files = const []
}) async {
MyProfile profile = await MyProfile.getProfile();
var uuid = const Uuid();
ConversationUser currentUser = await getConversationUser(conversation, profile.id);
List<Message> messages = [];
List<Map<String, dynamic>> messagesToSend = [];
final db = await getDatabaseConnection();
if (data != null) {
TextMessage message = TextMessage(
id: uuid.v4(),
symmetricKey: '',
userSymmetricKey: '',
senderId: currentUser.userId,
senderUsername: profile.username,
associationKey: currentUser.associationKey,
createdAt: DateTime.now().toIso8601String(),
failedToSend: false,
text: data,
);
messages.add(message);
messagesToSend.add(await message.payloadJson(
conversation,
));
await db.insert(
'messages',
message.toMap(),
conflictAlgorithm: ConflictAlgorithm.replace,
);
}
for (File file in files) {
String messageId = uuid.v4();
File writtenFile = await writeImage(
messageId,
file.readAsBytesSync(),
);
ImageMessage message = ImageMessage(
id: messageId,
symmetricKey: '',
userSymmetricKey: '',
senderId: currentUser.userId,
senderUsername: profile.username,
associationKey: currentUser.associationKey,
createdAt: DateTime.now().toIso8601String(),
failedToSend: false,
file: writtenFile,
);
messages.add(message);
messagesToSend.add(await message.payloadJson(
conversation,
));
await db.insert(
'messages',
message.toMap(),
conflictAlgorithm: ConflictAlgorithm.replace,
);
}
String sessionCookie = await getSessionCookie();
return http.post(
await MyProfile.getServerUrl('api/v1/auth/message'),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
'cookie': sessionCookie,
},
body: jsonEncode(messagesToSend),
)
.then((resp) {
if (resp.statusCode != 204) {
throw Exception('Unable to send message');
}
})
.catchError((exception) {
for (Message message in messages) {
message.failedToSend = true;
db.update(
'messages',
message.toMap(),
where: 'id = ?',
whereArgs: [message.id],
);
}
throw exception;
});
}
Future<void> updateMessageThread(Conversation conversation, {MyProfile? profile}) async {
profile ??= await MyProfile.getProfile();
ConversationUser currentUser = await getConversationUser(conversation, profile.id);
var resp = await http.get(
await MyProfile.getServerUrl('api/v1/auth/messages/${currentUser.associationKey}'),
headers: {
'cookie': await getSessionCookie(),
}
);
if (resp.statusCode != 200) {
throw Exception(resp.body);
}
List<dynamic> messageThreadJson = jsonDecode(resp.body);
final db = await getDatabaseConnection();
for (var i = 0; i < messageThreadJson.length; i++) {
var messageJson = messageThreadJson[i] as Map<String, dynamic>;
var message = messageJson['message_data']['attachment_id'] != null ?
await ImageMessage.fromJson(
messageJson,
profile.privateKey!,
) :
TextMessage.fromJson(
messageJson,
profile.privateKey!,
);
ConversationUser messageUser = await getConversationUser(conversation, message.senderId);
message.senderUsername = messageUser.username;
await db.insert(
'messages',
message.toMap(),
conflictAlgorithm: ConflictAlgorithm.replace,
);
}
}
Future<void> updateMessageThreads({List<Conversation>? conversations}) async {
// try {
MyProfile profile = await MyProfile.getProfile();
conversations ??= await getConversations();
for (var i = 0; i < conversations.length; i++) {
await updateMessageThread(conversations[i], profile: profile);
}
// } catch(SocketException) {
// return;
// }
}

+ 2
- 2
mobile/lib/views/main/conversation/detail.dart View File

@ -1,5 +1,6 @@
import 'dart:io'; import 'dart:io';
import 'package:Envelope/services/messages_service.dart';
import 'package:Envelope/views/main/conversation/message.dart'; import 'package:Envelope/views/main/conversation/message.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:image_picker/image_picker.dart'; import 'package:image_picker/image_picker.dart';
@ -9,7 +10,6 @@ import '/components/file_picker.dart';
import '/database/models/conversations.dart'; import '/database/models/conversations.dart';
import '/database/models/messages.dart'; import '/database/models/messages.dart';
import '/database/models/my_profile.dart'; import '/database/models/my_profile.dart';
import '/utils/storage/messages.dart';
import '/views/main/conversation/settings.dart'; import '/views/main/conversation/settings.dart';
class ConversationDetail extends StatefulWidget{ class ConversationDetail extends StatefulWidget{
@ -258,7 +258,7 @@ class _ConversationDetailState extends State<ConversationDetail> {
if ((msgController.text == '' && selectedImages.isEmpty) || sendDisabled) { if ((msgController.text == '' && selectedImages.isEmpty) || sendDisabled) {
return; return;
} }
await sendMessage(
await MessagesService.sendMessage(
widget.conversation, widget.conversation,
data: msgController.text != '' ? msgController.text : null, data: msgController.text != '' ? msgController.text : null,
files: selectedImages, files: selectedImages,


+ 2
- 2
mobile/lib/views/main/home.dart View File

@ -6,7 +6,7 @@ import '/database/models/friends.dart';
import '/database/models/my_profile.dart'; import '/database/models/my_profile.dart';
import '/services/conversations_service.dart'; import '/services/conversations_service.dart';
import '/services/friends_service.dart'; import '/services/friends_service.dart';
import '/utils/storage/messages.dart';
import '/services/messages_service.dart';
import '/utils/storage/session_cookie.dart'; import '/utils/storage/session_cookie.dart';
import '/views/main/conversation/list.dart'; import '/views/main/conversation/list.dart';
import '/views/main/friend/list.dart'; import '/views/main/friend/list.dart';
@ -155,7 +155,7 @@ class _HomeState extends State<Home> {
await FriendsService.updateFriends(); await FriendsService.updateFriends();
await ConversationsService.updateConversations(); await ConversationsService.updateConversations();
await updateMessageThreads();
await MessagesService.updateMessageThreads();
conversations = await getConversations(); conversations = await getConversations();
friends = await getFriends(accepted: true); friends = await getFriends(accepted: true);


Loading…
Cancel
Save