fixing memories

Author: otsmr

lib/app.dart

@@ -6,7 +6,6 @@ import 'package:twonly/globals.dart';
 import 'package:twonly/src/localization/generated/app_localizations.dart';
 import 'package:twonly/src/providers/connection.provider.dart';
 import 'package:twonly/src/providers/settings.provider.dart';
-import 'package:twonly/src/services/api/mediafiles/upload.service.dart';
 import 'package:twonly/src/utils/storage.dart';
 import 'package:twonly/src/views/components/app_outdated.dart';
 import 'package:twonly/src/views/home.view.dart';
@@ -68,8 +67,6 @@ class _AppState extends State<App> with WidgetsBindingObserver {
     await setUserPlan();
     await apiService.connect(force: true);
     await apiService.listenToNetworkChanges();
-    // call this function so invalid media files are get purged
-    await retryMediaUpload(true);
   }
 
   @override
@@ -84,7 +81,6 @@ class _AppState extends State<App> with WidgetsBindingObserver {
     } else if (state == AppLifecycleState.paused) {
       wasPaused = true;
       globalIsAppInBackground = true;
-      unawaited(handleUploadWhenAppGoesBackground());
     }
   }
 

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

@@ -25,6 +25,14 @@ class MediaFilesDao extends DatabaseAccessor<TwonlyDB>
     }
   }
 
+  Future<void> deleteMediaFile(String mediaId) async {
+    await (delete(mediaFiles)
+          ..where(
+            (t) => t.mediaId.equals(mediaId),
+          ))
+        .go();
+  }
+
   Future<void> updateMedia(
     String mediaId,
     MediaFilesCompanion updates,
@@ -57,4 +65,8 @@ class MediaFilesDao extends DatabaseAccessor<TwonlyDB>
           ..where((t) => t.downloadState.equals(DownloadState.pending.name)))
         .get();
   }
+
+  Stream<List<MediaFile>> watchAllStoredMediaFiles() {
+    return (select(mediaFiles)..where((t) => t.stored.equals(true))).watch();
+  }
 }

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

@@ -4,6 +4,8 @@ import 'package:twonly/src/database/tables/contacts.table.dart';
 import 'package:twonly/src/database/tables/groups.table.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart';
 
+enum MessageType { media, text }
+
 @DataClassName('Message')
 class Messages extends Table {
   TextColumn get groupId =>
@@ -14,9 +16,12 @@ class Messages extends Table {
   IntColumn get senderId =>
       integer().nullable().references(Contacts, #userId)();
 
+  TextColumn get type => textEnum<MessageType>()();
+
   TextColumn get content => text().nullable()();
-  TextColumn get mediaId =>
-      text().nullable().references(MediaFiles, #mediaId)();
+  TextColumn get mediaId => text()
+      .nullable()
+      .references(MediaFiles, #mediaId, onDelete: KeyAction.cascade)();
 
   BoolColumn get mediaStored => boolean().withDefault(const Constant(false))();