cloud log upload bug fix

diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Pump.kt

@@ -19,6 +19,9 @@ class DiaconnG8Pump @Inject constructor(
     private val aapsLogger: AAPSLogger,
     private val dateUtil: DateUtil
 ) {
+
+    var isPumplogUploadFailed: Boolean = false
+
     //var bleResultInfo: Pair<Int?, Boolean> = Pair(null, false)
     var bolusConfirmMessage: Byte = 0
     var isReadyToBolus: Boolean = false

diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquireResponsePacket.kt

@@ -846,6 +846,8 @@ class BigLogInquireResponsePacket(
                             }
                         }
                         override fun onFailure(call: Call<ApiResponse>, t: Throwable) {
+                            aapsLogger.error(LTag.PUMPCOMM, "api uploadPumplogs failed")
+                            diaconnG8Pump.isPumplogUploadFailed = true
                             t.printStackTrace()
                         }
                     }

diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/BLECommonService.kt

@@ -270,6 +270,11 @@ class BLECommonService @Inject internal constructor(
         val bytes = message.encode(sequence)
         processedMessageByte = bytes
 
+        if (bluetoothGatt == null) {
+            aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> IGNORING (NOT CONNECTED) " + message.friendlyName )
+            return
+        }
+
         aapsLogger.debug(LTag.PUMPBTCOMM, "sendMessage() before mSendQueue.size :: ${mSendQueue.size}")
         // 펌프에 요청 보내기.
         writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)

diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/DiaconnG8Service.kt

@@ -330,6 +330,9 @@ class DiaconnG8Service : DaggerService() {
                     if(platformLoopSize > 0) {
                         diaconnG8Pump.isPlatformUploadStarted = true
                         for (i in 0 until platformLoopSize) {
+                            if(diaconnG8Pump.isPumplogUploadFailed) {
+                                break
+                            }
                             rxBus.send(EventPumpStatusChanged("클라우드동기화 진행 중 : $i / $platformLoopSize"))
                             val startLogNo: Int = platformStart + i * pumpLogPageSize
                             val endLogNo: Int = startLogNo + min(platformEnd - startLogNo, pumpLogPageSize)
@@ -338,6 +341,7 @@ class DiaconnG8Service : DaggerService() {
                         }
                         SystemClock.sleep(1000)
                         diaconnG8Pump.isPlatformUploadStarted = false
+                        diaconnG8Pump.isPumplogUploadFailed = false
                     }
                 }
             } catch (e:Exception) {