Improve the permission handling flow

cem256 · cem256 · commit 0934a419510e · 2023-12-17T01:37:55.000+03:00
diff --git a/lib/core/clients/permission_client/permission_client.dart b/lib/core/clients/permission_client/permission_client.dart
@@ -7,6 +7,8 @@ import 'package:permission_handler/permission_handler.dart';
 abstract interface class PermissionClient {
   Future<bool> hasCameraPermission();
   Future<bool> hasGalleryPermission();
+  Future<void> requestCameraPermission();
+  Future<void> requestGalleryPermission();
 }
 
 @Injectable(as: PermissionClient)
@@ -17,88 +19,79 @@ final class PermissionClientImpl implements PermissionClient {
 
   @override
   Future<bool> hasCameraPermission() async {
-    final hasPermission = await _isCameraPermissionGranted();
-
-    if (hasPermission) {
-      return true;
-    } else {
-      await _requestCameraPermission();
-      return false;
-    }
+    final hasCameraPermission = await _isCameraPermissionGranted();
+    return hasCameraPermission;
   }
 
   @override
   Future<bool> hasGalleryPermission() async {
-    final hasPermission = await _isGalleryPermissionGranted();
-    if (hasPermission) {
-      return true;
-    } else {
-      await _requestGalleryPermission();
-      return false;
-    }
+    final hasGalleryPermission = await _isGalleryPermissionGranted();
+    return hasGalleryPermission;
   }
 
-  Future<bool> _isGalleryPermissionGranted() async {
-    late final PermissionStatus status;
-    if (Platform.isAndroid) {
-      final permission = await _getAndroidGalleryPermissionType();
-      status = await permission.status;
-    } else if (Platform.isIOS) {
-      status = await Permission.photos.status;
-    }
-    return status.isGranted;
-  }
-
-  Future<bool> _isCameraPermissionGranted() async {
-    final status = await Permission.camera.status;
-    return status.isGranted;
-  }
-
-  Future<void> _requestGalleryPermission() async {
+  @override
+  Future<void> requestCameraPermission() async {
     if (Platform.isAndroid) {
-      final permission = await _getAndroidGalleryPermissionType();
+      const permission = Permission.camera;
 
       final before = await permission.shouldShowRequestRationale;
       final rs = await permission.request();
       final after = await permission.shouldShowRequestRationale;
+
       // If the user denies the permission twice, openAppSettings will be called
       if (!rs.isGranted && !before && !after) {
         await openAppSettings();
       }
     } else if (Platform.isIOS) {
-      final result = await Permission.photos.status;
+      final result = await Permission.camera.status;
 
       if (result.isDenied) {
-        await Permission.photos.request();
+        await Permission.camera.request();
       } else if (result.isPermanentlyDenied) {
         await openAppSettings();
       }
     }
   }
 
-  Future<void> _requestCameraPermission() async {
+  @override
+  Future<void> requestGalleryPermission() async {
     if (Platform.isAndroid) {
-      const permission = Permission.camera;
+      final permission = await _getAndroidGalleryPermissionType();
 
       final before = await permission.shouldShowRequestRationale;
       final rs = await permission.request();
       final after = await permission.shouldShowRequestRationale;
-
       // If the user denies the permission twice, openAppSettings will be called
       if (!rs.isGranted && !before && !after) {
         await openAppSettings();
       }
     } else if (Platform.isIOS) {
-      final result = await Permission.camera.status;
+      final result = await Permission.photos.status;
 
       if (result.isDenied) {
-        await Permission.camera.request();
+        await Permission.photos.request();
       } else if (result.isPermanentlyDenied) {
         await openAppSettings();
       }
     }
   }
 
+  Future<bool> _isGalleryPermissionGranted() async {
+    late final PermissionStatus status;
+    if (Platform.isAndroid) {
+      final permission = await _getAndroidGalleryPermissionType();
+      status = await permission.status;
+    } else if (Platform.isIOS) {
+      status = await Permission.photos.status;
+    }
+    return status.isGranted;
+  }
+
+  Future<bool> _isCameraPermissionGranted() async {
+    final status = await Permission.camera.status;
+    return status.isGranted;
+  }
+
   /// Returns the type of the permission depending on the sdk version
   ///* Returns [Permission.storage] if device sdk version is <=32
   ///* Returns [Permission.photos] if device sdk version is >32
diff --git a/lib/feature/detector/data/repositories/detector_repository_impl.dart b/lib/feature/detector/data/repositories/detector_repository_impl.dart
@@ -44,6 +44,22 @@ final class DetectorRepositoryImpl implements DetectorRepository {
 
   final List<String> _supportedLanguages = ['en'];
 
+  @override
+  Future<bool> hasGalleryPermission() async {
+    final hasGalleryPermission = await _permissionClient.hasGalleryPermission();
+    if (hasGalleryPermission) return true;
+    await _permissionClient.requestGalleryPermission();
+    return _permissionClient.hasGalleryPermission();
+  }
+
+  @override
+  Future<bool> hasCameraPermission() async {
+    final hasCameraPermission = await _permissionClient.hasCameraPermission();
+    if (hasCameraPermission) return true;
+    await _permissionClient.requestCameraPermission();
+    return _permissionClient.hasCameraPermission();
+  }
+
   @override
   Future<Either<Failure, DetectorEntity>> detect(String userInput) async {
     if (await _networkInfoClient.isConnected) {
@@ -64,53 +80,39 @@ final class DetectorRepositoryImpl implements DetectorRepository {
 
   @override
   Future<Either<Failure, String>> ocrFromGallery() async {
-    final hasPermission = await _permissionClient.hasGalleryPermission();
-
-    if (hasPermission) {
-      final filePath = await _galleryLocalDataSource.selectFromGallery();
-      if (filePath == null) {
-        // No file selected or unknown path
+    final filePath = await _galleryLocalDataSource.selectFromGallery();
+    if (filePath == null) {
+      // No file selected or unknown path
+      return left(const Failure.ocrFailure());
+    } else {
+      final croppedFilePath = await _imageCropperClient.cropPhoto(filePath: filePath);
+      if (croppedFilePath == null) {
+        // File not cropped  or unknown path
         return left(const Failure.ocrFailure());
       } else {
-        final croppedFilePath = await _imageCropperClient.cropPhoto(filePath: filePath);
-        if (croppedFilePath == null) {
-          // File not cropped  or unknown path
-          return left(const Failure.ocrFailure());
-        } else {
-          final recognizedText = await _textRecognizerClient.recognizeTextFormFilePath(filePath: croppedFilePath);
-          // No text detected
-          return recognizedText.isEmpty ? left(const Failure.ocrFailure()) : right(recognizedText);
-        }
+        final recognizedText = await _textRecognizerClient.recognizeTextFormFilePath(filePath: croppedFilePath);
+        // No text detected
+        return recognizedText.isEmpty ? left(const Failure.ocrFailure()) : right(recognizedText);
       }
-    } else {
-      //  No permission
-      return left(const Failure.noPermission());
     }
   }
 
   @override
   Future<Either<Failure, String>> ocrFromCamera() async {
-    final hasPermission = await _permissionClient.hasCameraPermission();
-
-    if (hasPermission) {
-      final filePath = await _cameraLocalDataSource.takePhoto();
-      if (filePath == null) {
-        // No photo taken or unknown path
+    final filePath = await _cameraLocalDataSource.takePhoto();
+    if (filePath == null) {
+      // No photo taken or unknown path
+      return left(const Failure.ocrFailure());
+    } else {
+      final croppedFilePath = await _imageCropperClient.cropPhoto(filePath: filePath);
+      if (croppedFilePath == null) {
+        // File not cropped  or unknown path
         return left(const Failure.ocrFailure());
       } else {
-        final croppedFilePath = await _imageCropperClient.cropPhoto(filePath: filePath);
-        if (croppedFilePath == null) {
-          // File not cropped  or unknown path
-          return left(const Failure.ocrFailure());
-        } else {
-          final recognizedText = await _textRecognizerClient.recognizeTextFormFilePath(filePath: croppedFilePath);
-          // No text detected
-          return recognizedText.isEmpty ? left(const Failure.ocrFailure()) : right(recognizedText);
-        }
+        final recognizedText = await _textRecognizerClient.recognizeTextFormFilePath(filePath: croppedFilePath);
+        // No text detected
+        return recognizedText.isEmpty ? left(const Failure.ocrFailure()) : right(recognizedText);
       }
-    } else {
-      // No permission
-      return left(const Failure.noPermission());
     }
   }
 }
diff --git a/lib/feature/detector/domain/repositories/detector_repository.dart b/lib/feature/detector/domain/repositories/detector_repository.dart
@@ -6,4 +6,6 @@ abstract interface class DetectorRepository {
   Future<Either<Failure, DetectorEntity>> detect(String userInput);
   Future<Either<Failure, String>> ocrFromGallery();
   Future<Either<Failure, String>> ocrFromCamera();
+  Future<bool> hasGalleryPermission();
+  Future<bool> hasCameraPermission();
 }
diff --git a/lib/feature/detector/domain/use_cases/has_camera_permission_use_case.dart b/lib/feature/detector/domain/use_cases/has_camera_permission_use_case.dart
@@ -0,0 +1,14 @@
+import 'package:gpt_detector/feature/detector/domain/repositories/detector_repository.dart';
+import 'package:injectable/injectable.dart';
+
+@injectable
+class HasCameraPermissionUseCase {
+  HasCameraPermissionUseCase({required DetectorRepository detectorRepository})
+      : _detectorRepository = detectorRepository;
+
+  final DetectorRepository _detectorRepository;
+
+  Future<bool> call() {
+    return _detectorRepository.hasCameraPermission();
+  }
+}
diff --git a/lib/feature/detector/domain/use_cases/has_gallery_permission_use_case.dart b/lib/feature/detector/domain/use_cases/has_gallery_permission_use_case.dart
@@ -0,0 +1,14 @@
+import 'package:gpt_detector/feature/detector/domain/repositories/detector_repository.dart';
+import 'package:injectable/injectable.dart';
+
+@injectable
+class HasGalleryPermissionUseCase {
+  HasGalleryPermissionUseCase({required DetectorRepository detectorRepository})
+      : _detectorRepository = detectorRepository;
+
+  final DetectorRepository _detectorRepository;
+
+  Future<bool> call() {
+    return _detectorRepository.hasGalleryPermission();
+  }
+}
diff --git a/lib/feature/detector/presentation/cubit/detector_cubit.dart b/lib/feature/detector/presentation/cubit/detector_cubit.dart
@@ -5,6 +5,8 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:gpt_detector/app/errors/failure.dart';
 import 'package:gpt_detector/feature/detector/domain/entities/detector/detector_entity.dart';
 import 'package:gpt_detector/feature/detector/domain/use_cases/detect_use_case.dart';
+import 'package:gpt_detector/feature/detector/domain/use_cases/has_camera_permission_use_case.dart';
+import 'package:gpt_detector/feature/detector/domain/use_cases/has_gallery_permission_use_case.dart';
 import 'package:gpt_detector/feature/detector/domain/use_cases/ocr_from_camera_use_case.dart';
 import 'package:gpt_detector/feature/detector/domain/use_cases/ocr_from_gallery_use_case.dart';
 import 'package:injectable/injectable.dart';
@@ -18,14 +20,30 @@ class DetectorCubit extends Cubit<DetectorState> {
     required DetectUseCase detectUseCase,
     required OCRFromGalleryUseCase ocrFromGalleryUseCase,
     required OCRFromCameraUseCase ocrFromCameraUseCase,
+    required HasCameraPermissionUseCase hasCameraPermissionUseCase,
+    required HasGalleryPermissionUseCase hasGalleryPermissionUseCase,
   })  : _detectUseCase = detectUseCase,
         _ocrFromGalleryUseCase = ocrFromGalleryUseCase,
         _ocrFromCameraUseCase = ocrFromCameraUseCase,
+        _hasCameraPermissionUseCase = hasCameraPermissionUseCase,
+        _hasGalleryPermissionUseCase = hasGalleryPermissionUseCase,
         super(DetectorState.initial());
 
   final DetectUseCase _detectUseCase;
   final OCRFromGalleryUseCase _ocrFromGalleryUseCase;
   final OCRFromCameraUseCase _ocrFromCameraUseCase;
+  final HasCameraPermissionUseCase _hasCameraPermissionUseCase;
+  final HasGalleryPermissionUseCase _hasGalleryPermissionUseCase;
+
+  Future<void> checkCameraPermission() async {
+    final hasCameraPermission = await _hasCameraPermissionUseCase.call();
+    emit(state.copyWith(hasCameraPermission: hasCameraPermission));
+  }
+
+  Future<void> checkGalleryPermission() async {
+    final hasGalleryPermission = await _hasGalleryPermissionUseCase.call();
+    emit(state.copyWith(hasGalleryPermission: hasGalleryPermission));
+  }
 
   Future<void> detectionRequested({required String text}) async {
     emit(state.copyWith(status: FormzStatus.submissionInProgress));
diff --git a/lib/feature/detector/presentation/cubit/detector_state.dart b/lib/feature/detector/presentation/cubit/detector_state.dart
@@ -7,6 +7,8 @@ class DetectorState with _$DetectorState {
     required UserInputForm userInput,
     required DetectorEntity result,
     Failure? failure,
+    bool? hasCameraPermission,
+    bool? hasGalleryPermission,
   }) = _DetectorState;
 
   factory DetectorState.initial() => DetectorState(
diff --git a/lib/feature/detector/presentation/view/detect_view.dart b/lib/feature/detector/presentation/view/detect_view.dart
@@ -146,15 +146,26 @@ class _DetectViewBodyState extends State<_DetectViewBody> {
                           IconButton(
                             icon: const Icon(Icons.photo_library),
                             onPressed: () async {
+                              // Control the gallery permission
+                              await context.read<DetectorCubit>().checkGalleryPermission();
+                              if (!context.mounted) return;
+                              // If there is no gallery access, then exit
+                              if (!(context.read<DetectorCubit>().state.hasGalleryPermission ?? true)) return;
+                              if (!context.mounted) return;
                               await context.read<DetectorCubit>().ocrFromGalleryPressed();
-                              if (mounted) {
-                                _controller.text = context.read<DetectorCubit>().state.userInput.value;
-                              }
+                              if (!context.mounted) return;
+                              _controller.text = context.read<DetectorCubit>().state.userInput.value;
                             },
                           ),
                           IconButton(
                             icon: const Icon(Icons.photo_camera),
                             onPressed: () async {
+                              // Control the camera permission
+                              await context.read<DetectorCubit>().checkCameraPermission();
+                              if (!context.mounted) return;
+                              // If there is no camera access, then exit
+                              if (!(context.read<DetectorCubit>().state.hasCameraPermission ?? true)) return;
+                              if (!context.mounted) return;
                               await context.read<DetectorCubit>().ocrFromCameraPressed();
                               if (!context.mounted) return;
                               _controller.text = context.read<DetectorCubit>().state.userInput.value;
diff --git a/lib/feature/onboarding/presentation/view/onboarding_view.dart b/lib/feature/onboarding/presentation/view/onboarding_view.dart
@@ -96,9 +96,8 @@ class _OnboardingViewBody extends StatelessWidget {
             ElevatedButton(
               onPressed: () async {
                 await context.read<OnboardingCubit>().completeOnboarding();
-                if (context.mounted) {
-                  unawaited(AppRouter.pushReplacement(context, const DetectView()));
-                }
+                if (!context.mounted) return;
+                unawaited(AppRouter.pushReplacement(context, const DetectView()));
               },
               child: Text(context.l10n.getStarted),
             ),
diff --git a/test/feature/detector/presentation/cubit/detector_cubit_test.dart b/test/feature/detector/presentation/cubit/detector_cubit_test.dart
@@ -8,6 +8,8 @@ import 'package:gpt_detector/app/errors/failure.dart';
 import 'package:gpt_detector/feature/detector/data/model/detector/detector_model.dart';
 import 'package:gpt_detector/feature/detector/domain/entities/detector/detector_entity.dart';
 import 'package:gpt_detector/feature/detector/domain/use_cases/detect_use_case.dart';
+import 'package:gpt_detector/feature/detector/domain/use_cases/has_camera_permission_use_case.dart';
+import 'package:gpt_detector/feature/detector/domain/use_cases/has_gallery_permission_use_case.dart';
 import 'package:gpt_detector/feature/detector/domain/use_cases/ocr_from_camera_use_case.dart';
 import 'package:gpt_detector/feature/detector/domain/use_cases/ocr_from_gallery_use_case.dart';
 import 'package:gpt_detector/feature/detector/presentation/cubit/detector_cubit.dart';
@@ -19,6 +21,10 @@ class MockOCRFromGalleryUseCase extends Mock implements OCRFromGalleryUseCase {}
 
 class MockOCRFromCameraUseCase extends Mock implements OCRFromCameraUseCase {}
 
+class MockHasCameraPermissionUseCase extends Mock implements HasCameraPermissionUseCase {}
+
+class MockHasGalleryPermissionUseCase extends Mock implements HasGalleryPermissionUseCase {}
+
 class MockDetectorEntity extends Mock implements DetectorEntity {}
 
 String generateRandomString(int len) {
@@ -37,6 +43,8 @@ void main() {
   late MockDetectUseCase mockDetectUseCase;
   late MockOCRFromGalleryUseCase mockOCRFromGalleryUseCase;
   late MockOCRFromCameraUseCase mockOCRFromCameraUseCase;
+  late MockHasCameraPermissionUseCase mockHasCameraPermissionUseCase;
+  late MockHasGalleryPermissionUseCase mockHasGalleryPermissionUseCase;
   late MockDetectorEntity mockDetectorEntity;
   late String validUserInput;
   late UserInputForm validInputForm;
@@ -47,10 +55,14 @@ void main() {
     mockDetectUseCase = MockDetectUseCase();
     mockOCRFromGalleryUseCase = MockOCRFromGalleryUseCase();
     mockOCRFromCameraUseCase = MockOCRFromCameraUseCase();
+    mockHasCameraPermissionUseCase = MockHasCameraPermissionUseCase();
+    mockHasGalleryPermissionUseCase = MockHasGalleryPermissionUseCase();
     detectorCubit = DetectorCubit(
       detectUseCase: mockDetectUseCase,
       ocrFromGalleryUseCase: mockOCRFromGalleryUseCase,
       ocrFromCameraUseCase: mockOCRFromCameraUseCase,
+      hasCameraPermissionUseCase: mockHasCameraPermissionUseCase,
+      hasGalleryPermissionUseCase: mockHasGalleryPermissionUseCase,
     );
     mockDetectorEntity = MockDetectorEntity();
     validUserInput = generateRandomString(250);

Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,6 @@ abstract interface class DetectorRepository {`
`6`	`6`	`Future<Either<Failure, DetectorEntity>> detect(String userInput);`
`7`	`7`	`Future<Either<Failure, String>> ocrFromGallery();`
`8`	`8`	`Future<Either<Failure, String>> ocrFromCamera();`
	`9`	`+ Future<bool> hasGalleryPermission();`
	`10`	`+ Future<bool> hasCameraPermission();`
`9`	`11`	`}`