Merge branch 'master' into theme

This commit is contained in:
ashilkn 2022-03-07 12:27:58 +05:30
commit 7a04fd5f9c
4 changed files with 14 additions and 3 deletions

View file

@ -52,6 +52,14 @@
<meta-data android:name="io.sentry.dsn" android:value="https://2235e5c99219488ea93da34b9ac1cb68@sentry.ente.io/4" />
</application>
<!-- Android 11: https://developer.android.com/preview/privacy/package-visibility -->
<!-- https://developer.android.com/training/package-visibility/use-cases -->
<queries>
<intent>
<action android:name="android.intent.action.SENDTO" />
<data android:scheme="mailto" />
</intent>
</queries>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

View file

@ -5,12 +5,14 @@ import 'package:email_validator/email_validator.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_email_sender/flutter_email_sender.dart';
import 'package:logging/logging.dart';
import 'package:path_provider/path_provider.dart';
import 'package:photos/ui/log_file_viewer.dart';
import 'package:photos/utils/dialog_util.dart';
import 'package:share_plus/share_plus.dart';
import 'package:super_logging/super_logging.dart';
final Logger _logger = Logger('email_util');
bool isValidEmail(String email) {
return EmailValidator.validate(email);
}
@ -129,7 +131,8 @@ Future<void> _sendLogs(
);
try {
await FlutterEmailSender.send(email);
} catch (e) {
} catch (e, s) {
_logger.severe('email sender failed', e, s);
await Share.shareFiles([zipFilePath]);
}
}

View file

@ -390,7 +390,7 @@ packages:
name: flutter_email_sender
url: "https://pub.dartlang.org"
source: hosted
version: "5.0.2"
version: "5.1.0"
flutter_image_compress:
dependency: "direct main"
description:

View file

@ -48,7 +48,7 @@ dependencies:
flutter_cache_manager: ^3.3.0
flutter_datetime_picker: ^1.5.1
flutter_easyloading: ^3.0.0
flutter_email_sender: ^5.0.2
flutter_email_sender: ^5.1.0
flutter_image_compress: ^1.1.0
flutter_inappwebview: ^5.3.2
flutter_local_notifications: ^5.0.0+4