Refactor FriendicaImageClient to RP providers

lib/friendica_client/friendica_client.dart

@@ -29,35 +29,6 @@ import '../serializers/mastodon/timeline_entry_mastodon_extensions.dart';
 import '../services/network_status_service.dart';
 import '../utils/network_utils.dart';
 
-class ImageClient extends FriendicaClient {
-  ImageClient(super.credentials) : super();
-
-  FutureResult<ImageEntry, ExecError> editImageData(ImageEntry image) async {
-    //_networkStatusService.startGalleryLoading();
-    final uri = Uri.parse('https://$serverName/api/friendica/photo/update');
-    final body = {
-      'album': image.album,
-      'desc': image.description,
-      'photo_id': image.id,
-    };
-
-    final result = await postUrl(uri, body, headers: _headers)
-        .andThen((_) => Result.ok(image));
-    //_networkStatusService.finishGalleryLoading();
-    return result.execErrorCast();
-  }
-
-  FutureResult<ImageEntry, ExecError> deleteImage(ImageEntry image) async {
-    final uri = Uri.parse(
-      'https://$serverName/api/friendica/photo/delete?photo_id=${image.id}',
-    );
-
-    final result = await postUrl(uri, {}, headers: _headers)
-        .andThen((_) => Result.ok(image));
-    return result.execErrorCast();
-  }
-}
-
 class InteractionsClient extends FriendicaClient {
   static final _logger = Logger('$InteractionsClient');
 
@@ -573,19 +544,6 @@ abstract class FriendicaClient {
     ).execErrorCastAsync();
   }
 
-  FutureResult<PagedResponse<dynamic>, ExecError> _getApiPagedRequest(Uri url,
-      {Duration? timeout}) async {
-    return await getUrl(
-      url,
-      headers: _headers,
-      timeout: timeout,
-    ).transformAsync(
-      (response) async {
-        return response.map((data) => jsonDecode(data));
-      },
-    ).execErrorCastAsync();
-  }
-
   FutureResult<dynamic, ExecError> _getApiRequest(Uri url,
       {Duration? timeout}) async {
     return await getUrl(

lib/riverpod_controllers/gallery_services.dart

@@ -3,13 +3,13 @@ import 'package:logging/logging.dart';
 import 'package:result_monad/result_monad.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
-import '../friendica_client/friendica_client.dart';
 import '../models/auth/profile.dart';
 import '../models/exec_error.dart';
 import '../models/gallery_data.dart';
 import '../models/image_entry.dart';
 import '../models/networking/paging_data.dart';
 import 'networking/friendica_gallery_client_services.dart';
+import 'networking/friendica_image_client_services.dart';
 import 'rp_provider_extension.dart';
 
 part 'gallery_services.g.dart';
@@ -167,8 +167,9 @@ class GalleryImages extends _$GalleryImages {
           type: ErrorType.notFound,
           message: 'Image ${image.id} does not exist for ${image.album}');
     }
-    final result =
-        await ImageClient(profile).editImageData(image).withResult((_) {
+    final result = await ref
+        .read(editImageDataProvider(profile, image).future)
+        .withResult((_) {
       images[index] = image;
     });
 
@@ -189,11 +190,10 @@ class GalleryImages extends _$GalleryImages {
           type: ErrorType.notFound,
           message: 'Image ${image.id} does not exist for ${image.album}');
     }
-    final result = await ImageClient(profile)
-        .deleteImage(image)
-        .withResultAsync((_) async {
-      images.remove(image);
-    });
+
+    final result = await ref
+        .read(deleteImageProvider(profile, image).future)
+        .withResult((_) => images.remove(image));
 
     state = AsyncData(result.transform((_) => images.toList()).execErrorCast());
     return result.execErrorCast();

lib/riverpod_controllers/gallery_services.g.dart

@@ -660,7 +660,7 @@ class _GalleryProviderElement extends AutoDisposeAsyncNotifierProviderElement<
   String get galleryName => (origin as GalleryProvider).galleryName;
 }
 
-String _$galleryImagesHash() => r'33a01f619a71e9bbe1d41164e2c1a12deea9fcd1';
+String _$galleryImagesHash() => r'1614e0528f38368fc8fe4b2e4a095570653e0f08';
 
 abstract class _$GalleryImages extends BuildlessAutoDisposeAsyncNotifier<
     Result<List<ImageEntry>, ExecError>> {

lib/riverpod_controllers/networking/friendica_image_client_services.dart

@@ -0,0 +1,49 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:result_monad/result_monad.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+import '../../models/auth/profile.dart';
+import '../../models/exec_error.dart';
+import '../../models/image_entry.dart';
+import 'friendica_client_services.dart';
+import 'network_services.dart';
+
+part 'friendica_image_client_services.g.dart';
+
+@riverpod
+Future<Result<ImageEntry, ExecError>> editImageData(
+  Ref ref,
+  Profile profile,
+  ImageEntry image,
+) async {
+  final uri =
+      Uri.parse('https://${profile.serverName}/api/friendica/photo/update');
+  final headers = ref.read(friendicaClientHeadersProvider(profile));
+  final body = {
+    'album': image.album,
+    'desc': image.description,
+    'photo_id': image.id,
+  };
+  final request = NetworkRequest(uri, headers: headers, body: body);
+
+  final result =
+      await ref.read(httpPostProvider(request).future).transform((_) => image);
+  return result.execErrorCast();
+}
+
+@riverpod
+Future<Result<ImageEntry, ExecError>> deleteImage(
+  Ref ref,
+  Profile profile,
+  ImageEntry image,
+) async {
+  final uri = Uri.parse(
+    'https://${profile.serverName}/api/friendica/photo/delete?photo_id=${image.id}',
+  );
+  final headers = ref.read(friendicaClientHeadersProvider(profile));
+  final request = NetworkRequest(uri, headers: headers);
+
+  final result =
+      await ref.read(httpPostProvider(request).future).transform((_) => image);
+  return result.execErrorCast();
+}

lib/riverpod_controllers/networking/friendica_image_client_services.g.dart

@@ -0,0 +1,336 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'friendica_image_client_services.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$editImageDataHash() => r'09dff447610d4b3b9cc42c191f2f0ff7120c3cc3';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+/// See also [editImageData].
+@ProviderFor(editImageData)
+const editImageDataProvider = EditImageDataFamily();
+
+/// See also [editImageData].
+class EditImageDataFamily
+    extends Family<AsyncValue<Result<ImageEntry, ExecError>>> {
+  /// See also [editImageData].
+  const EditImageDataFamily();
+
+  /// See also [editImageData].
+  EditImageDataProvider call(
+    Profile profile,
+    ImageEntry image,
+  ) {
+    return EditImageDataProvider(
+      profile,
+      image,
+    );
+  }
+
+  @override
+  EditImageDataProvider getProviderOverride(
+    covariant EditImageDataProvider provider,
+  ) {
+    return call(
+      provider.profile,
+      provider.image,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'editImageDataProvider';
+}
+
+/// See also [editImageData].
+class EditImageDataProvider
+    extends AutoDisposeFutureProvider<Result<ImageEntry, ExecError>> {
+  /// See also [editImageData].
+  EditImageDataProvider(
+    Profile profile,
+    ImageEntry image,
+  ) : this._internal(
+          (ref) => editImageData(
+            ref as EditImageDataRef,
+            profile,
+            image,
+          ),
+          from: editImageDataProvider,
+          name: r'editImageDataProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$editImageDataHash,
+          dependencies: EditImageDataFamily._dependencies,
+          allTransitiveDependencies:
+              EditImageDataFamily._allTransitiveDependencies,
+          profile: profile,
+          image: image,
+        );
+
+  EditImageDataProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.profile,
+    required this.image,
+  }) : super.internal();
+
+  final Profile profile;
+  final ImageEntry image;
+
+  @override
+  Override overrideWith(
+    FutureOr<Result<ImageEntry, ExecError>> Function(EditImageDataRef provider)
+        create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: EditImageDataProvider._internal(
+        (ref) => create(ref as EditImageDataRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        profile: profile,
+        image: image,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeFutureProviderElement<Result<ImageEntry, ExecError>>
+      createElement() {
+    return _EditImageDataProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is EditImageDataProvider &&
+        other.profile == profile &&
+        other.image == image;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, profile.hashCode);
+    hash = _SystemHash.combine(hash, image.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin EditImageDataRef
+    on AutoDisposeFutureProviderRef<Result<ImageEntry, ExecError>> {
+  /// The parameter `profile` of this provider.
+  Profile get profile;
+
+  /// The parameter `image` of this provider.
+  ImageEntry get image;
+}
+
+class _EditImageDataProviderElement
+    extends AutoDisposeFutureProviderElement<Result<ImageEntry, ExecError>>
+    with EditImageDataRef {
+  _EditImageDataProviderElement(super.provider);
+
+  @override
+  Profile get profile => (origin as EditImageDataProvider).profile;
+  @override
+  ImageEntry get image => (origin as EditImageDataProvider).image;
+}
+
+String _$deleteImageHash() => r'ace87bc6737b6b72a807e2d4a404911ee575c11f';
+
+/// See also [deleteImage].
+@ProviderFor(deleteImage)
+const deleteImageProvider = DeleteImageFamily();
+
+/// See also [deleteImage].
+class DeleteImageFamily
+    extends Family<AsyncValue<Result<ImageEntry, ExecError>>> {
+  /// See also [deleteImage].
+  const DeleteImageFamily();
+
+  /// See also [deleteImage].
+  DeleteImageProvider call(
+    Profile profile,
+    ImageEntry image,
+  ) {
+    return DeleteImageProvider(
+      profile,
+      image,
+    );
+  }
+
+  @override
+  DeleteImageProvider getProviderOverride(
+    covariant DeleteImageProvider provider,
+  ) {
+    return call(
+      provider.profile,
+      provider.image,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'deleteImageProvider';
+}
+
+/// See also [deleteImage].
+class DeleteImageProvider
+    extends AutoDisposeFutureProvider<Result<ImageEntry, ExecError>> {
+  /// See also [deleteImage].
+  DeleteImageProvider(
+    Profile profile,
+    ImageEntry image,
+  ) : this._internal(
+          (ref) => deleteImage(
+            ref as DeleteImageRef,
+            profile,
+            image,
+          ),
+          from: deleteImageProvider,
+          name: r'deleteImageProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$deleteImageHash,
+          dependencies: DeleteImageFamily._dependencies,
+          allTransitiveDependencies:
+              DeleteImageFamily._allTransitiveDependencies,
+          profile: profile,
+          image: image,
+        );
+
+  DeleteImageProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.profile,
+    required this.image,
+  }) : super.internal();
+
+  final Profile profile;
+  final ImageEntry image;
+
+  @override
+  Override overrideWith(
+    FutureOr<Result<ImageEntry, ExecError>> Function(DeleteImageRef provider)
+        create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: DeleteImageProvider._internal(
+        (ref) => create(ref as DeleteImageRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        profile: profile,
+        image: image,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeFutureProviderElement<Result<ImageEntry, ExecError>>
+      createElement() {
+    return _DeleteImageProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is DeleteImageProvider &&
+        other.profile == profile &&
+        other.image == image;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, profile.hashCode);
+    hash = _SystemHash.combine(hash, image.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin DeleteImageRef
+    on AutoDisposeFutureProviderRef<Result<ImageEntry, ExecError>> {
+  /// The parameter `profile` of this provider.
+  Profile get profile;
+
+  /// The parameter `image` of this provider.
+  ImageEntry get image;
+}
+
+class _DeleteImageProviderElement
+    extends AutoDisposeFutureProviderElement<Result<ImageEntry, ExecError>>
+    with DeleteImageRef {
+  _DeleteImageProviderElement(super.provider);
+
+  @override
+  Profile get profile => (origin as DeleteImageProvider).profile;
+  @override
+  ImageEntry get image => (origin as DeleteImageProvider).image;
+}
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/screens/existing_image_selector_screen.dart

@@ -135,6 +135,7 @@ class _ExistingImageSelectorScreenState
                     maxCrossAxisExtent: thumbnailDimension),
                 itemBuilder: (context, index) {
                   final image = images[index];
+                  // TODO May need to take out since there is a count discrepency for OAuth users
                   if (images.length < expectedPhotoCount &&
                       index == images.length - 1) {
                     ref