Sync v2

Author: thomasboom

app/lib/providers/game_stats_provider.dart

@@ -5,7 +5,8 @@ import 'package:provider/provider.dart';
 import './settings_provider.dart';
 import '../services/logger.dart';
 import '../services/star_transaction_service.dart';
-import '../services/sync_service.dart';
+import '../services/sync_service_v2.dart';
+import '../services/sync/sync_types_v2.dart';
 import '../services/analytics_service.dart';
 import '../utils/automatic_error_reporter.dart';
 import '../error/error_handler.dart';
@@ -28,7 +29,8 @@ class GameStatsProvider extends ChangeNotifier {
   bool _syncListenerSetup = false;
   final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
   void Function(String message)? onError;
-  SyncService get syncService => SyncService.instance;
+  SyncServiceV2 get syncService => SyncServiceV2.instance;
+  void Function(Map<String, dynamic>)? _syncCallback;
 
   Powerup? _activePowerup;
   DateTime? _powerupActivatedAt;
@@ -103,7 +105,7 @@ class GameStatsProvider extends ChangeNotifier {
       'game_stats',
       onSyncError: (key, error) {
         if (key == 'game_stats') {
-          onError?.call('Synchronisatie mislukt: $error');
+          onError?.call('Synchronisatie mislukt: ${error.message}');
         }
       },
       onSyncSuccess: (key) {
@@ -155,7 +157,8 @@ class GameStatsProvider extends ChangeNotifier {
         AppLogger.info('fetchAllData returned: $allData');
 
         if (allData != null && allData.containsKey('game_stats')) {
-          final syncedStats = allData['game_stats'];
+          final syncedEntry = allData['game_stats'];
+          final syncedStats = syncedEntry?.data;
           AppLogger.info('Found synced game stats: $syncedStats');
 
           if (syncedStats != null) {
@@ -599,11 +602,12 @@ class GameStatsProvider extends ChangeNotifier {
     }
     _syncListenerSetup = true;
     AppLogger.info('Setting up game stats sync listener');
-    syncService.addListener('game_stats', (data) {
+    _syncCallback = (data) {
       AppLogger.info(
           'Received synced game stats update: ${data.keys.toList()}');
       loadImportData(data);
-    });
+    };
+    syncService.addListener('game_stats', _syncCallback!);
   }
 
   /// Triggers immediate sync of game stats to server
@@ -616,8 +620,11 @@ class GameStatsProvider extends ChangeNotifier {
   @override
   void dispose() {
     // Remove sync listeners to prevent memory leaks
-    syncService.removeListener('game_stats');
+    if (_syncCallback != null) {
+      syncService.removeListener('game_stats', _syncCallback!);
+    }
     _syncListenerSetup = false;
+    _syncCallback = null;
     AppLogger.debug('GameStatsProvider disposed - listeners cleaned up');
     super.dispose();
   }

app/lib/providers/lesson_progress_provider.dart

@@ -6,7 +6,8 @@ import 'package:shared_preferences/shared_preferences.dart';
 
 import '../models/lesson.dart';
 import '../services/logger.dart';
-import '../services/sync_service.dart';
+import '../services/sync_service_v2.dart';
+import '../services/sync/sync_types_v2.dart';
 
 /// Tracks per-lesson unlock state and best stars earned.
 /// Simple linear progression: lesson at index 0 starts unlocked; completing a lesson unlocks the next.
@@ -18,13 +19,14 @@ class LessonProgressProvider extends ChangeNotifier {
   bool _isLoading = true;
   String? _error;
   bool _syncListenerSetup = false;
+  void Function(Map<String, dynamic>)? _syncCallback;
 
   /// Number of lessons unlocked from start (sequential from index 0)
   int _unlockedCount = 1;
 
   /// Map: lessonId -> bestStars (0..3)
   final Map<String, int> _bestStarsByLesson = {};
-  SyncService get syncService => SyncService.instance;
+  SyncServiceV2 get syncService => SyncServiceV2.instance;
 
   bool get isLoading => _isLoading;
   String? get error => _error;
@@ -42,7 +44,7 @@ class LessonProgressProvider extends ChangeNotifier {
       'lesson_progress',
       onSyncError: (key, error) {
         if (key == 'lesson_progress') {
-          _error = 'Synchronisatie mislukt: $error';
+          _error = 'Synchronisatie mislukt: ${error.message}';
           notifyListeners();
         }
       },
@@ -93,7 +95,8 @@ class LessonProgressProvider extends ChangeNotifier {
         final allData = await syncService.fetchAllData();
 
         if (allData != null && allData.containsKey('lesson_progress')) {
-          final syncedData = allData['lesson_progress'];
+          final syncedEntry = allData['lesson_progress'];
+          final syncedData = syncedEntry?.data;
           AppLogger.info(
               'Found synced lesson progress, merging with local data');
 
@@ -236,10 +239,11 @@ class LessonProgressProvider extends ChangeNotifier {
     }
     _syncListenerSetup = true;
     AppLogger.info('Setting up lesson progress sync listener');
-    syncService.addListener('lesson_progress', (data) {
+    _syncCallback = (data) {
       AppLogger.info('Received synced lesson progress update');
       loadImportData(data);
-    });
+    };
+    syncService.addListener('lesson_progress', _syncCallback!);
   }
 
   /// Triggers immediate sync of lesson progress to server
@@ -252,8 +256,11 @@ class LessonProgressProvider extends ChangeNotifier {
   @override
   void dispose() {
     // Remove sync listeners to prevent memory leaks
-    syncService.removeListener('lesson_progress');
+    if (_syncCallback != null) {
+      syncService.removeListener('lesson_progress', _syncCallback!);
+    }
     _syncListenerSetup = false;
+    _syncCallback = null;
     AppLogger.debug('LessonProgressProvider disposed - listeners cleaned up');
     super.dispose();
   }

app/lib/providers/settings_provider.dart

@@ -3,7 +3,8 @@ import 'package:flutter/material.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import '../services/logger.dart';
 import '../models/ai_theme.dart';
-import '../services/sync_service.dart';
+import '../services/sync_service_v2.dart';
+import '../services/sync/sync_types_v2.dart';
 import '../utils/automatic_error_reporter.dart';
 import '../error/error_handler.dart';
 import '../error/error_types.dart';
@@ -61,6 +62,7 @@ class SettingsProvider extends ChangeNotifier {
   String? _error;
   String? _selectedCustomThemeKey;
   bool _syncListenerSetup = false;
+  void Function(Map<String, dynamic>)? _syncCallback;
   Set<String> _unlockedThemes = {};
   final Map<String, AITheme> _aiThemes = {};
 
@@ -69,7 +71,7 @@ class SettingsProvider extends ChangeNotifier {
   // Navigation settings
   bool _showNavigationLabels = true;
 
-  SyncService get syncService => SyncService.instance;
+  SyncServiceV2 get syncService => SyncServiceV2.instance;
 
   // Layout type enum
   static const String layoutGrid = 'grid';
@@ -99,7 +101,7 @@ class SettingsProvider extends ChangeNotifier {
       'settings',
       onSyncError: (key, error) {
         if (key == 'settings') {
-          _error = 'Synchronisatie mislukt: $error';
+          _error = 'Synchronisatie mislukt: ${error.message}';
           notifyListeners();
         }
       },
@@ -494,7 +496,7 @@ class SettingsProvider extends ChangeNotifier {
         AppLogger.info('fetchAllData returned: $allData');
 
         if (allData != null && allData.containsKey('settings')) {
-          final syncedSettings = allData['settings'];
+          final syncedSettings = allData['settings']?.data;
           AppLogger.info('Found synced settings: $syncedSettings');
 
           if (syncedSettings != null) {
@@ -515,7 +517,7 @@ class SettingsProvider extends ChangeNotifier {
 
             // Merge AI themes (add themes that don't exist locally)
             final syncedAIThemes =
-                syncedSettings['aiThemes'] as Map<String, dynamic>?;
+                syncedSettings?['aiThemes'] as Map<String, dynamic>?;
             if (syncedAIThemes != null) {
               for (final entry in syncedAIThemes.entries) {
                 final themeId = entry.key;
@@ -1158,17 +1160,21 @@ class SettingsProvider extends ChangeNotifier {
       return;
     }
     _syncListenerSetup = true;
-    syncService.addListener('settings', (data) {
+    _syncCallback = (data) {
       loadImportData(data);
-    });
+    };
+    syncService.addListener('settings', _syncCallback!);
   }
 
   /// Cleans up resources and listeners
   @override
   void dispose() {
     // Remove sync listeners to prevent memory leaks
-    syncService.removeListener('settings');
+    if (_syncCallback != null) {
+      syncService.removeListener('settings', _syncCallback!);
+    }
     _syncListenerSetup = false;
+    _syncCallback = null;
     AppLogger.debug('SettingsProvider disposed - listeners cleaned up');
     super.dispose();
   }