diff --git a/app/build.gradle b/app/build.gradle index 06752e429..80bad0b4f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -31,8 +31,8 @@ android { applicationId "com.geeksville.mesh" minSdkVersion 21 // The oldest emulator image I have tried is 22 (though 21 probably works) targetSdkVersion 29 - versionCode 20134 // format is Mmmss (where M is 1+the numeric major number - versionName "1.1.34" + versionCode 20135 // format is Mmmss (where M is 1+the numeric major number + versionName "1.1.35" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/app/src/main/java/com/geeksville/mesh/service/SoftwareUpdateService.kt b/app/src/main/java/com/geeksville/mesh/service/SoftwareUpdateService.kt index 6504601bf..507ee007b 100644 --- a/app/src/main/java/com/geeksville/mesh/service/SoftwareUpdateService.kt +++ b/app/src/main/java/com/geeksville/mesh/service/SoftwareUpdateService.kt @@ -194,16 +194,21 @@ class SoftwareUpdateService : JobIntentService(), Logging { } + /** + * true if we are busy with an update right now + */ + val isUpdating get() = progress >= 0 + /** * Update our progress indication for GUIs * * @param isAppload if false, we don't report failure indications (because we consider spiffs non critical for now). But do report to analytics */ fun sendProgress(context: Context, p: Int, isAppload: Boolean) { - if(!isAppload && progress < 0) + if(!isAppload && p < 0) reportError("Error while writing spiffs $progress") // See if this is happening in the wild - if(progress != p && (progress >= 0 || isAppload)) { + if(progress != p && (p >= 0 || isAppload)) { progress = p val intent = Intent(ACTION_UPDATE_PROGRESS).putExtra(