Merge master

Author: ReightI

lib/api/api_client.dart

@@ -133,13 +133,7 @@ class ApiClient {
 class SSLHttpOverrides extends HttpOverrides {
   @override
   HttpClient createHttpClient(SecurityContext? context) {
-    return super.createHttpClient(context)..badCertificateCallback = ApiClient.piwigoSSLBypass;
-  }
-}
-
-class SSLHttpOverrides extends HttpOverrides {
-  @override
-  HttpClient createHttpClient(SecurityContext? context) {
-    return super.createHttpClient(context)..badCertificateCallback = ApiClient.piwigoSSLBypass;
+    return super.createHttpClient(context)
+      ..badCertificateCallback = ApiClient.piwigoSSLBypass;
   }
 }

lib/models/image_model.dart

@@ -36,23 +36,6 @@ class ImageModel {
     this.tags = const [],
   });
 
-  ImageModel({
-    required this.id,
-    this.width = 1,
-    this.height = 1,
-    this.hit = 0,
-    this.favorite = false,
-    this.file = '',
-    required this.name,
-    this.comment,
-    this.dateCreation,
-    this.dateAvailable,
-    this.pageUrl,
-    required this.elementUrl,
-    required this.derivatives,
-    this.categories = const [],
-  });
-
   ImageModel.fromJson(Map<String, dynamic> json)
       : id = json['id'],
         width = int.tryParse(json['width'].toString()) ?? 0,
@@ -106,33 +89,6 @@ class ImageModel {
     return mimeType != null && mimeType.startsWith('video');
   }
 
-  Derivative? getDerivativeFromString(String derivative) {
-    switch (derivative) {
-      case 'square':
-        return derivatives.square;
-      case 'thumb':
-        return derivatives.thumbnail;
-      case '2small':
-        return derivatives.xxsmall;
-      case 'xsmall':
-        return derivatives.xsmall;
-      case 'small':
-        return derivatives.small;
-      case 'medium':
-        return derivatives.medium;
-      case 'large':
-        return derivatives.large;
-      case 'xlarge':
-        return derivatives.xlarge;
-      case 'xxlarge':
-        return derivatives.xxlarge;
-      case 'full':
-        return derivatives.full;
-      default:
-        return null;
-    }
-  }
-
   @override
   operator ==(other) => other is ImageModel && id == other.id;
 

lib/services/preferences_service.dart

@@ -86,15 +86,6 @@ class Preferences {
     return Settings.sortFromValue(sortValue);
   }
 
-  static const String imageSortKey = 'IMAGE_SORT';
-  static SortMethods get getImageSort {
-    String? sortValue = appPreferences.getString(imageSortKey);
-    if (sortValue == null) {
-      return Settings.defaultImageSort;
-    }
-    return Settings.sortFromValue(sortValue);
-  }
-
   static const String albumThumbnailSizeKey = 'ALBUM_THUMBNAIL_SIZE';
 
   static String get getAlbumThumbnailSize {
@@ -155,16 +146,6 @@ class Preferences {
     return appPreferences.getBool(uploadNotificationKey) ?? true;
   }
 
-  static const String downloadNotification = 'DOWNLOAD_NOTIFICATION';
-  static bool get getDownloadNotification {
-    return appPreferences.getBool(downloadNotification) ?? true;
-  }
-
-  static const String uploadNotification = 'UPLOAD_NOTIFICATION';
-  static bool get getUploadNotification {
-    return appPreferences.getBool(uploadNotification) ?? true;
-  }
-
   // ------------ Set preferences ------------
 
   /// Save account login (username and password)