From ec51c8c91dcccba8b91c8ee2e5a2273f48267489 Mon Sep 17 00:00:00 2001 From: Muhesh7 Date: Thu, 9 Feb 2023 17:16:18 +0530 Subject: [PATCH] refactor(manifest): comment-out view intent-filter --- android/app/build.gradle | 1 - android/app/src/main/AndroidManifest.xml | 4 +- .../app/src/main/res/xml/provider_paths.xml | 11 ----- lib/app.dart | 5 ++- lib/ui/home_widget.dart | 6 ++- pubspec.lock | 42 +++++++++---------- pubspec.yaml | 2 +- 7 files changed, 33 insertions(+), 38 deletions(-) delete mode 100644 android/app/src/main/res/xml/provider_paths.xml diff --git a/android/app/build.gradle b/android/app/build.gradle index 57bbcb58c5..8e8dee587b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -79,7 +79,6 @@ android { fdroid { dimension "default" applicationIdSuffix ".fdroid" - signingConfig null } } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index ef7502570e..3210b9b974 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -20,12 +20,12 @@ - + diff --git a/android/app/src/main/res/xml/provider_paths.xml b/android/app/src/main/res/xml/provider_paths.xml deleted file mode 100644 index 782a23bf6c..0000000000 --- a/android/app/src/main/res/xml/provider_paths.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/lib/app.dart b/lib/app.dart index f80ed85df8..afd59e5635 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -46,7 +46,10 @@ class _EnteAppState extends State with WidgetsBindingObserver { final actionResult = await _mediaExtensionPlugin.getIntentAction(); intentAction = actionResult.action!; } on PlatformException { - intentAction = IntentAction.unknown; + intentAction = IntentAction.main; + } catch (error) { + _logger.info(error); + intentAction = IntentAction.main; } if (intentAction == IntentAction.main) { _configureBackgroundFetch(); diff --git a/lib/ui/home_widget.dart b/lib/ui/home_widget.dart index b35d05f95d..68e8a2bd5d 100644 --- a/lib/ui/home_widget.dart +++ b/lib/ui/home_widget.dart @@ -5,6 +5,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter/services.dart'; import 'package:logging/logging.dart'; +import 'package:media_extension/media_extension_action_types.dart'; import 'package:modal_bottom_sheet/modal_bottom_sheet.dart'; import 'package:move_to_background/move_to_background.dart'; import 'package:photos/core/configuration.dart'; @@ -19,6 +20,7 @@ import 'package:photos/events/tab_changed_event.dart'; import 'package:photos/events/trigger_logout_event.dart'; import 'package:photos/events/user_logged_out_event.dart'; import 'package:photos/models/selected_files.dart'; +import 'package:photos/services/app_lifecycle_service.dart'; import 'package:photos/services/collections_service.dart'; import 'package:photos/services/local_sync_service.dart'; import 'package:photos/services/update_service.dart'; @@ -293,7 +295,9 @@ class _HomeWidgetState extends State { Navigator.pop(context); return false; } - if (Platform.isAndroid) { + if (Platform.isAndroid && + AppLifecycleService.instance.intentAction == + IntentAction.main) { MoveToBackground.moveTaskToBack(); return false; } else { diff --git a/pubspec.lock b/pubspec.lock index d6e30b4d02..79ea230735 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: _flutterfire_internals - sha256: "3ff770dfff04a67b0863dff205a0936784de1b87a5e99b11c693fc10e66a9ce3" + sha256: "6215ac7d00ed98300b72f45ed2b38c2ca841f9f4e6965fab33cbd591e45e4473" url: "https://pub.dev" source: hosted - version: "1.0.12" + version: "1.0.13" adaptive_theme: dependency: "direct main" description: @@ -396,50 +396,50 @@ packages: dependency: "direct main" description: name: firebase_core - sha256: c129209ba55f3d4272c89fb4a4994c15bea77fb6de63a82d45fb6bc5c94e4355 + sha256: be13e431c0c950f0fc66bdb67b41b8059121d7e7d8bbbc21fb59164892d561f8 url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.5.0" firebase_core_platform_interface: dependency: transitive description: name: firebase_core_platform_interface - sha256: "5fab93f5b354648efa62e7cc829c90efb68c8796eecf87e0888cae2d5f3accd4" + sha256: "5615b30c36f55b2777d0533771deda7e5730e769e5d3cb7fda79e9bed86cfa55" url: "https://pub.dev" source: hosted - version: "4.5.2" + version: "4.5.3" firebase_core_web: dependency: transitive description: name: firebase_core_web - sha256: "18b35ce111b0a4266abf723c825bcf9d4e2519d13638cc7f06f2a8dd960c75bc" + sha256: "4b3a41410f3313bb95fd560aa5eb761b6ad65c185de772c72231e8b4aeed6d18" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" firebase_messaging: dependency: "direct main" description: name: firebase_messaging - sha256: dc010a6436333029fba858415fe65887c3fe44d8f6e6ea162bb8d3dd764fbcb6 + sha256: dbccddc62fef6f3745ba83062bfd1fbf2eb6a931db4c73d03f85c5772dfdec7f url: "https://pub.dev" source: hosted - version: "14.2.1" + version: "14.2.2" firebase_messaging_platform_interface: dependency: transitive description: name: firebase_messaging_platform_interface - sha256: abda2d766486096eb1c568c7b20aef46180596c8b0708190b929133ff03e0a8d + sha256: "564a47ea76db9cd2d17e7d95790428ad3de9d0075795d14c4c901ba0bf518e1a" url: "https://pub.dev" source: hosted - version: "4.2.10" + version: "4.2.11" firebase_messaging_web: dependency: transitive description: name: firebase_messaging_web - sha256: "7a0ce957bd2210e8636325152234728874dad039f1c7271ba1be5c752fdc5888" + sha256: "76291494583a003d4ce0d613c41cb87c58fab25773317daa66a245f537e1c3f7" url: "https://pub.dev" source: hosted - version: "3.2.11" + version: "3.2.12" fk_user_agent: dependency: "direct main" description: @@ -672,10 +672,10 @@ packages: dependency: "direct main" description: name: fluttertoast - sha256: "7cc92eabe01e3f1babe1571c5560b135dfc762a34e41e9056881e2196b178ec1" + sha256: "774fa28b07f3a82c93596bc137be33189fec578ed3447a93a5a11c93435de394" url: "https://pub.dev" source: hosted - version: "8.1.2" + version: "8.1.3" frontend_server_client: dependency: transitive description: @@ -913,7 +913,7 @@ packages: description: path: "." ref: intent-action - resolved-ref: "399d5d01340bdc094735e0b1a7e7437b6d389542" + resolved-ref: "77e8f86058c7430cbb620e9880e79b2ad62a2e1e" url: "https://github.com/ente-io/media_extension.git" source: git version: "0.0.3" @@ -1266,18 +1266,18 @@ packages: dependency: "direct main" description: name: sentry - sha256: c64db3444237ff747c5a68f5214897bcb078de248785d0d816e3c55ab94dd71d + sha256: "81c1f32496ff04476d6ddfe5894215b1034d185301d2e3dffd272853392c5ea7" url: "https://pub.dev" source: hosted - version: "6.19.0" + version: "6.20.1" sentry_flutter: dependency: "direct main" description: name: sentry_flutter - sha256: a76cf5180d571535fb8fc3bf10358ab385d78134fcf652d0e03ba7741525ab09 + sha256: "5ca2c8d86c220f7ad3109bedceb2c51b0e90bac5218e732be98ea2cba8006461" url: "https://pub.dev" source: hosted - version: "6.19.0" + version: "6.20.1" share_plus: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index fe8da327f9..80bcc375ed 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -80,7 +80,7 @@ dependencies: git: url: "https://github.com/ente-io/media_extension.git" ref: "intent-action" - modal_bottom_sheet: ^2.1.2 + modal_bottom_sheet: ^3.0.0-pre motionphoto: git: "https://github.com/ente-io/motionphoto.git" move_to_background: ^1.0.2