Merge branch 'master' into redesign

This commit is contained in:
Neeraj Gupta 2022-06-06 11:16:23 +05:30
commit 5a78738fdf
No known key found for this signature in database
GPG key ID: 3C5A1684DC1729E1
3 changed files with 5 additions and 5 deletions

View file

@ -74,8 +74,8 @@ Future<MediaUploadData> _getMediaUploadDataFromAssetFile(ente.File file) async {
if (file.fileType == FileType.livePhoto && io.Platform.isIOS) {
final io.File videoUrl = await Motionphoto.getLivePhotoFile(file.localID);
if (videoUrl == null || !videoUrl.existsSync()) {
String errMsg = "missing livePhoto url for ${file
.toString()} with subType ${file.fileSubType};
String errMsg =
"missing livePhoto url for ${file.toString()} with subType ${file.fileSubType}";
_logger.severe(errMsg);
throw InvalidFileUploadState(errMsg);
}

View file

@ -955,7 +955,7 @@ packages:
name: photo_view
url: "https://pub.dartlang.org"
source: hosted
version: "0.13.0"
version: "0.14.0"
pinput:
dependency: "direct main"
description:

View file

@ -11,7 +11,7 @@ description: ente photos application
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 0.5.32+312
version: 0.5.33+313
environment:
sdk: ">=2.10.0 <3.0.0"
@ -85,7 +85,7 @@ dependencies:
path_provider: ^2.0.1
pedantic: ^1.9.2
photo_manager: ^2.0.8
photo_view: ^0.13.0
photo_view: ^0.14.0
pinput: ^1.2.2
provider: ^6.0.0
quiver: ^3.0.1