fix: pre-release

- Upgraded kotlin version
- Fixed JVM
- Upgraded DIO version for security issue

Author: remi-martin

android/.gitignore

@@ -9,3 +9,4 @@ GeneratedPluginRegistrant.java
 # Remember to never publicly share your keystore.
 # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
 key.properties
+/build/.last_build_id

android/app/build.gradle

@@ -34,13 +34,13 @@ android {
     compileOptions {
         // Flag to enable support for the new language APIs
         coreLibraryDesugaringEnabled true
-        // Sets Java compatibility to Java 8
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        // Sets Java compatibility to Java 11
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
 
     sourceSets {

android/settings.gradle

@@ -19,7 +19,7 @@ pluginManagement {
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
     id "com.android.application" version "7.1.3" apply false
-    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+    id "org.jetbrains.kotlin.android" version "1.9.0" apply false
 }
 
 include ":app"

lib/network/albums.dart

@@ -27,12 +27,10 @@ Future<ApiResponse<List<AlbumModel>>> fetchAlbums(int albumID) async {
     );
 
     if (response.statusCode == 200) {
-      List<dynamic> jsonAlbums =
-          tryParseJson(response.data)['result']['categories'];
+      List<dynamic> jsonAlbums = tryParseJson(response.data)['result']['categories'];
       List<AlbumModel> albums = List<AlbumModel>.from(jsonAlbums.map(
         (album) {
-          bool canUpload =
-              appPreferences.getBool(Preferences.isAdminKey) ?? false;
+          bool canUpload = appPreferences.getBool(Preferences.isAdminKey) ?? false;
           album['can_upload'] = canUpload;
           return AlbumModel.fromJson(album);
         },
@@ -47,8 +45,7 @@ Future<ApiResponse<List<AlbumModel>>> fetchAlbums(int albumID) async {
         }
         if (communityResult.hasData) {
           for (AlbumModel communityAlbum in communityResult.data) {
-            int index =
-                albums.indexWhere((album) => album.id == communityAlbum.id);
+            int index = albums.indexWhere((album) => album.id == communityAlbum.id);
             if (index >= 0) {
               AlbumModel newAlbum = albums.elementAt(index);
               newAlbum.canUpload = true;
@@ -65,7 +62,7 @@ Future<ApiResponse<List<AlbumModel>>> fetchAlbums(int albumID) async {
         data: albums,
       );
     }
-  } on DioError catch (e) {
+  } on DioException catch (e) {
     debugPrint(e.message);
   } catch (e) {
     debugPrint("$e");
@@ -86,8 +83,7 @@ Future<ApiResponse<List<AlbumModel>>> fetchCommunityAlbums(int albumID) async {
     );
 
     if (response.statusCode == 200) {
-      List<dynamic> jsonAlbums =
-          json.decode(response.data)['result']['categories'];
+      List<dynamic> jsonAlbums = json.decode(response.data)['result']['categories'];
       List<AlbumModel> albums = List<AlbumModel>.from(jsonAlbums.map(
         (album) => AlbumModel.fromJson(album),
       ));
@@ -96,7 +92,7 @@ Future<ApiResponse<List<AlbumModel>>> fetchCommunityAlbums(int albumID) async {
         data: albums,
       );
     }
-  } on DioError catch (e) {
+  } on DioException catch (e) {
     debugPrint(e.message);
   } catch (e) {
     debugPrint("$e");
@@ -129,7 +125,7 @@ Future<ApiResponse<List<AlbumModel>>> getAlbumTree([int? startId]) async {
         data: albums,
       );
     }
-  } on DioError catch (e) {
+  } on DioException catch (e) {
     debugPrint(e.message);
   } catch (e) {
     debugPrint("$e");
@@ -164,7 +160,7 @@ Future<ApiResponse<bool>> addAlbum({
       }
       return ApiResponse(data: true);
     }
-  } on DioError catch (e) {
+  } on DioException catch (e) {
     debugPrint(e.message);
   } catch (e) {
     debugPrint("$e");
@@ -197,7 +193,7 @@ Future<ApiResponse<bool>> moveAlbum(int catId, int parentCatId) async {
       }
       return ApiResponse(data: true);
     }
-  } on DioError catch (e) {
+  } on DioException catch (e) {
     debugPrint("${e.message}");
   } catch (e) {
     debugPrint("$e");
@@ -239,7 +235,7 @@ Future<ApiResponse<bool>> editAlbum({
       print(data);
       return ApiResponse(data: true);
     }
-  } on DioError catch (e) {
+  } on DioException catch (e) {
     debugPrint("${e.message}");
   } catch (e) {
     debugPrint("$e");
@@ -276,7 +272,7 @@ Future<ApiResponse<bool>> deleteAlbum(
       }
       return ApiResponse(data: true);
     }
-  } on DioError catch (e) {
+  } on DioException catch (e) {
     debugPrint("${e.message}");
   } catch (e) {
     debugPrint("$e");

lib/network/api_client.dart

@@ -2,8 +2,8 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:cookie_jar/cookie_jar.dart';
-import 'package:dio/adapter.dart';
 import 'package:dio/dio.dart';
+import 'package:dio/io.dart';
 import 'package:dio_cookie_manager/dio_cookie_manager.dart';
 import 'package:flutter/foundation.dart';
 import 'package:piwigo_ng/services/preferences_service.dart';
@@ -17,13 +17,9 @@ class ApiClient {
     ..interceptors.add(CookieManager(cookieJar))
     ..httpClientAdapter = sslHttpClientAdapter;
 
-  static HttpClientAdapter get sslHttpClientAdapter {
-    return DefaultHttpClientAdapter()
-      ..onHttpClientCreate = (HttpClient client) {
-        client.badCertificateCallback = piwigoSSLBypass;
-        return client;
-      };
-  }
+  static HttpClientAdapter get sslHttpClientAdapter => IOHttpClientAdapter(
+        createHttpClient: () => HttpClient()..badCertificateCallback = piwigoSSLBypass,
+      );
 
   static bool piwigoSSLBypass(X509Certificate cert, String host, int port) {
     if (Preferences.getEnableSSL) {
@@ -138,8 +134,7 @@ class ApiClient {
 class SSLHttpOverrides extends HttpOverrides {
   @override
   HttpClient createHttpClient(SecurityContext? context) {
-    return super.createHttpClient(context)
-      ..badCertificateCallback = ApiClient.piwigoSSLBypass;
+    return super.createHttpClient(context)..badCertificateCallback = ApiClient.piwigoSSLBypass;
   }
 }
 

lib/network/api_interceptor.dart

@@ -21,8 +21,7 @@ class ApiInterceptor extends Interceptor {
     if (prefs.getBool(Preferences.enableBasicAuthKey) ?? false) {
       String? username = prefs.getString(Preferences.basicUsernameKey) ?? '';
       String? password = prefs.getString(Preferences.basicPasswordKey) ?? '';
-      String basicAuth =
-          "Basic ${base64.encode(utf8.encode('$username:$password'))}";
+      String basicAuth = "Basic ${base64.encode(utf8.encode('$username:$password'))}";
       options.headers['authorization'] = basicAuth;
     }
     return super.onRequest(options, handler);
@@ -33,18 +32,16 @@ class ApiInterceptor extends Interceptor {
     Response response,
     ResponseInterceptorHandler handler,
   ) async {
-    debugPrint(
-        "[${response.statusCode}] ${response.requestOptions.queryParameters['method']}");
+    debugPrint("[${response.statusCode}] ${response.requestOptions.queryParameters['method']}");
     return super.onResponse(response, handler);
   }
 
   @override
   void onError(
-    DioError err,
+    DioException err,
     ErrorInterceptorHandler handler,
   ) async {
-    debugPrint(
-        "[${err.response?.statusCode}] ${err.requestOptions.queryParameters['method']}");
+    debugPrint("[${err.response?.statusCode}] ${err.requestOptions.queryParameters['method']}");
     debugPrint('${err.error}\n${err.response?.data}\n${err.stackTrace}');
 
     switch (err.response?.statusCode) {
@@ -61,8 +58,7 @@ class ApiInterceptor extends Interceptor {
         if (err.error is HandshakeException) {
           HandshakeException handshakeError = err.error as HandshakeException;
           String? message = handshakeError.osError?.message;
-          if (message != null &&
-              message.contains('CERTIFICATE_VERIFY_FAILED')) {
+          if (message != null && message.contains('CERTIFICATE_VERIFY_FAILED')) {
             App.scaffoldMessengerKey.currentState?.showSnackBar(
               errorSnackBar(
                 message: appStrings.loginCertFailed_title,

lib/network/authentication.dart

@@ -23,7 +23,7 @@ Future<ApiResponse<String>> pingAPI() async {
     if (data['stat'] == 'ok') {
       return ApiResponse<String>(data: data['result']);
     }
-  } on DioError catch (e) {
+  } on DioException catch (e) {
     debugPrint(e.message);
   } catch (e) {
     debugPrint('Error $e');
@@ -88,15 +88,14 @@ Future<ApiResponse<bool>> loginUser(
       }
       ApiResponse<StatusModel> status = await sessionStatus();
       if (status.hasData) {
-        Preferences.saveId(status.data!,
-            username: username, password: password);
+        Preferences.saveId(status.data!, username: username, password: password);
       }
       askMediaPermission();
       return ApiResponse<bool>(
         data: true,
       );
     }
-  } on DioError catch (e) {
+  } on DioException catch (e) {
     debugPrint(e.message);
   } catch (e) {
     debugPrint('Error $e');
@@ -108,10 +107,7 @@ Future<ApiResponse<bool>> loginUser(
 }
 
 Future<ApiResponse<StatusModel>> sessionStatus() async {
-  Map<String, String> queries = {
-    'format': 'json',
-    'method': 'pwg.session.getStatus'
-  };
+  Map<String, String> queries = {'format': 'json', 'method': 'pwg.session.getStatus'};
 
   try {
     Response response = await ApiClient.get(queryParameters: queries);
@@ -125,7 +121,7 @@ Future<ApiResponse<StatusModel>> sessionStatus() async {
         data: StatusModel.fromJson(data['result']),
       );
     }
-  } on DioError catch (e) {
+  } on DioException catch (e) {
     debugPrint(e.message);
   } catch (e) {
     debugPrint('Session Status Error: $e');
@@ -139,18 +135,15 @@ Future<ApiResponse<StatusModel>> sessionStatus() async {
 }
 
 Future<String?> communityStatus() async {
-  Map<String, String> queries = {
-    'format': 'json',
-    'method': 'community.session.getStatus'
-  };
+  Map<String, String> queries = {'format': 'json', 'method': 'community.session.getStatus'};
 
   try {
     Response response = await ApiClient.get(queryParameters: queries);
     var data = json.decode(response.data);
     if (data['stat'] == 'ok') {
       return data['result']['real_user_status'];
     }
-  } on DioError catch (e) {
+  } on DioException catch (e) {
     debugPrint(e.message);
   } catch (e) {
     debugPrint('Error $e');
@@ -169,7 +162,7 @@ Future<ApiResponse<InfoModel>> getInfo() async {
         data: InfoModel.fromJson(data['result']),
       );
     }
-  } on DioError catch (e) {
+  } on DioException catch (e) {
     debugPrint(e.message);
   } catch (e) {
     debugPrint('Error $e');
@@ -180,18 +173,14 @@ Future<ApiResponse<InfoModel>> getInfo() async {
 }
 
 Future<ApiResponse<List<String>>> getMethods() async {
-  Map<String, String> queries = {
-    'format': 'json',
-    'method': 'reflection.getMethodList'
-  };
+  Map<String, String> queries = {'format': 'json', 'method': 'reflection.getMethodList'};
 
   try {
     Response response = await ApiClient.get(queryParameters: queries);
     Map<String, dynamic> data = json.decode(response.data);
-    final List<String> methods =
-        data['result']['methods'].map<String>((e) => e.toString()).toList();
+    final List<String> methods = data['result']['methods'].map<String>((e) => e.toString()).toList();
     return ApiResponse<List<String>>(data: methods);
-  } on DioError catch (e) {
+  } on DioException catch (e) {
     debugPrint(e.message);
   } catch (e) {
     debugPrint('Error $e');

lib/network/groups.dart

@@ -57,7 +57,7 @@ Future<List<GroupModel>?> getAllGroups({
     }
 
     return groupsResponse;
-  } on DioError catch (e) {
+  } on DioException catch (e) {
     debugPrint('Fetch all groups: ${e.message}');
   } on Error catch (e) {
     debugPrint('Fetch all groups: ${e.stackTrace}');
@@ -89,7 +89,7 @@ Future<ApiResponse<List<GroupModel>?>> getGroups([int page = 0]) async {
         data: groups,
       );
     }
-  } on DioError catch (e) {
+  } on DioException catch (e) {
     debugPrint('Fetch groups: ${e.message}');
   } on Error catch (e) {
     debugPrint('Fetch groups: ${e.stackTrace}');