#990 - Security check if permissions are granted

Author: graphefruit

src/app/beans/beans.page.ts

@@ -29,6 +29,7 @@ import { Subscription } from 'rxjs';
 import { BeanSortFilterHelperService } from '../../services/beanSortFilterHelper/bean-sort-filter-helper.service';
 import { NfcService } from '../../services/nfcService/nfc-service.service';
 
+import { UIImage } from '../../services/uiImage';
 @Component({
   selector: 'beans',
   templateUrl: './beans.page.html',
@@ -110,6 +111,7 @@ export class BeansPage implements OnDestroy {
     private readonly modalController: ModalController,
     private readonly beanSortFilterHelper: BeanSortFilterHelperService,
     private readonly nfcService: NfcService,
+    private readonly uiImage: UIImage,
   ) {}
 
   public ionViewWillEnter(): void {
@@ -349,8 +351,11 @@ export class BeansPage implements OnDestroy {
   public async scanBean() {
     if (this.platform.is('capacitor')) {
       try {
-        const scannedCode = await this.qrScannerService.scan();
-        await this.intenthandler.handleQRCodeLink(scannedCode);
+        const hasPermission = await this.uiImage.checkCameraPermission();
+        if (hasPermission) {
+          const scannedCode = await this.qrScannerService.scan();
+          await this.intenthandler.handleQRCodeLink(scannedCode);
+        }
       } catch (error) {
         // Just log and do nothing else, it's likely the user just cancelled
         this.uiLog.warn('Bean QR code scan error:', error);

src/assets/i18n/en.json

@@ -1537,5 +1537,6 @@
     "STATISTICS_BEANS_BY_ROASTER": "Beans by Roaster",
     "STATISTICS_BEANS_AVG_RATING_BY_COUNTRY": "Average Bean Rating by Country",
     "PAGE_STATISTICS_AVG_RATING": "Average Rating",
-    "PAGE_SETTINGS_LANGUAGE_GREEK": "Greek"
-}
+    "PAGE_SETTINGS_LANGUAGE_GREEK": "Greek",
+    "NO_CAMERA_PERMISSION": "No camera permission given, please enable inside the OS-System"
+}

src/components/async-image/async-image.component.html

@@ -3,6 +3,3 @@
 @if (!isLoading && !errorOccured && (img | async)) {
   <img [src]="img | async"/>
 }
-@if (isLoading && showLoadingImage) {
-  <img [src]="preloadImg" alt="Image is loading" class="preload-img"/>
-}

src/components/async-image/async-image.component.ts

@@ -10,12 +10,10 @@ import { SafeResourceUrl } from '@angular/platform-browser';
 })
 export class AsyncImageComponent implements OnChanges {
   @Input() public filePath: string;
-  @Input() public showLoadingImage = false;
 
   public errorOccured = false;
   public isLoading = false;
   public img: Promise<SafeResourceUrl | undefined> = Promise.resolve(undefined);
-  public preloadImg = 'assets/img/loading.gif';
   constructor(private uiFileHelper: UIFileHelper) {}
 
   public ngOnChanges(): void {

src/services/uiImage.ts

@@ -5,6 +5,7 @@ import {
   CameraDirection,
   CameraResultType,
   CameraSource,
+  CameraPluginPermissions,
 } from '@capacitor/camera';
 import { AndroidPermissions } from '@awesome-cordova-plugins/android-permissions/ngx';
 
@@ -26,6 +27,10 @@ import { Water } from '../classes/water/water';
 import { Mill } from '../classes/mill/mill';
 import { Preparation } from '../classes/preparation/preparation';
 import { FilePicker } from '@capawesome/capacitor-file-picker';
+import {
+  CameraPermissionType,
+  PermissionStatus,
+} from '@capacitor/camera/dist/esm/definitions';
 
 @Injectable({
   providedIn: 'root',
@@ -185,4 +190,29 @@ export class UIImage {
     await modal.present();
     await modal.onWillDismiss();
   }
+
+  public async checkCameraPermission() {
+    try {
+      const permissionGiven: PermissionStatus = await Camera.checkPermissions();
+      if (permissionGiven.camera == 'denied') {
+        const requestPermission: PermissionStatus =
+          await Camera.requestPermissions({ permissions: ['camera'] });
+        if (requestPermission.camera == 'denied') {
+          await this.uiAlert.showMessage(
+            'NO_CAMERA_PERMISSION',
+            null,
+            null,
+            true,
+          );
+          return false;
+        } else {
+          return true;
+        }
+      } else {
+        return true;
+      }
+    } catch (ex) {
+      return false;
+    }
+  }
 }