From b23daa2dc1a0f64381f831144eaaa6268af643f9 Mon Sep 17 00:00:00 2001
From: Christian Pauly <christian-pauly@posteo.de>
Date: Fri, 6 May 2022 08:58:59 +0200
Subject: [PATCH] refactor: Migrate to share_plus

---
 lib/pages/bootstrap/bootstrap_dialog.dart            |  2 +-
 lib/utils/fluffy_share.dart                          |  2 +-
 .../matrix_file_extension.dart                       | 12 ++----------
 pubspec.lock                                         |  9 +--------
 pubspec.yaml                                         |  2 +-
 5 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/lib/pages/bootstrap/bootstrap_dialog.dart b/lib/pages/bootstrap/bootstrap_dialog.dart
index f974bb2c..f5bdf875 100644
--- a/lib/pages/bootstrap/bootstrap_dialog.dart
+++ b/lib/pages/bootstrap/bootstrap_dialog.dart
@@ -7,7 +7,7 @@ import 'package:future_loading_dialog/future_loading_dialog.dart';
 import 'package:matrix/encryption.dart';
 import 'package:matrix/encryption/utils/bootstrap.dart';
 import 'package:matrix/matrix.dart';
-import 'package:share/share.dart';
+import 'package:share_plus/share_plus.dart';
 
 import 'package:fluffychat/config/themes.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
diff --git a/lib/utils/fluffy_share.dart b/lib/utils/fluffy_share.dart
index b417903d..052198cc 100644
--- a/lib/utils/fluffy_share.dart
+++ b/lib/utils/fluffy_share.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
 import 'package:flutter_gen/gen_l10n/l10n.dart';
-import 'package:share/share.dart';
+import 'package:share_plus/share_plus.dart';
 
 import 'package:fluffychat/utils/platform_infos.dart';
 
diff --git a/lib/utils/matrix_sdk_extensions.dart/matrix_file_extension.dart b/lib/utils/matrix_sdk_extensions.dart/matrix_file_extension.dart
index 20d63d45..bfeefe8a 100644
--- a/lib/utils/matrix_sdk_extensions.dart/matrix_file_extension.dart
+++ b/lib/utils/matrix_sdk_extensions.dart/matrix_file_extension.dart
@@ -3,10 +3,9 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 
 import 'package:file_picker_cross/file_picker_cross.dart';
-import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:matrix/matrix.dart';
 import 'package:path_provider/path_provider.dart';
-import 'package:share/share.dart';
+import 'package:share_plus/share_plus.dart';
 
 import 'package:fluffychat/utils/platform_infos.dart';
 
@@ -23,17 +22,10 @@ extension MatrixFileExtension on MatrixFile {
 
   void share(BuildContext context) async {
     final fileName = name.split('/').last;
-    final tmpDirectory = PlatformInfos.isAndroid
-        ? (await getExternalStorageDirectories(
-                type: StorageDirectory.downloads))!
-            .first
-        : await getTemporaryDirectory();
+    final tmpDirectory = await getTemporaryDirectory();
     final path = '${tmpDirectory.path}$fileName';
     await File(path).writeAsBytes(bytes);
     await Share.shareFiles([path]);
-    ScaffoldMessenger.of(context).showSnackBar(
-      SnackBar(content: Text(L10n.of(context)!.savedFileAs(path))),
-    );
     return;
   }
 
diff --git a/pubspec.lock b/pubspec.lock
index dc934e8b..8d0f0049 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1449,15 +1449,8 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "6.4.0"
-  share:
-    dependency: "direct main"
-    description:
-      name: share
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.4"
   share_plus:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: share_plus
       url: "https://pub.dartlang.org"
diff --git a/pubspec.yaml b/pubspec.yaml
index 73b400ea..79e6f5bd 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -75,7 +75,7 @@ dependencies:
   salomon_bottom_bar: ^3.2.0
   scroll_to_index: ^2.1.1
   sentry: ^6.3.0
-  share: ^2.0.4
+  share_plus: ^4.0.4
   shared_preferences: ^2.0.13
   slugify: ^2.0.0
   snapping_sheet: ^3.1.0