Merge pull request #1519 from sultanmyrza/feature-try-2-fix-go-pro-bluetooth-connections

Feature try 2 fix go pro bluetooth connections

Author: shc261392

package-lock.json

@@ -29,7 +29,7 @@
     "@angular/platform-browser-dynamic": "^12.2.4",
     "@angular/router": "^12.2.4",
     "@capacitor-community/bluetooth-le": "^1.7.0",
-    "@capacitor-community/http": "^1.4.1",
+    "@capacitor-community/http": "github:numbersprotocol/http#fix-catch-disabled-Local-Network-case-on-iOS",
     "@capacitor-community/wifi": "github:numbersprotocol/community-capacitor-wifi#capacitor3",
     "@capacitor/android": "https://gitpkg.now.sh/numbersprotocol/capacitor/android?release-3.4.1-range-request-fix",
     "@capacitor/app": "^1.1.0",

package.json

@@ -172,7 +172,7 @@ export class HomePage {
         takePicture: null,
         recordVideo: null,
       }),
-      this.goProBluetoothService.connectedDevice$,
+      this.goProBluetoothService.lastConnectedDevice$,
     ]).pipe(
       first(),
       concatMap(([translations, connectedDevice]) => {

src/app/features/home/home.page.ts

@@ -26,6 +26,7 @@ <h4>{{ t('gopro.connectedWiFi') }}: {{ connectedWifiSSID }}</h4>
   <ion-button
     *ngIf="!isConnectedToGoProWifi"
     (click)="connectToGoProWifi()"
+    [disabled]="isConnectingToGoProWifi"
     class="connect-to-go-pro-wifi-btn"
   >
     {{ t('gopro.connectToGoProWiFi') }}

src/app/features/settings/go-pro/go-pro-media-list-on-camera/go-pro-media-list-on-camera.component.html

@@ -4,8 +4,10 @@ import { Router } from '@angular/router';
 import {
   AlertController,
   NavController,
+  Platform,
   ToastController,
 } from '@ionic/angular';
+import { ErrorService } from '../../../../shared/error/error.service';
 import { GoProFile } from '../go-pro-media-file';
 import { GoProBluetoothService } from '../services/go-pro-bluetooth.service';
 import { GoProMediaService } from '../services/go-pro-media.service';
@@ -25,6 +27,7 @@ export class GoProMediaListOnCameraComponent implements OnInit {
 
   connectedWifiSSID: string | null = null;
   isConnectedToGoProWifi: boolean | undefined;
+  isConnectingToGoProWifi: boolean | undefined;
 
   isScrollingContent = false;
 
@@ -42,6 +45,8 @@ export class GoProMediaListOnCameraComponent implements OnInit {
     private readonly alertCtrl: AlertController,
     private readonly goProBluetoothService: GoProBluetoothService,
     private readonly goProWifiService: GoProWifiService,
+    private readonly platform: Platform,
+    private readonly errorService: ErrorService,
     public toastController: ToastController
   ) {}
 
@@ -64,21 +69,36 @@ export class GoProMediaListOnCameraComponent implements OnInit {
       this.fetchingFilesError = undefined;
       this.fetchingFiles = true;
       this.allMediaFiles = await this.goProMediaService.getFilesFromGoPro();
-      this.fetchingFiles = false;
     } catch (error: any) {
-      this.fetchingFilesError = error.toString();
+      this.fetchingFilesError = 'Failed to fetch media from GoPro';
+      if (this.platform.is('ios')) {
+        this.fetchingFilesError =
+          'Please check iOS Settings > Capture > Local Network, make sure the permission of Local Network is allowed Capture app.';
+      }
       this.allMediaFiles = [];
+    } finally {
       this.fetchingFiles = false;
     }
   }
 
   async connectToGoProWifi() {
     try {
+      this.isConnectingToGoProWifi = true;
+
+      if (!(await this.goProBluetoothService.getConnectedDevice())) {
+        await this.errorService
+          .toastError$('Connect to GoPro via bluetooth first')
+          .toPromise();
+        // I need to show alert because when catching error below for some reason it's empty
+        throw new Error('Connect to GoPro via bluetooth first');
+      }
       this.connectedWifiSSID = await this.goProWifiService.connectToGoProWiFi();
       this.isConnectedToGoProWifi = true;
       await this.fetchFilesFromGoProWiFi();
     } catch (error) {
       this.presentToast(JSON.stringify(error));
+    } finally {
+      this.isConnectingToGoProWifi = false;
     }
   }
 

src/app/features/settings/go-pro/go-pro-media-list-on-camera/go-pro-media-list-on-camera.component.ts

@@ -65,6 +65,10 @@ export class GoProBluetoothService {
     undefined
   );
 
+  readonly lastConnectedDevice$ = this.preferences.getString$(
+    PrefKeys.LAST_CONNECTED_BLUETOOTH_DEVICE
+  );
+
   constructor(private readonly preferenceManager: PreferenceManager) {}
 
   private async initialize() {