bettern intent and navigation handling

app/lib/features/geckoview/domain/repositories/tab.dart

@@ -28,6 +28,15 @@ class TabRepository extends _$TabRepository {
   final _tabsService = GeckoTabService();
 
   String? _previousTabId;
+  final _tabFromIntent = <String>{};
+
+  bool hasLaunchedFromIntent(String? tabId) {
+    if (tabId == null) {
+      return false;
+    }
+
+    return _tabFromIntent.contains(tabId);
+  }
 
   Future<String> addTab({
     Uri? url,
@@ -272,13 +281,15 @@ class TabRepository extends _$TabRepository {
       next.whenData((value) async {
         switch (value) {
           case SharedUrl():
-            await addTab(url: value.url);
+            _tabFromIntent.add(await addTab(url: value.url));
           case SharedText():
             final defaultSearchBang =
                 ref.read(selectedBangDataProvider()) ??
                 await ref.read(defaultSearchBangDataProvider.future);
 
-            await addTab(url: defaultSearchBang?.getTemplateUrl(value.text));
+            _tabFromIntent.add(
+              await addTab(url: defaultSearchBang?.getTemplateUrl(value.text)),
+            );
         }
       });
     });

app/lib/features/geckoview/features/browser/presentation/screens/browser.dart

@@ -1,6 +1,7 @@
 import 'dart:math' as math;
 
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -187,6 +188,14 @@ class BrowserScreen extends HookConsumerWidget {
                         return true;
                       }
 
+                      if (ref
+                          .read(tabRepositoryProvider.notifier)
+                          .hasLaunchedFromIntent(selectedTabId)) {
+                        //Mark back as unhandled and navigator will pop
+                        await SystemNavigator.pop();
+                        return false;
+                      }
+
                       if (lastBackButtonPress.value != null &&
                           DateTime.now().difference(
                                 lastBackButtonPress.value!,
@@ -201,6 +210,7 @@ class BrowserScreen extends HookConsumerWidget {
                           return true;
                         } else {
                           //Mark back as unhandled and navigator will pop
+                          await SystemNavigator.pop();
                           return false;
                         }
                       } else {

app/lib/features/geckoview/features/browser/presentation/widgets/browser_modules/browser_view.dart

@@ -85,6 +85,8 @@ class _BrowserViewState extends ConsumerState<BrowserView>
           _periodicScreenshotUpdate?.cancel();
           _periodicScreenshotUpdate = null;
           _timerPaused = false;
+
+          ScaffoldMessenger.of(context).hideCurrentSnackBar();
         }
 
         if (next.isLoading == false &&

app/lib/features/share_intent/domain/services/sharing_intent.dart

@@ -1,11 +1,9 @@
 import 'dart:async';
 
-import 'package:collection/collection.dart';
-import 'package:flutter_sharing_intent/flutter_sharing_intent.dart';
-import 'package:flutter_sharing_intent/model/sharing_file.dart';
 import 'package:lensai/core/logger.dart';
 import 'package:lensai/data/models/received_intent_parameter.dart';
 import 'package:mime/mime.dart' as mime;
+import 'package:receive_intent/receive_intent.dart';
 import 'package:riverpod/riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:rxdart/rxdart.dart';
@@ -14,31 +12,30 @@ import 'package:uri_to_file/uri_to_file.dart' as uri_to_file;
 part 'sharing_intent.g.dart';
 
 final _sharingIntentTransformer =
-    StreamTransformer<List<SharedFile>, ReceivedIntentParameter>.fromHandlers(
+    StreamTransformer<Intent, ReceivedIntentParameter>.fromHandlers(
-      handleData: (files, sink) async {
+      handleData: (intent, sink) async {
-        //For now only one file is supported to share with the app
+        final data = switch (intent.action) {
-        final data = files.firstOrNull;
+          'android.intent.action.WEB_SEARCH' =>
+            intent.extra?['query'] as String?,
+          'android.intent.action.VIEW' => intent.data,
+          'android.intent.action.SEND' =>
+            intent.extra?['android.intent.extra.STREAM'] as String? ??
+                intent.extra?['android.intent.extra.TEXT'] as String?,
+          _ => null,
+        };
 
-        if (data != null && data.value != null) {
+        if (data != null) {
-          switch (data.type) {
+          if (uri_to_file.isUriSupported(data)) {
-            case SharedMediaType.TEXT:
+            final file = await uri_to_file.toFile(data);
-            case SharedMediaType.URL:
+            final mimeType = mime.lookupMimeType(file.path);
-            case SharedMediaType.WEB_SEARCH:
+            switch (mimeType) {
-              if (uri_to_file.isUriSupported(data.value!)) {
+              case 'application/pdf':
-                final file = await uri_to_file.toFile(data.value!);
+                sink.add(ReceivedIntentParameter(data, null));
-                final mimeType = mime.lookupMimeType(file.path);
+              default:
-                switch (mimeType) {
+                logger.w('Unhandled mime type: $mimeType');
-                  case 'application/pdf':
+            }
-                    sink.add(ReceivedIntentParameter(data.value, null));
+          } else {
-                  default:
+            sink.add(ReceivedIntentParameter(data, null));
-                    logger.w('Unhandled mime type: $mimeType');
-                }
-              } else {
-                sink.add(ReceivedIntentParameter(data.value, null));
-              }
-
-            default:
-              logger.w('Unhandled media type: $data');
           }
         }
       },
@@ -46,19 +43,9 @@ final _sharingIntentTransformer =
 
 @Riverpod()
 Raw<Stream<ReceivedIntentParameter>> sharingIntentStream(Ref ref) {
-  final initialStream =
-      FlutterSharingIntent.instance
-          // ignore: discarded_futures is used as stream
-          .getInitialSharing()
-          // ignore: discarded_futures is used as stream
-          .then((event) {
-            FlutterSharingIntent.instance.reset();
-            return event;
-          })
-          .asStream();
-
   return ConcatStream([
-    initialStream,
+    // ignore: discarded_futures
-    FlutterSharingIntent.instance.getMediaStream(),
+    ReceiveIntent.getInitialIntent().asStream(),
-  ]).transform(_sharingIntentTransformer);
+    ReceiveIntent.receivedIntentStream,
+  ]).whereNotNull().transform(_sharingIntentTransformer);
 }

packages/flutter_mozilla_components/android/src/main/kotlin/eu/lensai/flutter_mozilla_components/api/GeckoBrowserApiImpl.kt

@@ -87,10 +87,10 @@ class GeckoBrowserApiImpl : GeckoBrowserApi {
 
     override fun initialize() {
         synchronized(this) {
+            setupGeckoEngine()
+
             if(!isGeckoInitialized) {
                 Log.addSink(AndroidLogSink())
-
-                setupGeckoEngine()
                 isGeckoInitialized = true
             }
         }