Merge pull request #2429 from nextcloud/fix/neon_framework/login-flow…

…-launch-url
nextcloud · Aug 28, 2024 · 44e7b17 · 44e7b17
2 parents 2a48f06 + 251dffa
commit 44e7b17
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/packages/neon_framework/lib/src/pages/login_flow.dart b/packages/neon_framework/lib/src/pages/login_flow.dart
@@ -2,7 +2,6 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:meta/meta.dart';
-import 'package:neon_framework/models.dart';
 import 'package:neon_framework/src/bloc/result.dart';
 import 'package:neon_framework/src/blocs/login_flow.dart';
 import 'package:neon_framework/src/router.dart';
@@ -39,7 +38,7 @@ class _LoginFlowPageState extends State<LoginFlowPage> {
 
     initSubscription = bloc.init.listen((result) async {
       if (result.hasData) {
-        await launchUrl(NeonProvider.of<Account>(context), result.requireData.login);
+        await launchUrl(null, result.requireData.login);
       }
     });
 

diff --git a/packages/neon_framework/lib/src/utils/launch_url.dart b/packages/neon_framework/lib/src/utils/launch_url.dart
@@ -2,9 +2,14 @@ import 'package:neon_framework/models.dart';
 import 'package:url_launcher/url_launcher.dart' as url_launcher;
 
 /// Completes the [url] using the [account] if necessary and launches it in an external application.
-Future<bool> launchUrl(Account account, String url) async {
+Future<bool> launchUrl(Account? account, String url) async {
+  var uri = Uri.parse(url);
+  if (account != null) {
+    uri = account.completeUri(uri);
+  }
+
   return url_launcher.launchUrl(
-    account.completeUri(Uri.parse(url)),
+    uri,
     mode: url_launcher.LaunchMode.externalApplication,
   );
 }