Browse Source

Merge pull request #253 from ente-io/email_change

Support Email: Fix invalid email issue for proton mail client
Neeraj Gupta 3 years ago
parent
commit
32253f67c8
4 changed files with 10 additions and 9 deletions
  1. 2 0
      lib/core/constants.dart
  2. 6 7
      lib/ui/settings/support_section_widget.dart
  3. 1 1
      pubspec.lock
  4. 1 1
      pubspec.yaml

+ 2 - 0
lib/core/constants.dart

@@ -28,3 +28,5 @@ const kMnemonicKeyWordCount = 24;
 
 
 // https://stackoverflow.com/a/61162219
 // https://stackoverflow.com/a/61162219
 const kDragSensitivity = 8;
 const kDragSensitivity = 8;
+
+const kSupportEmail = 'support@ente.io';

+ 6 - 7
lib/ui/settings/support_section_widget.dart

@@ -1,13 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_email_sender/flutter_email_sender.dart';
 import 'package:logging/logging.dart';
 import 'package:logging/logging.dart';
 import 'package:photos/core/configuration.dart';
 import 'package:photos/core/configuration.dart';
 import 'package:photos/core/constants.dart';
 import 'package:photos/core/constants.dart';
 import 'package:photos/ui/settings/settings_section_title.dart';
 import 'package:photos/ui/settings/settings_section_title.dart';
 import 'package:photos/ui/settings/settings_text_item.dart';
 import 'package:photos/ui/settings/settings_text_item.dart';
 import 'package:photos/ui/web_page.dart';
 import 'package:photos/ui/web_page.dart';
+import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/email_util.dart';
 import 'package:photos/utils/email_util.dart';
-import 'package:photos/utils/toast_util.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 
 class SupportSectionWidget extends StatelessWidget {
 class SupportSectionWidget extends StatelessWidget {
@@ -23,14 +22,14 @@ class SupportSectionWidget extends StatelessWidget {
           behavior: HitTestBehavior.translucent,
           behavior: HitTestBehavior.translucent,
           onTap: () async {
           onTap: () async {
             try {
             try {
-              final Email email = Email(
-                recipients: ['hey@ente.io'],
-                isHTML: false,
+              final Uri emailLaunchUri = Uri(
+                scheme: 'mailto',
+                path: kSupportEmail,
               );
               );
-              await FlutterEmailSender.send(email);
+              launchUrl(emailLaunchUri);
             } catch (e) {
             } catch (e) {
               Logger("SupportSection").severe(e);
               Logger("SupportSection").severe(e);
-              launch("mailto:hey@ente.io");
+              showErrorDialog(context, "", "please email us at $kSupportEmail");
             }
             }
           },
           },
           child: SettingsTextItem(text: "email", icon: Icons.navigate_next),
           child: SettingsTextItem(text: "email", icon: Icons.navigate_next),

+ 1 - 1
pubspec.lock

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

+ 1 - 1
pubspec.yaml

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