From ae687f5cfeccf4e6b6df07877163f5b097323229 Mon Sep 17 00:00:00 2001 From: geeksville Date: Tue, 15 Sep 2020 10:04:35 -0700 Subject: [PATCH] don't send autobug if the user has (foolishly) disabled location access --- .../com/geeksville/mesh/service/MeshService.kt | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt index 816025b7e..a0af2e02b 100644 --- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt +++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt @@ -278,11 +278,18 @@ class MeshService : Service(), Logging { warnUserAboutLocation() } is ApiException -> - if (exception.statusCode == 17) { - // error: cancelled by user - errormsg("User cancelled location access", exception) - } else { - Exceptions.report(exception) + when (exception.statusCode) { + 17 -> + // error: cancelled by user + errormsg("User cancelled location access", exception) + 8502 -> + // error: cancelled by user + errormsg( + "Settings-change-unavailable, user disabled location access (globally?)", + exception + ) + else -> + Exceptions.report(exception) } else -> Exceptions.report(exception)