various null/default fixes

android/app/src/main/java/deckers/thibault/aves/model/AvesImageEntry.java

@@ -21,9 +21,9 @@ public class AvesImageEntry {
         this.uri = Uri.parse((String) map.get("uri"));
         this.path = (String) map.get("path");
         this.mimeType = (String) map.get("mimeType");
-        this.width = (int) map.get("width");
+        this.width = (Integer) map.get("width");
-        this.height = (int) map.get("height");
+        this.height = (Integer) map.get("height");
-        this.orientationDegrees = (int) map.get("orientationDegrees");
+        this.orientationDegrees = (Integer) map.get("orientationDegrees");
         this.dateModifiedSecs = toLong(map.get("dateModifiedSecs"));
     }
 

lib/model/image_entry.dart

@@ -41,15 +41,16 @@ class ImageEntry {
     String path,
     this.contentId,
     this.sourceMimeType,
-    this.width,
+    @required this.width,
-    this.height,
+    @required this.height,
     this.orientationDegrees,
     this.sizeBytes,
     this.sourceTitle,
     this.dateModifiedSecs,
     this.sourceDateTakenMillis,
     this.durationMillis,
-  }) {
+  })  : assert(width != null),
+        assert(height != null) {
     this.path = path;
   }
 
@@ -86,8 +87,8 @@ class ImageEntry {
       path: map['path'] as String,
       contentId: map['contentId'] as int,
       sourceMimeType: map['sourceMimeType'] as String,
-      width: map['width'] as int,
+      width: map['width'] as int ?? 0,
-      height: map['height'] as int,
+      height: map['height'] as int ?? 0,
       orientationDegrees: map['orientationDegrees'] as int,
       sizeBytes: map['sizeBytes'] as int,
       sourceTitle: map['title'] as String,
@@ -210,7 +211,7 @@ class ImageEntry {
   String _durationText;
 
   String get durationText {
-    _durationText ??= formatDuration(Duration(milliseconds: durationMillis));
+    _durationText ??= formatDuration(Duration(milliseconds: durationMillis ?? 0));
     return _durationText;
   }
 
@@ -268,7 +269,7 @@ class ImageEntry {
     await catalog(background: background);
     final latitude = _catalogMetadata?.latitude;
     final longitude = _catalogMetadata?.longitude;
-    if (latitude == null || longitude == null) return;
+    if (latitude == null || longitude == null || (latitude == 0 && longitude == 0)) return;
 
     final coordinates = Coordinates(latitude, longitude);
     try {

lib/services/image_file_service.dart

@@ -66,7 +66,7 @@ class ImageFileService {
     return null;
   }
 
-  static Future<Uint8List> getImage(String uri, String mimeType, {int expectedContentLength, BytesReceivedCallback onBytesReceived}) {
+  static Future<Uint8List> getImage(String uri, String mimeType, {int orientationDegrees, int expectedContentLength, BytesReceivedCallback onBytesReceived}) {
     try {
       final completer = Completer<Uint8List>.sync();
       final sink = _OutputBuffer();
@@ -74,6 +74,7 @@ class ImageFileService {
       byteChannel.receiveBroadcastStream(<String, dynamic>{
         'uri': uri,
         'mimeType': mimeType,
+        'orientationDegrees': orientationDegrees ?? 0,
       }).listen(
         (data) {
           final chunk = data as Uint8List;
@@ -103,6 +104,9 @@ class ImageFileService {
   }
 
   static Future<Uint8List> getThumbnail(ImageEntry entry, double width, double height, {Object taskKey, int priority}) {
+    if (entry.isSvg) {
+      return Future.sync(() => Uint8List(0));
+    }
     return servicePolicy.call(
       () async {
         try {

lib/widgets/album/thumbnail/raster.dart

@@ -126,6 +126,7 @@ class _ThumbnailRasterImageState extends State<ThumbnailRasterImage> {
                 final imageProvider = UriImage(
                   uri: entry.uri,
                   mimeType: entry.mimeType,
+                  orientationDegrees: entry.orientationDegrees,
                   expectedContentLength: entry.sizeBytes,
                 );
                 if (imageCache.statusForKey(imageProvider).keepAlive) {

lib/widgets/common/action_delegates/entry_action_delegate.dart

@@ -76,12 +76,13 @@ class EntryActionDelegate with FeedbackMixin, PermissionAwareMixin {
   Future<void> _print(ImageEntry entry) async {
     final uri = entry.uri;
     final mimeType = entry.mimeType;
+    final orientationDegrees = entry.orientationDegrees;
     final documentName = entry.bestTitle ?? 'Aves';
     final doc = pdf.Document(title: documentName);
 
     PdfImage pdfImage;
     if (entry.isSvg) {
-      final bytes = await ImageFileService.getImage(uri, mimeType);
+      final bytes = await ImageFileService.getImage(uri, mimeType, orientationDegrees: entry.orientationDegrees);
       if (bytes != null && bytes.isNotEmpty) {
         final svgRoot = await svg.fromSvgBytes(bytes, uri);
         final viewBox = svgRoot.viewport.viewBox;
@@ -97,7 +98,11 @@ class EntryActionDelegate with FeedbackMixin, PermissionAwareMixin {
     } else {
       pdfImage = await pdfImageFromImageProvider(
         pdf: doc.document,
-        image: UriImage(uri: uri, mimeType: mimeType),
+        image: UriImage(
+          uri: uri,
+          mimeType: mimeType,
+          orientationDegrees: orientationDegrees,
+        ),
       );
     }
     if (pdfImage != null) {

lib/widgets/common/image_providers/uri_image_provider.dart

@@ -11,13 +11,14 @@ class UriImage extends ImageProvider<UriImage> {
   const UriImage({
     @required this.uri,
     @required this.mimeType,
+    @required this.orientationDegrees,
     this.expectedContentLength,
     this.scale = 1.0,
   })  : assert(uri != null),
         assert(scale != null);
 
   final String uri, mimeType;
-  final int expectedContentLength;
+  final int orientationDegrees, expectedContentLength;
   final double scale;
 
   @override
@@ -46,6 +47,7 @@ class UriImage extends ImageProvider<UriImage> {
       final bytes = await ImageFileService.getImage(
         uri,
         mimeType,
+        orientationDegrees: orientationDegrees,
         expectedContentLength: expectedContentLength,
         onBytesReceived: (cumulative, total) {
           chunkEvents.add(ImageChunkEvent(

lib/widgets/fullscreen/debug.dart

@@ -60,6 +60,14 @@ class _FullscreenDebugPageState extends State<FullscreenDebugPage> {
   }
 
   Widget _buildEntryTabView() {
+    String toDateValue(int time, {int factor = 1}) {
+      var value = '$time';
+      if (time != null && time > 0) {
+        value += ' (${DateTime.fromMillisecondsSinceEpoch(time * factor)})';
+      }
+      return value;
+    }
+
     return ListView(
       padding: EdgeInsets.all(16),
       children: [
@@ -76,8 +84,8 @@ class _FullscreenDebugPageState extends State<FullscreenDebugPage> {
         }),
         Divider(),
         InfoRowGroup({
-          'dateModifiedSecs': '${entry.dateModifiedSecs} (${DateTime.fromMillisecondsSinceEpoch(entry.dateModifiedSecs * 1000)})',
+          'dateModifiedSecs': toDateValue(entry.dateModifiedSecs, factor: 1000),
-          'sourceDateTakenMillis': '${entry.sourceDateTakenMillis} (${DateTime.fromMillisecondsSinceEpoch(entry.sourceDateTakenMillis)})',
+          'sourceDateTakenMillis': toDateValue(entry.sourceDateTakenMillis),
           'bestDate': '${entry.bestDate}',
           'monthTaken': '${entry.monthTaken}',
           'dayTaken': '${entry.dayTaken}',

lib/widgets/fullscreen/fullscreen_body.dart

@@ -530,7 +530,11 @@ class _FullscreenVerticalPageViewState extends State<FullscreenVerticalPageView>
 
   // when the entry image itself changed (e.g. after rotation)
   void _onImageChanged() async {
-    await UriImage(uri: entry.uri, mimeType: entry.mimeType).evict();
+    await UriImage(
+      uri: entry.uri,
+      mimeType: entry.mimeType,
+      orientationDegrees: entry.orientationDegrees,
+    ).evict();
     // evict low quality thumbnail (without specified extents)
     await ThumbnailProvider(entry: entry).evict();
     // evict higher quality thumbnails (with powers of 2 from 32 to 1024 as specified extents)

lib/widgets/fullscreen/image_view.dart

@@ -96,6 +96,7 @@ class ImageView extends StatelessWidget {
       final uriImage = UriImage(
         uri: entry.uri,
         mimeType: entry.mimeType,
+        orientationDegrees: entry.orientationDegrees,
         expectedContentLength: entry.sizeBytes,
       );
       child = PhotoView(

lib/widgets/fullscreen/video_view.dart

@@ -101,6 +101,7 @@ class AvesVideoState extends State<AvesVideo> {
                   image: UriImage(
                     uri: entry.uri,
                     mimeType: entry.mimeType,
+                    orientationDegrees: entry.orientationDegrees,
                     expectedContentLength: entry.sizeBytes,
                   ),
                   width: entry.width.toDouble(),