Do not use blockingGet to save backup files polarofficial#517

korzonkiee · Dec 9, 2024 · 290a93a · 290a93a
1 parent 734c1f1
commit 290a93a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/...es/Android/android-communications/library/src/sdk/java/com/polar/sdk/impl/BDBleApiImpl.kt b/...es/Android/android-communications/library/src/sdk/java/com/polar/sdk/impl/BDBleApiImpl.kt
@@ -1963,6 +1963,10 @@ class BDBleApiImpl private constructor(context: Context, features: Set<PolarBleS
                                         backupManager.backupDevice()
                                                 .toFlowable()
                                                 .flatMap {
+                                                    backup.addAll(it)
+
+                                                    BleLogger.d(TAG, "Device backup completed: $it, starting firmware update to version ${firmwareUpdateResponse.version}")
+
                                                     firmwareUpdateApi.getFirmwareUpdatePackage(firmwareUpdateResponse.fileUrl)
                                                             .toFlowable()
                                                             .flatMap { firmwareBytes ->
@@ -2048,10 +2052,6 @@ class BDBleApiImpl private constructor(context: Context, features: Set<PolarBleS
                                                                     Flowable.error(error)
                                                                 }
                                                             }
-                                                            .doOnSubscribe {
-                                                                BleLogger.d(TAG, "Preparing for firmware update started, fetching backup content...")
-                                                                backup.addAll(backupManager.backupDevice().blockingGet())
-                                                            }
                                                             .doFinally {
                                                                 val disposable = setLocalTime(identifier, Calendar.getInstance())
                                                                         .andThen(Completable.fromAction {

diff --git a/...ndroid-communications/library/src/sdk/java/com/polar/sdk/impl/utils/PolarBackupManager.kt b/...ndroid-communications/library/src/sdk/java/com/polar/sdk/impl/utils/PolarBackupManager.kt
@@ -45,7 +45,11 @@ class PolarBackupManager(private val client: BlePsFtpClient) {
      * @return Single emitting the list of backed up file data.
      */
     fun backupDevice(): Single<List<BackupFileData>> {
+        BleLogger.d(TAG, "Backing up device")
+
         return Single.fromCallable {
+            BleLogger.d(TAG, "Requesting backup content")
+
             val builder = PftpRequest.PbPFtpOperation.newBuilder()
             builder.command = PftpRequest.PbPFtpOperation.Command.GET
             builder.path = ARABICA_SYS_FOLDER
@@ -111,6 +115,8 @@ class PolarBackupManager(private val client: BlePsFtpClient) {
         }.onErrorReturn {
             BleLogger.e(TAG, "Failed to get backup content, error: $it")
             emptyList()
+        }.doOnSuccess { backupFiles ->
+            BleLogger.d(TAG, "Backup completed, files backed up: ${backupFiles.size}")
         }
     }