media upload

Author: otsmr

lib/main.dart

@@ -10,11 +10,9 @@ import 'package:twonly/src/providers/connection.provider.dart';
 import 'package:twonly/src/providers/image_editor.provider.dart';
 import 'package:twonly/src/providers/settings.provider.dart';
 import 'package:twonly/src/services/api.service.dart';
-import 'package:twonly/src/services/api/mediafiles/download.service.dart';
-import 'package:twonly/src/services/api/mediafiles/upload.service.dart';
+import 'package:twonly/src/services/api/mediafiles/media_background.service.dart';
 import 'package:twonly/src/services/fcm.service.dart';
 import 'package:twonly/src/services/notifications/setup.notifications.dart';
-import 'package:twonly/src/services/twonly_safe/create_backup.twonly_safe.dart';
 import 'package:twonly/src/utils/log.dart';
 import 'package:twonly/src/utils/storage.dart';
 

lib/src/database/daos/groups.dao.dart

@@ -26,4 +26,9 @@ class GroupsDao extends DatabaseAccessor<TwonlyDB> with _$GroupsDaoMixin {
     await (update(groups)..where((c) => c.groupId.equals(groupId)))
         .write(updates);
   }
+
+  Future<List<GroupMember>> getGroupMembers(String groupId) async {
+    return (select(groupMembers)..where((t) => t.groupId.equals(groupId)))
+        .get();
+  }
 }

lib/src/database/daos/messages.dao.dart

@@ -285,6 +285,14 @@ class MessagesDao extends DatabaseAccessor<TwonlyDB> with _$MessagesDaoMixin {
         .write(updatedValues);
   }
 
+  Future<void> updateMessagesByMediaId(
+    String mediaId,
+    MessagesCompanion updatedValues,
+  ) {
+    return (update(messages)..where((c) => c.mediaId.equals(mediaId)))
+        .write(updatedValues);
+  }
+
   Future<Message?> insertMessage(MessagesCompanion message) async {
     try {
       final rowId = await into(messages).insert(message);

lib/src/database/tables/groups.table.dart

@@ -11,6 +11,8 @@ class Groups extends Table {
   BoolColumn get pinned => boolean().withDefault(const Constant(false))();
   BoolColumn get archived => boolean().withDefault(const Constant(false))();
 
+  TextColumn get groupName => text()();
+
   DateTimeColumn get lastMessageExchange =>
       dateTime().withDefault(currentDateAndTime)();
   DateTimeColumn get createdAt => dateTime().withDefault(currentDateAndTime)();

lib/src/database/tables/mediafiles.table.dart

@@ -15,8 +15,7 @@ enum UploadState {
   // Image was stored but not send
   storedOnly,
   // At this point the user is finished with editing, and the media file can be uploaded
-  compressing,
-  encrypting,
+  preprocessing,
   uploading,
   backgroundUploadTaskStarted,
   uploaded,

lib/src/database/tables/messages.table.dart

@@ -18,6 +18,8 @@ class Messages extends Table {
   TextColumn get mediaId =>
       text().nullable().references(MediaFiles, #mediaId)();
 
+  BoolColumn get mediaStored => boolean().withDefault(const Constant(false))();
+
   BlobColumn get downloadToken => blob().nullable()();
 
   TextColumn get quotesMessageId =>

lib/src/database/twonly.db.g.dart

@@ -24,7 +24,6 @@ import 'package:twonly/src/model/protobuf/api/websocket/server_to_client.pb.dart
     as server;
 import 'package:twonly/src/model/protobuf/api/websocket/server_to_client.pbserver.dart';
 import 'package:twonly/src/services/api/mediafiles/download.service.dart';
-import 'package:twonly/src/services/api/mediafiles/upload.service.dart';
 import 'package:twonly/src/services/api/messages.dart';
 import 'package:twonly/src/services/api/server_messages.dart';
 import 'package:twonly/src/services/api/utils.dart';
@@ -94,7 +93,6 @@ class ApiService {
     if (!globalIsAppInBackground) {
       unawaited(retransmitRawBytes());
       unawaited(tryTransmitMessages());
-      unawaited(retryMediaUpload(false));
       unawaited(tryDownloadAllMediaFiles());
       unawaited(notifyContactsAboutProfileChange());
       twonlyDB.markUpdated();

lib/src/services/api.service.dart

@@ -1,8 +1,13 @@
 import 'dart:async';
 import 'package:background_downloader/background_downloader.dart';
+import 'package:drift/drift.dart' show Value;
 import 'package:flutter/foundation.dart';
+import 'package:twonly/globals.dart';
+import 'package:twonly/src/database/tables/mediafiles.table.dart';
+import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/services/api/mediafiles/download.service.dart';
 import 'package:twonly/src/services/api/mediafiles/upload.service.dart';
+import 'package:twonly/src/services/mediafiles/mediafile.service.dart';
 import 'package:twonly/src/services/twonly_safe/create_backup.twonly_safe.dart';
 import 'package:twonly/src/utils/log.dart';
 
@@ -48,3 +53,59 @@ Future<void> initFileDownloader() async {
     );
   }
 }
+
+Future<void> handleUploadStatusUpdate(TaskStatusUpdate update) async {
+  final mediaId = update.task.taskId.replaceAll('upload_', '');
+  final media = await twonlyDB.mediaFilesDao.getMediaFileById(mediaId);
+
+  if (media == null) {
+    Log.error(
+      'Got an upload task but no upload media in the media upload database',
+    );
+    return;
+  }
+
+  if (update.status == TaskStatus.complete) {
+    if (update.responseStatusCode == 200) {
+      Log.info('Upload of ${media.mediaId} success!');
+
+      await twonlyDB.mediaFilesDao.updateMedia(
+        media.mediaId,
+        const MediaFilesCompanion(
+          uploadState: Value(UploadState.uploaded),
+        ),
+      );
+
+      await twonlyDB.messagesDao.updateMessagesByMediaId(
+        media.mediaId,
+        const MessagesCompanion(
+          ackByServer: Value(true),
+        ),
+      );
+      return;
+    }
+    Log.error(
+      'Got HTTP error ${update.responseStatusCode} for $mediaId',
+    );
+
+    if (update.responseStatusCode == 429) {
+      await twonlyDB.mediaFilesDao.updateMedia(
+        mediaId,
+        const MediaFilesCompanion(
+          uploadState: Value(UploadState.uploadLimitReached),
+        ),
+      );
+      return;
+    }
+  }
+
+  Log.info(
+    'Background upload failed for $mediaId with status ${update.status}. Trying again.',
+  );
+
+  final mediaService = await MediaFileService.fromMedia(media);
+
+  await mediaService.setUploadState(UploadState.uploading);
+  // In all other cases just try the upload again...
+  await startBackgroundMediaUpload(mediaService);
+}