From 7f57a5172e7b81207846d1166f920b6ee6110757 Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Mon, 8 May 2023 12:43:33 +0200
Subject: [PATCH] android: strict mode fixes

---
 android/app/src/main/AndroidManifest.xml      | 16 ++++++++++++---
 lib/model/app/dependencies.dart               | 20 +++++++++----------
 .../AvesScreenStatePlugin.kt                  |  4 ++--
 pubspec.lock                                  |  4 ++--
 4 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 5b85aa256..67d85efed 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -19,14 +19,18 @@ This change eventually prevents building the app with Flutter v3.7.11.
         android:required="false" />
 
     <!--
-    Scoped storage on Android 10 (API 29) is inconvenient because users need to confirm edition on each individual file.
-    So we request `WRITE_EXTERNAL_STORAGE` until Android 10 (API 29), and enable `requestLegacyExternalStorage`
+    TODO TLAD [Android 14 (API 34)] request/handle READ_MEDIA_VISUAL_USER_SELECTED permission
+    cf https://developer.android.com/about/versions/14/changes/partial-photo-video-access
     -->
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
     <uses-permission
         android:name="android.permission.READ_EXTERNAL_STORAGE"
         android:maxSdkVersion="32" />
+    <!--
+    Scoped storage on Android 10 (API 29) is inconvenient because users need to confirm edition on each individual file.
+    So we request `WRITE_EXTERNAL_STORAGE` until Android 10 (API 29), and enable `requestLegacyExternalStorage`
+    -->
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="29"
@@ -36,6 +40,11 @@ This change eventually prevents building the app with Flutter v3.7.11.
     <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
     <!-- to analyze media in a service -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <!--
+    TODO TLAD [Android 14 (API 34)] request FOREGROUND_SERVICE_DATA_SYNC permission
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+    cf https://developer.android.com/about/versions/14/changes/fgs-types-required
+    -->
     <!-- to fetch map tiles -->
     <uses-permission android:name="android.permission.INTERNET" />
     <!-- from Android 12 (API 31), users can optionally grant access to the media management special permission -->
@@ -245,7 +254,8 @@ This change eventually prevents building the app with Flutter v3.7.11.
         <service
             android:name=".AnalysisService"
             android:description="@string/analysis_service_description"
-            android:exported="false" />
+            android:exported="false"
+            android:foregroundServiceType="dataSync" />
 
         <service
             android:name=".ScreenSaverService"
diff --git a/lib/model/app/dependencies.dart b/lib/model/app/dependencies.dart
index dedcba43d..48fdf5e41 100644
--- a/lib/model/app/dependencies.dart
+++ b/lib/model/app/dependencies.dart
@@ -2,8 +2,8 @@ import 'package:aves/app_flavor.dart';
 
 class Dependencies {
   static const String apache2 = 'Apache License 2.0';
-  static const String bsd2 = 'BSD 2-Clause "Simplified" License';
-  static const String bsd3 = 'BSD 3-Clause "Revised" License';
+  static const String bsd2 = 'BSD 2-Clause “Simplified” License';
+  static const String bsd3 = 'BSD 3-Clause “Revised” License';
   static const String eclipse1 = 'Eclipse Public License 1.0';
   static const String mit = 'MIT License';
 
@@ -88,8 +88,8 @@ class Dependencies {
     Dependency(
       name: 'Local Auth',
       license: bsd3,
-      licenseUrl: 'https://github.com/flutter/plugins/blob/main/packages/local_auth/local_auth/LICENSE',
-      sourceUrl: 'https://github.com/flutter/plugins/tree/main/packages/local_auth/local_auth',
+      licenseUrl: 'https://github.com/flutter/packages/blob/main/packages/local_auth/local_auth/LICENSE',
+      sourceUrl: 'https://github.com/flutter/packages/tree/main/packages/local_auth/local_auth',
     ),
     Dependency(
       name: 'Package Info Plus',
@@ -115,8 +115,8 @@ class Dependencies {
     Dependency(
       name: 'Shared Preferences',
       license: bsd3,
-      licenseUrl: 'https://github.com/flutter/plugins/blob/main/packages/shared_preferences/shared_preferences/LICENSE',
-      sourceUrl: 'https://github.com/flutter/plugins/tree/main/packages/shared_preferences/shared_preferences',
+      licenseUrl: 'https://github.com/flutter/packages/blob/main/packages/shared_preferences/shared_preferences/LICENSE',
+      sourceUrl: 'https://github.com/flutter/packages/tree/main/packages/shared_preferences/shared_preferences',
     ),
     Dependency(
       name: 'sqflite',
@@ -131,8 +131,8 @@ class Dependencies {
     Dependency(
       name: 'URL Launcher',
       license: bsd3,
-      licenseUrl: 'https://github.com/flutter/plugins/blob/main/packages/url_launcher/url_launcher/LICENSE',
-      sourceUrl: 'https://github.com/flutter/plugins/tree/main/packages/url_launcher/url_launcher',
+      licenseUrl: 'https://github.com/flutter/packages/blob/main/packages/url_launcher/url_launcher/LICENSE',
+      sourceUrl: 'https://github.com/flutter/packages/tree/main/packages/url_launcher/url_launcher',
     ),
     Dependency(
       name: 'Volume Controller',
@@ -150,8 +150,8 @@ class Dependencies {
     Dependency(
       name: 'Google Maps for Flutter',
       license: bsd3,
-      licenseUrl: 'https://github.com/flutter/plugins/blob/main/packages/google_maps_flutter/google_maps_flutter/LICENSE',
-      sourceUrl: 'https://github.com/flutter/plugins/tree/main/packages/google_maps_flutter/google_maps_flutter',
+      licenseUrl: 'https://github.com/flutter/packages/blob/main/packages/google_maps_flutter/google_maps_flutter/LICENSE',
+      sourceUrl: 'https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter',
     ),
   ];
 
diff --git a/plugins/aves_screen_state/android/src/main/kotlin/deckers/thibault/aves/aves_screen_state/AvesScreenStatePlugin.kt b/plugins/aves_screen_state/android/src/main/kotlin/deckers/thibault/aves/aves_screen_state/AvesScreenStatePlugin.kt
index 04f330eca..8beb09d12 100644
--- a/plugins/aves_screen_state/android/src/main/kotlin/deckers/thibault/aves/aves_screen_state/AvesScreenStatePlugin.kt
+++ b/plugins/aves_screen_state/android/src/main/kotlin/deckers/thibault/aves/aves_screen_state/AvesScreenStatePlugin.kt
@@ -13,13 +13,13 @@ class AvesScreenStatePlugin : FlutterPlugin, EventChannel.StreamHandler {
     private var context: Context? = null
     private var screenReceiver: ScreenReceiver? = null
 
-    override fun onAttachedToEngine(@NonNull flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
+    override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
         eventChannel = EventChannel(flutterPluginBinding.binaryMessenger, "deckers.thibault/aves_screen_state/events")
         context = flutterPluginBinding.applicationContext
         eventChannel.setStreamHandler(this)
     }
 
-    override fun onDetachedFromEngine(@NonNull binding: FlutterPlugin.FlutterPluginBinding) {
+    override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
         eventChannel.setStreamHandler(null)
     }
 
diff --git a/pubspec.lock b/pubspec.lock
index 65252036e..4b4eea797 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -788,7 +788,7 @@ packages:
     description:
       path: "."
       ref: aves
-      resolved-ref: "0e02b0521beadd2be13e9a589b9a45d5cb2a06ff"
+      resolved-ref: f05bca5ca9d74c65ae966f6e6f88c511ceedbef8
       url: "https://github.com/deckerst/aves_panorama_motion_sensors.git"
     source: git
     version: "0.1.0"
@@ -861,7 +861,7 @@ packages:
     description:
       path: "."
       ref: aves
-      resolved-ref: "3f43082a0cc0403a906b6e6d881f370fd9caf273"
+      resolved-ref: dfde64310edb376a6a2536e5684de0e0a89cc31c
       url: "https://github.com/deckerst/aves_panorama.git"
     source: git
     version: "0.4.1"