Android 13 compatibility update

app/android/app/build.gradle

@@ -45,7 +45,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.nkming.nc_photos"
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         ndk {

app/android/app/src/main/AndroidManifest.xml

@@ -3,10 +3,13 @@
     package="com.nkming.nc_photos">
 
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32"/>
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="29"
         tools:ignore="ScopedStorage" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <application
         android:name=".App"

app/lib/mobile/android/permission_util.dart

@@ -3,15 +3,24 @@ import 'package:nc_photos/stream_extension.dart';
 import 'package:np_platform_permission/np_platform_permission.dart';
 
 Future<Map<String, int>> requestPermissionsForResult(
-    List<String> permissions) async {
+        List<String> permissions) =>
+    _doRequest(() => Permission.request(permissions));
+
+Future<Map<String, int>> requestReadExternalStorageForResult() =>
+    _doRequest(() => Permission.requestReadExternalStorage());
+
+Future<Map<String, int>> requestPostNotificationsForResult() =>
+    _doRequest(() => Permission.requestPostNotifications());
+
+Future<Map<String, int>> _doRequest(Future Function() op) async {
   Map<String, int>? result;
   final resultFuture = Permission.stream
       .whereType<PermissionRequestResult>()
       .first
       .then((ev) => result = ev.grantResults);
-  await Permission.request(permissions);
+  await op();
   await resultFuture;
-  _log.info("[requestPermissionsForResult] Result: $result");
+  _log.info("[_doRequest] Result: $result");
   return result!;
 }
 

app/lib/widget/enhanced_photo_browser.dart

@@ -341,10 +341,10 @@ class _EnhancedPhotoBrowserState extends State<EnhancedPhotoBrowser>
     if (getRawPlatform() == NpPlatform.android) {
       if (AndroidInfo().sdkInt >= AndroidVersion.R) {
         if (!await Permission.hasReadExternalStorage()) {
-          final results = await requestPermissionsForResult([
+          final results = await requestReadExternalStorageForResult();
-            Permission.READ_EXTERNAL_STORAGE,
-          ]);
           return results[Permission.READ_EXTERNAL_STORAGE] ==
+                  PermissionRequestResult.granted ||
+              results[Permission.READ_MEDIA_IMAGES] ==
                   PermissionRequestResult.granted;
         }
       } else {

app/lib/widget/splash.dart

@@ -11,6 +11,7 @@ import 'package:nc_photos/entity/pref.dart';
 import 'package:nc_photos/entity/sqlite/database.dart' as sql;
 import 'package:nc_photos/k.dart' as k;
 import 'package:nc_photos/mobile/android/activity.dart';
+import 'package:nc_photos/mobile/android/permission_util.dart';
 import 'package:nc_photos/use_case/compat/v29.dart';
 import 'package:nc_photos/use_case/compat/v46.dart';
 import 'package:nc_photos/use_case/compat/v55.dart';
@@ -19,6 +20,7 @@ import 'package:nc_photos/widget/home.dart';
 import 'package:nc_photos/widget/setup.dart';
 import 'package:nc_photos/widget/sign_in.dart';
 import 'package:np_codegen/np_codegen.dart';
+import 'package:np_platform_permission/np_platform_permission.dart';
 import 'package:np_platform_util/np_platform_util.dart';
 import 'package:to_string/to_string.dart';
 
@@ -38,7 +40,7 @@ class Splash extends StatefulWidget {
 @npLog
 class _SplashState extends State<Splash> {
   @override
-  initState() {
+  void initState() {
     super.initState();
     WidgetsBinding.instance.addPostFrameCallback((_) {
       _doWork();
@@ -46,6 +48,9 @@ class _SplashState extends State<Splash> {
   }
 
   Future<void> _doWork() async {
+    if (!await Permission.hasPostNotifications()) {
+      await requestPostNotificationsForResult();
+    }
     if (Pref().getFirstRunTime() == null) {
       await Pref().setFirstRunTime(clock.now().millisecondsSinceEpoch);
     }

np_android_core/src/main/java/com/nkming/nc_photos/np_android_core/PermissionUtil.kt

@@ -4,6 +4,8 @@ import android.Manifest
 import android.app.Activity
 import android.content.Context
 import android.content.pm.PackageManager
+import android.os.Build
+import androidx.annotation.RequiresApi
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 
@@ -20,14 +22,20 @@ interface PermissionUtil {
 		}
 
 		fun hasReadExternalStorage(context: Context): Boolean {
-			return ContextCompat.checkSelfPermission(
+			return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-				context, Manifest.permission.READ_EXTERNAL_STORAGE
+				hasReadExternalStorage33(context)
-			) == PackageManager.PERMISSION_GRANTED
+			} else {
+				hasReadExternalStorage0(context)
+			}
 		}
 
-		fun requestReadExternalStorage(activity: Activity) = request(
+		fun requestReadExternalStorage(activity: Activity) {
-			activity, Manifest.permission.READ_EXTERNAL_STORAGE
+			return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-		)
+				requestReadExternalStorage33(activity)
+			} else {
+				requestReadExternalStorage0(activity)
+			}
+		}
 
 		fun hasWriteExternalStorage(context: Context): Boolean {
 			return ContextCompat.checkSelfPermission(
@@ -38,5 +46,53 @@ interface PermissionUtil {
 		fun requestWriteExternalStorage(activity: Activity) = request(
 			activity, Manifest.permission.WRITE_EXTERNAL_STORAGE
 		)
+
+		fun hasPostNotifications(context: Context): Boolean {
+			return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+				hasPostNotifications33(context)
+			} else {
+				true
+			}
+		}
+
+		fun requestPostNotifications(activity: Activity) {
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+				requestPostNotifications33(activity)
+			}
+		}
+
+		@RequiresApi(Build.VERSION_CODES.TIRAMISU)
+		private fun hasReadExternalStorage33(context: Context): Boolean {
+			return ContextCompat.checkSelfPermission(
+				context, Manifest.permission.READ_MEDIA_IMAGES
+			) == PackageManager.PERMISSION_GRANTED
+		}
+
+		private fun hasReadExternalStorage0(context: Context): Boolean {
+			return ContextCompat.checkSelfPermission(
+				context, Manifest.permission.READ_EXTERNAL_STORAGE
+			) == PackageManager.PERMISSION_GRANTED
+		}
+
+		@RequiresApi(Build.VERSION_CODES.TIRAMISU)
+		private fun requestReadExternalStorage33(activity: Activity) = request(
+			activity, Manifest.permission.READ_MEDIA_IMAGES
+		)
+
+		private fun requestReadExternalStorage0(activity: Activity) = request(
+			activity, Manifest.permission.READ_EXTERNAL_STORAGE
+		)
+
+		@RequiresApi(Build.VERSION_CODES.TIRAMISU)
+		private fun hasPostNotifications33(context: Context): Boolean {
+			return ContextCompat.checkSelfPermission(
+				context, Manifest.permission.POST_NOTIFICATIONS
+			) == PackageManager.PERMISSION_GRANTED
+		}
+
+		@RequiresApi(Build.VERSION_CODES.TIRAMISU)
+		private fun requestPostNotifications33(activity: Activity) = request(
+			activity, Manifest.permission.POST_NOTIFICATIONS
+		)
 	}
 }

np_platform_permission/android/src/main/kotlin/com/nkming/nc_photos/np_platform_permission/PermissionChannelHandler.kt

@@ -93,6 +93,34 @@ internal class PermissionChannelHandler(context: Context) :
 				}
 			}
 
+			"requestReadExternalStorage" -> {
+				try {
+					PermissionUtil.requestReadExternalStorage(activity!!)
+					result.success(null)
+				} catch (e: Throwable) {
+					result.error("systemException", e.toString(), null)
+				}
+			}
+
+			"hasPostNotifications" -> {
+				try {
+					result.success(
+						PermissionUtil.hasPostNotifications(context)
+					)
+				} catch (e: Throwable) {
+					result.error("systemException", e.toString(), null)
+				}
+			}
+
+			"requestPostNotifications" -> {
+				try {
+					PermissionUtil.requestPostNotifications(activity!!)
+					result.success(null)
+				} catch (e: Throwable) {
+					result.error("systemException", e.toString(), null)
+				}
+			}
+
 			else -> result.notImplemented()
 		}
 	}

np_platform_permission/lib/src/permission.dart

@@ -9,6 +9,8 @@ import 'package:np_platform_permission/src/k.dart' as k;
 class Permission {
   static const READ_EXTERNAL_STORAGE =
       "android.permission.READ_EXTERNAL_STORAGE";
+  static const READ_MEDIA_IMAGES =
+      "android.permission.READ_MEDIA_IMAGES";
   static const WRITE_EXTERNAL_STORAGE =
       "android.permission.WRITE_EXTERNAL_STORAGE";
 
@@ -26,6 +28,16 @@ class Permission {
     return (await _methodChannel.invokeMethod<bool>("hasReadExternalStorage"))!;
   }
 
+  static Future<void> requestReadExternalStorage() =>
+      _methodChannel.invokeMethod("requestReadExternalStorage");
+
+  static Future<bool> hasPostNotifications() async {
+    return (await _methodChannel.invokeMethod<bool>("hasPostNotifications"))!;
+  }
+
+  static Future<void> requestPostNotifications() =>
+      _methodChannel.invokeMethod("requestPostNotifications");
+
   static Stream get stream => _eventStream;
 
   static final _eventStream =