Merge pull request #89 from Rezivure/staging-v1.0.2

V1.0.2+102 Update

Author: chandlergach

android/app/src/main/AndroidManifest.xml

@@ -8,6 +8,7 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <uses-permission android:name="android.permission.CAMERA" />
 
+
     <application
         android:label="Grid"
         android:name="${applicationName}"

lib/blocs/contacts/contacts_bloc.dart

@@ -1,7 +1,9 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:grid_frontend/repositories/location_repository.dart';
+import 'package:grid_frontend/repositories/sharing_preferences_repository.dart';
 import 'package:grid_frontend/services/room_service.dart';
 import 'package:grid_frontend/repositories/user_repository.dart';
+import 'package:grid_frontend/repositories/sharing_preferences_repository.dart';
 import 'package:grid_frontend/blocs/contacts/contacts_event.dart';
 import 'package:grid_frontend/blocs/contacts/contacts_state.dart';
 import 'package:grid_frontend/models/contact_display.dart';
@@ -17,13 +19,16 @@ class ContactsBloc extends Bloc<ContactsEvent, ContactsState> {
   List<ContactDisplay> _allContacts = []; // Cache for search filtering
   final MapBloc mapBloc;
   final UserLocationProvider userLocationProvider;
+  final SharingPreferencesRepository sharingPreferencesRepository;
 
   ContactsBloc({
     required this.roomService,
     required this.userRepository,
     required this.mapBloc,
     required this.locationRepository,
     required this.userLocationProvider,
+    required this.sharingPreferencesRepository,
+
   }) : super(ContactsInitial()) {
     on<LoadContacts>(_onLoadContacts);
     on<RefreshContacts>(_onRefreshContacts);
@@ -66,6 +71,7 @@ class ContactsBloc extends Bloc<ContactsEvent, ContactsState> {
           userLocationProvider.removeUserLocation(event.userId);
           mapBloc.add(RemoveUserLocation(event.userId));
         }
+        await sharingPreferencesRepository.deleteSharingPreferences(event.userId, 'user');
         _allContacts = await _loadContacts();
         emit(ContactsLoaded(_allContacts));
       }

lib/main.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:grid_frontend/services/android_background_task.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:provider/provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -36,10 +37,16 @@ import 'package:grid_frontend/blocs/contacts/contacts_bloc.dart';
 import 'package:grid_frontend/blocs/groups/groups_bloc.dart';
 
 import 'package:grid_frontend/widgets/version_wrapper.dart';
+import 'package:flutter_background_geolocation/flutter_background_geolocation.dart' as bg;
+
+
+
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
+  bg.BackgroundGeolocation.registerHeadlessTask(headlessTask);
+
   // Load .env file
   await dotenv.load(fileName: ".env");
 
@@ -60,6 +67,7 @@ void main() async {
   await client.init();
 
   // Attempt to restore session
+  // TODO: this code chunk may do nothing actually
   final prefs = await SharedPreferences.getInstance();
   String? token = prefs.getString('token');
 
@@ -72,6 +80,7 @@ void main() async {
     }
   }
 
+
   // Initialize repositories
   final userRepository = UserRepository(databaseService);
   final roomRepository = RoomRepository(databaseService);
@@ -80,7 +89,7 @@ void main() async {
   final userKeysRepository = UserKeysRepository(databaseService);
   final locationManager = LocationManager();
   // Initialize services
-  final userService = UserService(client, locationRepository);
+  final userService = UserService(client, locationRepository, sharingPreferencesRepository);
   final roomService = RoomService(client, userService, userRepository, userKeysRepository, roomRepository, locationRepository, sharingPreferencesRepository, locationManager);
 
   final messageParser = MessageParser();
@@ -145,6 +154,7 @@ void main() async {
               mapBloc: context.read<MapBloc>(),
               locationRepository: context.read<LocationRepository>(),
               userLocationProvider: context.read<UserLocationProvider>(),
+              sharingPreferencesRepository: context.read<SharingPreferencesRepository>(),
             ),
           ),
           BlocProvider<GroupsBloc>(
@@ -169,6 +179,7 @@ void main() async {
               locationRepository,
               context.read<GroupsBloc>(),
               context.read<UserLocationProvider>(),
+              context.read<SharingPreferencesRepository>(),
             )..startSync(),
             update: (context, mapBloc, contactsBloc, groupsBloc, previous) =>
             previous ?? SyncManager(
@@ -182,6 +193,7 @@ void main() async {
               locationRepository,
               groupsBloc,
               context.read<UserLocationProvider>(),
+              sharingPreferencesRepository,
             )..startSync(),
           ),
         ],

lib/models/sharing_preferences.dart

@@ -1,18 +1,20 @@
 import 'dart:convert';
 
+import 'package:grid_frontend/models/sharing_window.dart';
+
 class SharingPreferences {
   final int? id;
-  final String targetId; // ID of the user or group
-  final String targetType; // Type: 'user' or 'group'
-  final bool activeSharing; // Whether sharing is currently active
-  final Map<String, dynamic>? sharePeriods; // Custom sharing periods (optional)
+  final String targetId;
+  final String targetType;
+  final bool activeSharing;
+  final List<SharingWindow>? shareWindows;
 
   SharingPreferences({
     this.id,
     required this.targetId,
     required this.targetType,
     required this.activeSharing,
-    this.sharePeriods,
+    this.shareWindows,
   });
 
   // Convert model to a map for database insertion
@@ -21,21 +23,30 @@ class SharingPreferences {
       'id': id,
       'targetId': targetId,
       'targetType': targetType,
-      'activeSharing': activeSharing ? 1 : 0, // Convert bool to integer
-      'sharePeriods': sharePeriods != null ? jsonEncode(sharePeriods) : null, // Encode as JSON
+      'activeSharing': activeSharing ? 1 : 0,
+      // Encode the list of windows as JSON (or null if no windows)
+      'sharePeriods': shareWindows != null
+          ? jsonEncode(shareWindows!.map((w) => w.toJson()).toList())
+          : null,
     };
   }
 
-  // Create an instance from a database map
+
   factory SharingPreferences.fromMap(Map<String, dynamic> map) {
+    // If 'sharePeriods' is not null, decode it and parse each window
+    final rawJson = map['sharePeriods'] as String?;
+    List<SharingWindow>? windows;
+    if (rawJson != null && rawJson.isNotEmpty) {
+      final List decoded = jsonDecode(rawJson);
+      windows = decoded.map((item) => SharingWindow.fromJson(item)).toList().cast<SharingWindow>();
+    }
+
     return SharingPreferences(
       id: map['id'] as int?,
       targetId: map['targetId'] as String,
       targetType: map['targetType'] as String,
-      activeSharing: (map['activeSharing'] as int) == 1, // Convert integer to bool
-      sharePeriods: map['sharePeriods'] != null
-          ? jsonDecode(map['sharePeriods'] as String) as Map<String, dynamic>
-          : null, // Decode JSON if not null
+      activeSharing: (map['activeSharing'] as int) == 1,
+      shareWindows: windows,
     );
   }
 }

lib/models/sharing_window.dart

@@ -0,0 +1,37 @@
+class SharingWindow {
+  final String label;
+  final List<int> days; // e.g. 0 for Mon, 1 for Tue, ...
+  final bool isAllDay;
+  final String? startTime; // "09:00"
+  final String? endTime;   // "17:00"
+  final bool isActive;     // <--- new field
+
+  SharingWindow({
+    required this.label,
+    required this.days,
+    required this.isAllDay,
+    required this.isActive,
+    this.startTime,
+    this.endTime,
+  });
+
+  Map<String, dynamic> toJson() => {
+    'label': label,
+    'days': days,
+    'isAllDay': isAllDay,
+    'startTime': startTime,
+    'endTime': endTime,
+    'isActive': isActive,
+  };
+
+  factory SharingWindow.fromJson(Map<String, dynamic> json) => SharingWindow(
+    label: json['label'] as String,
+    days: (json['days'] as List<dynamic>).map((e) => e as int).toList(),
+    isAllDay: json['isAllDay'] as bool,
+    startTime: json['startTime'] as String?,
+    endTime: json['endTime'] as String?,
+    isActive: json['isActive'] == null
+        ? true
+        : json['isActive'] as bool,
+  );
+}

lib/providers/auth_provider.dart

@@ -38,7 +38,7 @@ class AuthProvider with ChangeNotifier {
 
     final prefs = await SharedPreferences.getInstance();
     //await prefs.setBool('isLoggedIn', _isLoggedIn);
-    //await prefs.setString('token', jwt);
+    await prefs.setString('loginToken', jwt);
 
     try {
       // Check if we can communicate with the Matrix server

lib/screens/map/map_tab.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:grid_frontend/repositories/sharing_preferences_repository.dart';
+import 'package:grid_frontend/repositories/user_repository.dart';
 import 'package:grid_frontend/services/sync_manager.dart';
 import 'package:latlong2/latlong.dart';
 import 'package:vector_map_tiles/vector_map_tiles.dart';
@@ -21,6 +23,8 @@ import 'package:grid_frontend/services/room_service.dart';
 import 'package:grid_frontend/services/user_service.dart';
 import 'package:grid_frontend/services/location_manager.dart';
 
+import '../../services/backwards_compatibility_service.dart';
+
 
 class MapTab extends StatefulWidget {
   final LatLng? friendLocation;
@@ -36,6 +40,8 @@ class _MapTabState extends State<MapTab> with TickerProviderStateMixin, WidgetsB
   late final RoomService _roomService;
   late final UserService _userService;
   late final SyncManager _syncManager;
+  late final UserRepository userRepository;
+  late final SharingPreferencesRepository sharingPreferencesRepository;
 
   bool _isMapReady = false;
   bool _followUser = true;
@@ -65,6 +71,8 @@ class _MapTabState extends State<MapTab> with TickerProviderStateMixin, WidgetsB
     _userService = context.read<UserService>();
     _locationManager = context.read<LocationManager>();
     _syncManager = context.read<SyncManager>();
+    userRepository = context.read<UserRepository>();
+    sharingPreferencesRepository = context.read<SharingPreferencesRepository>();
 
     _syncManager.initialize();
 
@@ -91,6 +99,15 @@ class _MapTabState extends State<MapTab> with TickerProviderStateMixin, WidgetsB
     _syncManager.handleAppLifecycleState(state == AppLifecycleState.resumed);
   }
 
+  void _backwardsCompatibilityUpdate() async {
+    final backwardsService = BackwardsCompatibilityService(
+      userRepository,
+      sharingPreferencesRepository,
+    );
+
+    await backwardsService.runBackfillIfNeeded();
+  }
+
   Future<void> _loadMapProvider() async {
     try {
       final prefs = await SharedPreferences.getInstance();
@@ -182,7 +199,7 @@ class _MapTabState extends State<MapTab> with TickerProviderStateMixin, WidgetsB
                   theme: _mapTheme,
                   tileProviders: TileProviders({'protomaps': _tileProvider!}),
                   fileCacheTtl: const Duration(hours: 24),
-                  concurrency: 20,
+                  concurrency: 10,
                 ),
                 CurrentLocationLayer(
                   alignPositionOnUpdate: _followUser ? AlignOnUpdate.always : AlignOnUpdate.never,

lib/screens/onboarding/splash_screen.dart

@@ -25,8 +25,8 @@ class _SplashScreenState extends State<SplashScreen> {
     await Future.delayed(Duration(seconds: 2));
 
     // Load the token from SharedPreferences
+    // TODO: delete code perhaps, doesn't seem to do anything or impact
     String? token = await _loadFromPrefs();
-    print(token);
 
     final client = Provider.of<Client>(context, listen: false);