beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Prompt for permissions only when sync is triggered in the foreground

Browse source
This commit is contained in:
Vishnu Mohandas 2021-01-13 23:09:33 +05:30
parent 06b679fca8
commit 4f18ef6140
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/services/sync_service.dart
View file

@ -49,7 +49,7 @@ class SyncService {
Connectivity().onConnectivityChanged.listen((ConnectivityResult result) { Connectivity().onConnectivityChanged.listen((ConnectivityResult result) {
_logger.info("Connectivity change detected " + result.toString()); _logger.info("Connectivity change detected " + result.toString());
sync(); sync(isAppInBackground: true);
}); });
Bus.instance.on<SyncStatusUpdate>().listen((event) { Bus.instance.on<SyncStatusUpdate>().listen((event) {
@ -68,7 +68,7 @@ class SyncService {
} }
} }
Future<void> sync() async { Future<void> sync({bool isAppInBackground = false}) async {
_syncStopRequested = false; _syncStopRequested = false;
if (_isSyncInProgress) { if (_isSyncInProgress) {
_logger.warning("Sync already in progress, skipping."); _logger.warning("Sync already in progress, skipping.");
@ -78,7 +78,7 @@ class SyncService {
_existingSync = Future<void>(() async { _existingSync = Future<void>(() async {
_logger.info("Syncing..."); _logger.info("Syncing...");
try { try {
await _doSync(); await _doSync(isAppInBackground: isAppInBackground);
if (_lastSyncStatusEvent != null) { if (_lastSyncStatusEvent != null) {
Bus.instance.fire(SyncStatusUpdate(SyncStatus.completed)); Bus.instance.fire(SyncStatusUpdate(SyncStatus.completed));
} }
@ -121,15 +121,19 @@ class SyncService {
return _lastSyncStatusEvent; return _lastSyncStatusEvent;
} }
Future<void> _doSync() async { Future<void> _doSync({bool isAppInBackground = false}) async {
final existingLocalFileIDs = await _db.getExistingLocalFileIDs(); final existingLocalFileIDs = await _db.getExistingLocalFileIDs();
final syncStartTime = DateTime.now().microsecondsSinceEpoch; final syncStartTime = DateTime.now().microsecondsSinceEpoch;
final result = await PhotoManager.requestPermission(); if (isAppInBackground) {
if (!result) { await PhotoManager.setIgnorePermissionCheck(true);
_logger.severe("Did not get permission"); } else {
await _prefs.setInt(_dbUpdationTimeKey, syncStartTime); final result = await PhotoManager.requestPermission();
await FileRepository.instance.reloadFiles(); if (!result) {
return await syncWithRemote(); _logger.severe("Did not get permission");
await _prefs.setInt(_dbUpdationTimeKey, syncStartTime);
await FileRepository.instance.reloadFiles();
return await syncWithRemote();
}
} }
final lastDBUpdationTime = _prefs.getInt(_dbUpdationTimeKey); final lastDBUpdationTime = _prefs.getInt(_dbUpdationTimeKey);
if (lastDBUpdationTime != null && lastDBUpdationTime != 0) { if (lastDBUpdationTime != null && lastDBUpdationTime != 0) {