bump version and fix issue

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 0.1.0
+## 0.1.1
 
 - New: Groups can now collect flames as well
 - New: Background execution to pre-load messages 

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

@@ -26,8 +26,9 @@ class MediaFilesDao extends DatabaseAccessor<TwonlyDB>
 
       final rowId = await into(mediaFiles).insert(insertMediaFile);
 
-      return await (select(mediaFiles)..where((t) => t.rowId.equals(rowId)))
+      return await (select(
-          .getSingle();
+        mediaFiles,
+      )..where((t) => t.rowId.equals(rowId))).getSingle();
     } catch (e) {
       Log.error('Could not insert media file: $e');
       return null;
@@ -35,8 +36,7 @@ class MediaFilesDao extends DatabaseAccessor<TwonlyDB>
   }
 
   Future<void> deleteMediaFile(String mediaId) async {
-    await (delete(mediaFiles)
+    await (delete(mediaFiles)..where(
-          ..where(
           (t) => t.mediaId.equals(mediaId),
         ))
         .go();
@@ -46,8 +46,9 @@ class MediaFilesDao extends DatabaseAccessor<TwonlyDB>
     String mediaId,
     MediaFilesCompanion updates,
   ) async {
-    await (update(mediaFiles)..where((c) => c.mediaId.equals(mediaId)))
+    await (update(
-        .write(updates);
+      mediaFiles,
+    )..where((c) => c.mediaId.equals(mediaId))).write(updates);
   }
 
   Future<void> updateAllMediaFiles(
@@ -57,14 +58,15 @@ class MediaFilesDao extends DatabaseAccessor<TwonlyDB>
   }
 
   Future<MediaFile?> getMediaFileById(String mediaId) async {
-    return (select(mediaFiles)..where((t) => t.mediaId.equals(mediaId)))
+    return (select(
-        .getSingleOrNull();
+      mediaFiles,
+    )..where((t) => t.mediaId.equals(mediaId))).getSingleOrNull();
   }
 
   Future<MediaFile?> getDraftMediaFile() async {
-    final medias = await (select(mediaFiles)
+    final medias = await (select(
-          ..where((t) => t.isDraftMedia.equals(true)))
+      mediaFiles,
-        .get();
+    )..where((t) => t.isDraftMedia.equals(true))).get();
     if (medias.isEmpty) {
       return null;
     }
@@ -72,13 +74,13 @@ class MediaFilesDao extends DatabaseAccessor<TwonlyDB>
   }
 
   Stream<MediaFile?> watchMedia(String mediaId) {
-    return (select(mediaFiles)..where((t) => t.mediaId.equals(mediaId)))
+    return (select(
-        .watchSingleOrNull();
+      mediaFiles,
+    )..where((t) => t.mediaId.equals(mediaId))).watchSingleOrNull();
   }
 
   Future<void> resetPendingDownloadState() async {
-    await (update(mediaFiles)
+    await (update(mediaFiles)..where(
-          ..where(
           (c) => c.downloadState.equals(
             DownloadState.downloading.name,
           ),
@@ -91,8 +93,7 @@ class MediaFilesDao extends DatabaseAccessor<TwonlyDB>
   }
 
   Future<List<MediaFile>> getAllMediaFilesPendingDownload() async {
-    return (select(mediaFiles)
+    return (select(mediaFiles)..where(
-          ..where(
           (t) =>
               t.downloadState.equals(DownloadState.pending.name) |
               t.downloadState.equals(DownloadState.downloading.name),
@@ -101,25 +102,23 @@ class MediaFilesDao extends DatabaseAccessor<TwonlyDB>
   }
 
   Future<List<MediaFile>> getAllMediaFilesReuploadRequested() async {
-    return (select(mediaFiles)
+    return (select(mediaFiles)..where(
-          ..where(
           (t) => t.downloadState.equals(DownloadState.reuploadRequested.name),
         ))
         .get();
   }
 
   Future<List<MediaFile>> getAllNonHashedStoredMediaFiles() async {
-    return (select(mediaFiles)
+    return (select(mediaFiles)..where(
-          ..where(
           (t) => t.stored.equals(true) & t.storedFileHash.isNull(),
         ))
         .get();
   }
 
   Future<List<MediaFile>> getAllMediaFilesPendingUpload() async {
-    return (select(mediaFiles)
+    return (select(mediaFiles)..where(
-          ..where(
+          (t) =>
-            (t) => (t.uploadState.equals(UploadState.initialized.name) |
+              (t.uploadState.equals(UploadState.initialized.name) |
               t.uploadState.equals(UploadState.uploadLimitReached.name) |
               t.uploadState.equals(UploadState.uploading.name) |
               t.uploadState.equals(UploadState.preprocessing.name)),
@@ -128,8 +127,8 @@ class MediaFilesDao extends DatabaseAccessor<TwonlyDB>
   }
 
   Stream<List<MediaFile>> watchAllStoredMediaFiles() {
-    final query = (select(mediaFiles)..where((t) => t.stored.equals(true)))
+    final query =
-        .join([])
+        (select(mediaFiles)..where((t) => t.stored.equals(true))).join([])
           ..groupBy([mediaFiles.storedFileHash]);
     return query.map((row) => row.readTable(mediaFiles)).watch();
   }
@@ -142,8 +141,7 @@ class MediaFilesDao extends DatabaseAccessor<TwonlyDB>
   }
 
   Future<void> updateAllRetransmissionUploadingState() async {
-    await (update(mediaFiles)
+    await (update(mediaFiles)..where(
-          ..where(
           (t) =>
               t.uploadState.equals(UploadState.uploading.name) &
               t.reuploadRequestedBy.isNotNull(),

lib/src/services/api/mediafiles/upload.service.dart

@@ -30,10 +30,9 @@ Future<void> finishStartedPreprocessing() async {
   final mediaFiles = await twonlyDB.mediaFilesDao
       .getAllMediaFilesPendingUpload();
 
-  Log.info('There are ${mediaFiles.length} media files pending');
-
   for (final mediaFile in mediaFiles) {
     if (mediaFile.isDraftMedia) {
+      Log.info('Ignoring media files as it is a draft');
       continue;
     }
     try {
@@ -51,6 +50,9 @@ Future<void> finishStartedPreprocessing() async {
         await twonlyDB.mediaFilesDao.deleteMediaFile(mediaFile.mediaId);
         continue;
       }
+      Log.info(
+        'Finishing started preprocessing of ${mediaFile.mediaId} in state ${mediaFile.uploadState}.',
+      );
       await startBackgroundMediaUpload(service);
     } catch (e) {
       Log.warn(e);

lib/src/services/background/callback_dispatcher.background.dart

@@ -51,16 +51,16 @@ void callbackDispatcher() {
 
 Future<bool> initBackgroundExecution() async {
   SentryWidgetsFlutterBinding.ensureInitialized();
+  globalApplicationCacheDirectory = (await getApplicationCacheDirectory()).path;
+  globalApplicationSupportDirectory =
+      (await getApplicationSupportDirectory()).path;
+
   initLogger();
 
   final user = await getUser();
   if (user == null) return false;
   gUser = user;
 
-  globalApplicationCacheDirectory = (await getApplicationCacheDirectory()).path;
-  globalApplicationSupportDirectory =
-      (await getApplicationSupportDirectory()).path;
-
   twonlyDB = TwonlyDB();
   apiService = ApiService();
   globalIsInBackgroundTask = true;
@@ -92,7 +92,7 @@ Future<void> handlePeriodicTask() async {
       await KeyValueStore.put(KeyValueKeys.lastPeriodicTaskExecution, {
         'timestamp': DateTime.now().millisecondsSinceEpoch,
       });
-      return false;
+      return true;
     },
   );
 

pubspec.yaml

@@ -3,7 +3,7 @@ description: "twonly, a privacy-friendly way to connect with friends through sec
 
 publish_to: 'none'
 
-version: 0.1.0+100
+version: 0.1.1+101
 
 environment:
   sdk: ^3.11.0