π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mob][photos] Retry failed picker refreshes from the first page
r4khulce8ab6685239
diff --git a/mobile/apps/photos/lib/ui/device_picker/device_picker_controller.dart b/mobile/apps/photos/lib/ui/device_picker/device_picker_controller.dartindex 6819f64356..c3b3c672a8 100644--- a/mobile/apps/photos/lib/ui/device_picker/device_picker_controller.dart+++ b/mobile/apps/photos/lib/ui/device_picker/device_picker_controller.dart@@ -85,18 +85,19 @@ class DevicePickerController extends ChangeNotifier {final folders = await library.albums();if (!_isCurrent(revision)) return;final previousID = album?.id;- albums = folders;- album =+ final nextAlbum =folders.where((item) => item.id == previousID).firstOrNull ??folders.where((item) => item.isAll).firstOrNull ??folders.firstOrNull;- final length = album?.id == previousID+ final length = nextAlbum?.id == previousID? math.max(batchSize, _nextOffset): batchSize;- final items = album == null+ final items = nextAlbum == null? <AssetEntity>[]- : await library.read(album!, start: 0, end: length);+ : await library.read(nextAlbum, start: 0, end: length);if (!_isCurrent(revision)) return;+ albums = folders;+ album = nextAlbum;media = _unique(items);_mediaIDs..clear()@@ -109,6 +110,7 @@ class DevicePickerController extends ChangeNotifier {} catch (exception, stack) {if (_isCurrent(revision)) {error = exception;+ hasMore = false;_log.warning("Could not refresh device media", exception, stack);}} finally {diff --git a/mobile/apps/photos/test/ui/device_picker/device_picker_controller_test.dart b/mobile/apps/photos/test/ui/device_picker/device_picker_controller_test.dartindex 50813938ef..d842a9baa4 100644--- a/mobile/apps/photos/test/ui/device_picker/device_picker_controller_test.dart+++ b/mobile/apps/photos/test/ui/device_picker/device_picker_controller_test.dart@@ -98,6 +98,38 @@ void main() {expect(model.selection.single.id, '0');});+ test(+ 'failed album refresh keeps its snapshot and retries from the start',+ () async {+ library.items = List.generate(100, (index) => media('old-$index'));+ await model.refresh();+ library.folders.removeAt(0);+ library.readOverride = (_, _, _) =>+ Future.error(StateError('Unavailable'));+ await model.refresh();+ expect(model.album!.id, 'recent');+ expect(model.media.first.id, 'old-0');+ expect(model.media.length, 96);+ expect(model.hasMore, isFalse);+ expect(model.error, isNotNull);++ final starts = <int>[];+ final replacement = List.generate(100, (index) => media('new-$index'));+ library.readOverride = (album, start, end) async {+ expect(album.id, 'camera');+ starts.add(start);+ return replacement.skip(start).take(end - start).toList();+ };+ await model.refresh();+ expect(model.album!.id, 'camera');+ expect(model.media, replacement.take(96));+ expect(model.error, isNull);+ await model.loadMore();+ expect(starts, [0, 96]);+ expect(model.media, replacement);+ },+ );+test('confirmation removes unavailable selections and requires review',() async {