Merge pull request #2742 from krille-chan/krille/fix-receive-sharing
fix: GoRouter captures receive sharing intents sometimes
This commit is contained in:
commit
695a03e730
4 changed files with 5 additions and 9 deletions
|
|
@ -307,13 +307,11 @@ class ChatListController extends State<ChatList>
|
||||||
|
|
||||||
void _processIncomingSharedMedia(List<SharedMediaFile> files) {
|
void _processIncomingSharedMedia(List<SharedMediaFile> files) {
|
||||||
if (files.isEmpty) return;
|
if (files.isEmpty) return;
|
||||||
|
inspect(files);
|
||||||
if (files.singleOrNull?.path.startsWith(AppConfig.deepLinkPrefix) == true) {
|
if (files.singleOrNull?.path.startsWith(AppConfig.deepLinkPrefix) == true) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
inspect(files);
|
|
||||||
|
|
||||||
showScaffoldDialog(
|
showScaffoldDialog(
|
||||||
context: context,
|
context: context,
|
||||||
builder: (context) => ShareScaffoldDialog(
|
builder: (context) => ShareScaffoldDialog(
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,3 @@
|
||||||
import 'dart:developer';
|
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
import 'package:go_router/go_router.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
|
|
@ -51,7 +49,6 @@ class ChatPermissionsSettingsController extends State<ChatPermissionsSettings> {
|
||||||
} else {
|
} else {
|
||||||
content[key] = newLevel;
|
content[key] = newLevel;
|
||||||
}
|
}
|
||||||
inspect(content);
|
|
||||||
await showFutureLoadingDialog(
|
await showFutureLoadingDialog(
|
||||||
context: context,
|
context: context,
|
||||||
future: () => room.client.setRoomStateWithKey(
|
future: () => room.client.setRoomStateWithKey(
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,3 @@
|
||||||
import 'dart:developer';
|
|
||||||
|
|
||||||
import 'package:flutter/foundation.dart';
|
import 'package:flutter/foundation.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
|
@ -34,7 +32,6 @@ extension LocalizedBody on Event {
|
||||||
|
|
||||||
Future<void> shareFile(BuildContext context) async {
|
Future<void> shareFile(BuildContext context) async {
|
||||||
final matrixFile = await _getFile(context);
|
final matrixFile = await _getFile(context);
|
||||||
inspect(matrixFile);
|
|
||||||
|
|
||||||
matrixFile.result?.share(context);
|
matrixFile.result?.share(context);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,10 @@ class FluffyChatApp extends StatelessWidget {
|
||||||
routes: AppRoutes.routes,
|
routes: AppRoutes.routes,
|
||||||
debugLogDiagnostics: true,
|
debugLogDiagnostics: true,
|
||||||
redirect: (context, state) {
|
redirect: (context, state) {
|
||||||
|
// Workaround for content sharings passed to go router:
|
||||||
|
if (state.uri.scheme == 'content') return null;
|
||||||
|
|
||||||
|
// Pass deep links to app:
|
||||||
if (state.uri.toString().startsWith(AppConfig.deepLinkPrefix)) {
|
if (state.uri.toString().startsWith(AppConfig.deepLinkPrefix)) {
|
||||||
return '/rooms/newprivatechat?deeplink=${state.uri}';
|
return '/rooms/newprivatechat?deeplink=${state.uri}';
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue