Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 04249992 authored by Ricki Hirner's avatar Ricki Hirner Committed by GitHub
Browse files

Update dav4jvm (#1709) 

- Replace `code` with `statusCode` in multiple files to align with the updated library
- Add `dav4jvm` to Dependabot ignores
parent fa09a056

.github/dependabot.yml

+3 −1
Original line number Diff line number Diff line
@@ -26,3 +26,5 @@ updates: 
      - dependency-name: "org.jetbrains.kotlin.plugin.compose"

      - dependency-name: "org.jetbrains.kotlin.android"

      - dependency-name: "com.google.devtools.ksp"

      # dependencies without semantic versioning

      - dependency-name: "com.github.bitfireat:dav4jvm"
 
 No newline at end of file

app/src/main/kotlin/at/bitfire/davdroid/servicedetection/CollectionsWithoutHomeSetRefresher.kt

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ class CollectionsWithoutHomeSetRefresher @AssistedInject constructor( 
            }

        } catch (e: HttpException) {

            // delete collection locally if it was not accessible (40x)

            if (e.code in arrayOf(403, 404, 410))

            if (e.statusCode in arrayOf(403, 404, 410))

                collectionRepository.delete(localCollection)

            else

                throw e

app/src/main/kotlin/at/bitfire/davdroid/servicedetection/HomeSetRefresher.kt

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ class HomeSetRefresher @AssistedInject constructor( 
                }

            } catch (e: HttpException) {

                // delete home set locally if it was not accessible (40x)

                if (e.code in arrayOf(403, 404, 410))

                if (e.statusCode in arrayOf(403, 404, 410))

                    homeSetRepository.deleteBlocking(localHomeset)

            }

app/src/main/kotlin/at/bitfire/davdroid/servicedetection/PrincipalsRefresher.kt

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ class PrincipalsRefresher @AssistedInject constructor( 
                    }

                }

            } catch (e: HttpException) {

                logger.info("Principal update failed with response code ${e.code}. principalUrl=$principalUrl")

                logger.info("Principal update failed with response code ${e.statusCode}. principalUrl=$principalUrl")

            }

        }

app/src/main/kotlin/at/bitfire/davdroid/servicedetection/ServiceRefresher.kt

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ class ServiceRefresher @AssistedInject constructor( 
                }

            }

        } catch (e: HttpException) {

            if (e.code / 100 == 4)

            if (e.isClientError)

                logger.log(Level.INFO, "Ignoring Client Error 4xx while looking for ${service.type} home sets", e)

            else

                throw e