Merge pull request #2966 from numbersprotocol/fix-v230725-issue-Some-device-can’t-record-15s-SHORT-by-Capture-camera

Fix v230725 issue some device can’t record 15s short by capture camera

Author: sultanmyrza

src/app/features/home/custom-camera/custom-camera.page.html

@@ -148,6 +148,7 @@
 
   <app-pre-publish-mode
     *ngIf="(mode$ | ngrxPush) === 'pre-publish'"
+    [curCaptureCameraSource]="curCaptureCameraSource"
     [curCaptureFileSize]="curCaptureFileSize"
     [curCaptureFilePath]="curCaptureFilePath"
     [curCaptureFileName]="curCaptureFileName"

src/app/features/home/custom-camera/pre-publish-mode/pre-publish-mode.component.ts

@@ -7,6 +7,7 @@ import {
   Output,
   ViewChild,
 } from '@angular/core';
+import { CameraSource } from '@capacitor/camera';
 import { Directory, FilesystemPlugin } from '@capacitor/filesystem';
 import { AlertController, Platform } from '@ionic/angular';
 import { TranslocoService } from '@ngneat/transloco';
@@ -58,6 +59,12 @@ export class PrePublishModeComponent {
 
   private toggleBlackAndWhiteFilter = true;
 
+  readonly curCaptureCameraSource$ = new ReplaySubject<CameraSource>(1);
+
+  readonly isFromGallery$ = this.curCaptureCameraSource$.pipe(
+    map(cameraSource => cameraSource === CameraSource.Photos)
+  );
+
   readonly curCaptureFileSize$ = new ReplaySubject<number>(1);
 
   readonly curCaptureFilePath$ = new ReplaySubject<string>(1);
@@ -98,7 +105,12 @@ export class PrePublishModeComponent {
   readonly isFileSizeExceeded$ = combineLatest([
     this.curCaptureFileSize$,
     this.maxAllowedFileSize$,
-  ]).pipe(map(([curSize, maxSize]) => curSize < maxSize));
+  ]).pipe(map(([curSize, maxSize]) => curSize > maxSize));
+
+  @Input()
+  set curCaptureCameraSource(value: CameraSource | undefined) {
+    if (value) this.curCaptureCameraSource$.next(value);
+  }
 
   @Input()
   set curCaptureFileSize(value: number | undefined) {
@@ -223,21 +235,25 @@ export class PrePublishModeComponent {
       tap(isImage => (isImage ? this.confirmImage() : this.confirmVideo()))
     );
 
-    const showIsFileSizeExceededAction$ = defer(() =>
-      this.showIsFileSizeExceededModal()
+    const showFileSizeExceededAction$ = defer(() =>
+      this.showFileSizeExceededModal()
     );
 
-    this.isFileSizeExceeded$
+    const shouldShowFileSizeExeededDialog$ = combineLatest([
+      this.isFromGallery$,
+      this.isFileSizeExceeded$,
+    ]).pipe(map(([c1, c2]) => c1 === true && c2 === true));
+
+    shouldShowFileSizeExeededDialog$
       .pipe(
         first(),
-        switchMap(hasEnoughMemory =>
+        switchMap(shouldShowFileSizeExeededDialog =>
           iif(
-            () => hasEnoughMemory,
-            runConfirmAction$,
-            showIsFileSizeExceededAction$
+            () => shouldShowFileSizeExeededDialog,
+            showFileSizeExceededAction$,
+            runConfirmAction$
           )
-        ),
-        catchError((error: unknown) => this.errorService.toastError$(error))
+        )
       )
       .subscribe();
   }
@@ -259,7 +275,7 @@ export class PrePublishModeComponent {
     this.confirm.emit(true);
   }
 
-  private showIsFileSizeExceededModal() {
+  private showFileSizeExceededModal() {
     const translations$ = this.translocoService.selectTranslateObject({
       'customCamera.error.fileSizeExeedsLimit': null,
       ok: null,