Merge pull request #230 from humhub/f-links-to-humhub-files-are-not-c…

…lickable Add extended storage permission handler for ios and android.
humhub · Sep 23, 2024 · 910914a · 910914a
2 parents eca5fce + 05654be
commit 910914a
Show file tree

Hide file tree

Showing 25 changed files with 317 additions and 186 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -15,9 +15,12 @@
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
     <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
 
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
+
     <!-- For older versions (For Android 12 (API 31) and Below) -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
    <application
         android:label="HumHub"
         android:name="${applicationName}"

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -390,11 +390,9 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = "";
-				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 5439UTM27E;
+				DEVELOPMENT_TEAM = 5439UTM27E;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = HumHub;
@@ -407,7 +405,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.humhub.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = humhub_distribution_profile;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
@@ -536,11 +533,9 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = "";
-				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 5439UTM27E;
+				DEVELOPMENT_TEAM = 5439UTM27E;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = HumHub;
@@ -553,7 +548,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.humhub.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = humhub_distribution_profile;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
@@ -574,11 +568,9 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = "";
-				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 5439UTM27E;
+				DEVELOPMENT_TEAM = 5439UTM27E;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = HumHub;
@@ -591,7 +583,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.humhub.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = humhub_distribution_profile;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;

diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -67,5 +67,11 @@
     <string>14.4</string>
     <key>FLTEnableImpeller</key>
     <false />
+    <key>NSPhotoLibraryUsageDescription</key>
+    <string>We need access to your photo library to save photos and videos.</string>
+    <key>UIFileSharingEnabled</key>
+    <true/>
+    <key>LSSupportsOpeningDocumentsInPlace</key>
+    <true/>
 </dict>
 </plist>
diff --git a/ios/build/.last_build_id b/ios/build/.last_build_id
@@ -0,0 +1 @@
+e728d5ba4e52068eb059d8c80cc8e750
diff --git a/lib/app_flavored.dart b/lib/app_flavored.dart
@@ -4,9 +4,11 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:humhub/flavored/models/humhub.f.dart';
 import 'package:humhub/flavored/util/intent_plugin.f.dart';
 import 'package:humhub/flavored/util/router.f.dart';
+import 'package:humhub/util/const.dart';
 import 'package:humhub/util/loading_provider.dart';
 import 'package:humhub/util/notifications/plugin.dart';
 import 'package:humhub/util/override_locale.dart';
+import 'package:humhub/util/permission_handler.dart';
 import 'package:humhub/util/push/push_plugin.dart';
 import 'package:humhub/util/storage_service.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -24,10 +26,10 @@ class FlavoredAppState extends ConsumerState<FlavoredApp> {
   void initState() {
     super.initState();
     SchedulerBinding.instance.addPostFrameCallback((_) async {
-      final status = await Permission.notification.status;
-      if (!status.isGranted) {
-        await Permission.notification.request();
-      }
+      await PermissionHandler.requestPermissions([
+        Permission.notification,
+        Permission.manageExternalStorage,
+      ]);
     });
   }
 
@@ -41,13 +43,13 @@ class FlavoredAppState extends ConsumerState<FlavoredApp> {
             child: OverrideLocale(
               builder: (overrideLocale) => Builder(
                 builder: (context) => MaterialApp(
-                  scaffoldMessengerKey: scaffoldMessengerStateKeyF,
+                  scaffoldMessengerKey: scaffoldMessengerStateKey,
                   debugShowCheckedModeBanner: false,
                   initialRoute: RouterF.initRoute,
                   routes: RouterF.routes,
                   localizationsDelegates: AppLocalizations.localizationsDelegates,
                   supportedLocales: AppLocalizations.supportedLocales,
-                  navigatorKey: navigatorKeyF,
+                  navigatorKey: navigatorKey,
                   builder: (context, child) => child!,
                   theme: ThemeData(
                     fontFamily: 'OpenSans',

diff --git a/lib/app_opener.dart b/lib/app_opener.dart
@@ -1,10 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:humhub/util/const.dart';
 import 'package:humhub/util/intent/intent_plugin.dart';
 import 'package:humhub/util/loading_provider.dart';
 import 'package:humhub/util/notifications/plugin.dart';
 import 'package:humhub/util/override_locale.dart';
+import 'package:humhub/util/permission_handler.dart';
 import 'package:humhub/util/push/push_plugin.dart';
 import 'package:humhub/util/router.dart';
 import 'package:humhub/util/storage_service.dart';
@@ -23,10 +25,10 @@ class OpenerAppState extends ConsumerState<OpenerApp> {
   void initState() {
     super.initState();
     SchedulerBinding.instance.addPostFrameCallback((_) async {
-      final status = await Permission.notification.status;
-      if (!status.isGranted) {
-        await Permission.notification.request();
-      }
+      await PermissionHandler.requestPermissions([
+        Permission.notification,
+        Permission.manageExternalStorage,
+      ]);
     });
   }
 

diff --git a/lib/flavored/util/intent_plugin.f.dart b/lib/flavored/util/intent_plugin.f.dart
@@ -4,8 +4,8 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:humhub/flavored/util/router.f.dart';
 import 'package:humhub/flavored/web_view.f.dart';
+import 'package:humhub/util/const.dart';
 import 'package:humhub/util/loading_provider.dart';
 import 'package:loggy/loggy.dart';
 import 'package:receive_sharing_intent/receive_sharing_intent.dart';
@@ -68,7 +68,7 @@ class IntentPluginFState extends ConsumerState<IntentPluginF> {
         if (!mounted) return;
         _latestUri = uri;
         String? redirectUrl = uri?.toString();
-        if (redirectUrl != null && navigatorKeyF.currentState != null) {
+        if (redirectUrl != null && navigatorKey.currentState != null) {
           tryNavigateWithOpener(redirectUrl);
         }
         _err = null;
@@ -103,11 +103,11 @@ class IntentPluginFState extends ConsumerState<IntentPluginF> {
         }
         _latestUri = uri;
         String? redirectUrl = uri.queryParameters['url'];
-        if (redirectUrl != null && navigatorKeyF.currentState != null) {
+        if (redirectUrl != null && navigatorKey.currentState != null) {
           tryNavigateWithOpener(redirectUrl);
         } else {
           if (redirectUrl != null) {
-            navigatorKeyF.currentState!.pushNamed(WebViewF.path, arguments: redirectUrl);
+            navigatorKey.currentState!.pushNamed(WebViewF.path, arguments: redirectUrl);
             return;
           }
         }
@@ -125,13 +125,13 @@ class IntentPluginFState extends ConsumerState<IntentPluginF> {
   Future<bool> tryNavigateWithOpener(String redirectUrl) async {
     LoadingProvider.of(ref).showLoading();
     bool isNewRouteSameAsCurrent = false;
-    navigatorKeyF.currentState!.popUntil((route) {
+    navigatorKey.currentState!.popUntil((route) {
       if (route.settings.name == WebViewF.path) {
         isNewRouteSameAsCurrent = true;
       }
       return true;
     });
-    navigatorKeyF.currentState!.pushNamed(WebViewF.path, arguments: redirectUrl);
+    navigatorKey.currentState!.pushNamed(WebViewF.path, arguments: redirectUrl);
     return isNewRouteSameAsCurrent;
   }
 }
diff --git a/lib/flavored/util/notifications/channel.dart b/lib/flavored/util/notifications/channel.dart
@@ -1,5 +1,5 @@
-import 'package:humhub/flavored/util/router.f.dart';
 import 'package:humhub/flavored/web_view.f.dart';
+import 'package:humhub/util/const.dart';
 import 'package:humhub/util/notifications/channel.dart';
 import 'package:humhub/util/notifications/init_from_push.dart';
 
@@ -14,19 +14,19 @@ class NotificationChannelF extends NotificationChannel {
   ///
   @override
   Future<void> onTap(String? payload) async {
-    if (payload != null && navigatorKeyF.currentState != null) {
+    if (payload != null && navigatorKey.currentState != null) {
       bool isNewRouteSameAsCurrent = false;
-      navigatorKeyF.currentState!.popUntil((route) {
+      navigatorKey.currentState!.popUntil((route) {
         if (route.settings.name == WebViewF.path) {
           isNewRouteSameAsCurrent = true;
         }
         return true;
       });
       if (isNewRouteSameAsCurrent) {
-        navigatorKeyF.currentState!.pushNamed(WebViewF.path, arguments: payload);
+        navigatorKey.currentState!.pushNamed(WebViewF.path, arguments: payload);
         return;
       }
-      navigatorKeyF.currentState!.pushNamed(WebViewF.path, arguments: payload);
+      navigatorKey.currentState!.pushNamed(WebViewF.path, arguments: payload);
     } else {
       if (payload != null) {
         InitFromPush.setPayload(payload);

diff --git a/lib/flavored/util/router.f.dart b/lib/flavored/util/router.f.dart
@@ -1,11 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:humhub/flavored/web_view.f.dart';
+import 'package:humhub/util/const.dart';
 
-final GlobalKey<NavigatorState> navigatorKeyF = GlobalKey<NavigatorState>();
-final GlobalKey<ScaffoldMessengerState> scaffoldMessengerStateKeyF = GlobalKey<ScaffoldMessengerState>();
-
-NavigatorState? get navigator => navigatorKeyF.currentState;
+NavigatorState? get navigator => navigatorKey.currentState;
 
 class RouterF {
   static String? initRoute = WebViewF.path;

diff --git a/lib/flavored/web_view.f.dart b/lib/flavored/web_view.f.dart
@@ -8,9 +8,9 @@ import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:humhub/app_flavored.dart';
 import 'package:humhub/flavored/models/humhub.f.dart';
-import 'package:humhub/flavored/util/router.f.dart';
 import 'package:humhub/util/auth_in_app_browser.dart';
 import 'package:humhub/models/channel_message.dart';
+import 'package:humhub/util/const.dart';
 import 'package:humhub/util/extensions.dart';
 import 'package:humhub/util/loading_provider.dart';
 import 'package:humhub/util/notifications/init_from_push.dart';
@@ -279,7 +279,7 @@ class FlavoredWebViewState extends ConsumerState<WebViewF> {
         downloadStartRequest: downloadStartRequest,
         controller: controller,
         onSuccess: (File file, String filename) {
-          scaffoldMessengerStateKeyF.currentState?.showSnackBar(
+          scaffoldMessengerStateKey.currentState?.showSnackBar(
             SnackBar(
               content: Text('${AppLocalizations.of(context)!.file_download}: $filename'),
               action: SnackBarAction(
@@ -293,7 +293,7 @@ class FlavoredWebViewState extends ConsumerState<WebViewF> {
           );
         },
         onError: (er) {
-          scaffoldMessengerStateKeyF.currentState?.showSnackBar(
+          scaffoldMessengerStateKey.currentState?.showSnackBar(
             SnackBar(
               content: Text(AppLocalizations.of(context)!.generic_error),
             ),

diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
@@ -35,6 +35,9 @@
   "file_download": "Datei heruntergeladen",
   "generic_error": "Uups! Etwas ist schiefgelaufen.",
 
+  "enable_permissions": "Berechtigungen aktivieren.",
+
+  "settings": "Einstellungen",
   "connect": "Verbinden",
   "open": "Öffnen",
   "cancel": "Abbrechen",

diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -36,6 +36,9 @@
   "file_download": "File downloaded",
   "generic_error": "Oops! Something went wrong.",
 
+  "enable_permissions": "Enable permissions.",
+
+  "settings": "Settings",
   "connect": "Connect",
   "open": "Open",
   "cancel" : "Cancel",

diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb
@@ -35,6 +35,9 @@
   "file_download": "Fichier téléchargé",
   "generic_error": "Oups ! Quelque chose s'est mal passé.",
 
+  "enable_permissions": "Activer les autorisations.",
+
+  "settings": "Paramètres",
   "connect": "Connecter",
   "open": "Ouvrir",
   "cancel": "Annuler",

diff --git a/lib/models/manifest.dart b/lib/models/manifest.dart
@@ -8,7 +8,13 @@ class Manifest {
   final String backgroundColor;
   final String themeColor;
 
-  Manifest({required this.display, required this.startUrl, required this.shortName, required this.name, required this.backgroundColor, required this.themeColor});
+  Manifest(
+      {required this.display,
+      required this.startUrl,
+      required this.shortName,
+      required this.name,
+      required this.backgroundColor,
+      required this.themeColor});
 
   String get baseUrl {
     Uri url = Uri.parse(startUrl);