TrashSync: handle API contract changes

lib/services/trash_sync_service.dart

@@ -15,7 +15,6 @@ class TrashSyncService {
   final _logger = Logger("TrashSyncService");
   final _diffFetcher = TrashDiffFetcher();
   final _trashDB = TrashDB.instance;
-  static const kDiffLimit = 2500;
   static const kLastTrashSyncTime = "last_trash_sync_time";
   SharedPreferences _prefs;
 
@@ -32,7 +31,7 @@ class TrashSyncService {
   Future<void> syncTrash() async {
     final lastSyncTime = _getSyncTime();
     _logger.fine('sync trash sinceTime : $lastSyncTime');
-    final diff = await _diffFetcher.getTrashFilesDiff(lastSyncTime, kDiffLimit);
+    final diff = await _diffFetcher.getTrashFilesDiff(lastSyncTime);
     if (diff.trashedFiles.isNotEmpty) {
       _logger.fine("inserting ${diff.trashedFiles.length} items in trash");
       await _trashDB.insertMultiple(diff.trashedFiles);
@@ -53,7 +52,7 @@ class TrashSyncService {
     if (diff.lastSyncedTimeStamp != 0) {
       await _setSyncTime(diff.lastSyncedTimeStamp);
     }
-    if (diff.fetchCount == kDiffLimit) {
+    if (diff.hasMore) {
       return await syncTrash();
     }
   }

lib/utils/trash_diff_fetcher.dart

@@ -16,7 +16,7 @@ class TrashDiffFetcher {
   final _logger = Logger("TrashDiffFetcher");
   final _dio = Network.instance.getDio();
 
-  Future<Diff> getTrashFilesDiff(int sinceTime, int limit) async {
+  Future<Diff> getTrashFilesDiff(int sinceTime) async {
     try {
       final response = await _dio.get(
         Configuration.instance.getHttpEndpoint() + "/trash/diff",
@@ -24,7 +24,6 @@ class TrashDiffFetcher {
             headers: {"X-Auth-Token": Configuration.instance.getToken()}),
         queryParameters: {
           "sinceTime": sinceTime,
-          "limit": limit,
         },
       );
       int latestUpdatedAtTime = 0;
@@ -34,6 +33,7 @@ class TrashDiffFetcher {
       if (response != null) {
         Bus.instance.fire(RemoteSyncEvent(true));
         final diff = response.data["diff"] as List;
+        final bool hasMore = response.data["hasMore"] as bool;
         final startTime = DateTime.now();
         for (final item in diff) {
           final trash = TrashFile();
@@ -89,11 +89,11 @@ class TrashDiffFetcher {
                         startTime.microsecondsSinceEpoch))
                 .inMilliseconds
                 .toString());
-        return Diff(trashedFiles, restoredFiles, deletedFiles, diff.length,
+        return Diff(trashedFiles, restoredFiles, deletedFiles, hasMore,
             latestUpdatedAtTime);
       } else {
         Bus.instance.fire(RemoteSyncEvent(false));
-        return Diff(<TrashFile>[], <TrashFile>[], <TrashFile>[], 0, 0);
+        return Diff(<TrashFile>[], <TrashFile>[], <TrashFile>[], false, 0);
       }
     } catch (e, s) {
       _logger.severe(e, s);
@@ -106,9 +106,9 @@ class Diff {
   final List<TrashFile> trashedFiles;
   final List<TrashFile> restoredFiles;
   final List<TrashFile> deletedFiles;
-  final int fetchCount;
+  final bool hasMore;
   final int lastSyncedTimeStamp;
 
   Diff(this.trashedFiles, this.restoredFiles, this.deletedFiles,
-      this.fetchCount, this.lastSyncedTimeStamp);
+      this.hasMore, this.lastSyncedTimeStamp);
 }