diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 682d790d30..fb6b977b16 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -27,15 +27,7 @@
         <emptyLine />
       </value>
     </option>
-    <AndroidXmlCodeStyleSettings>
-      <option name="USE_CUSTOM_SETTINGS" value="true" />
-    </AndroidXmlCodeStyleSettings>
     <JavaCodeStyleSettings>
-      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-      <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
-        <value />
-      </option>
       <option name="IMPORT_LAYOUT_TABLE">
         <value>
           <package name="android" withSubpackages="true" static="false" />
@@ -72,9 +64,6 @@
       <option name="RIGHT_MARGIN" value="120" />
     </MarkdownNavigatorCodeStyleSettings>
     <XML>
-      <option name="XML_KEEP_LINE_BREAKS" value="false" />
-      <option name="XML_ALIGN_ATTRIBUTES" value="false" />
-      <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
       <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
     </XML>
     <codeStyleSettings language="JAVA">
@@ -87,7 +76,6 @@
       <option name="FIELD_ANNOTATION_WRAP" value="0" />
     </codeStyleSettings>
     <codeStyleSettings language="XML">
-      <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
diff --git a/build.gradle b/build.gradle
index ca9e976b8f..541cd41427 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:3.5.0'
         classpath('com.dicedmelon.gradle:jacoco-android:0.1.4') {
             exclude group: 'org.codehaus.groovy', module: 'groovy-all'
         }
@@ -220,7 +220,7 @@ android {
             ignoreFailures = false
             effort = "max"
             reportLevel = "medium"
-            classes = fileTree("$project.buildDir/intermediates/javac/${variantName}/compile${capVariantName}JavaWithJavac/classes/")
+            classes = fileTree("$project.buildDir/intermediates/javac/${variantName}/classes/")
             excludeFilter = file("${project.rootDir}/spotbugs-filter.xml")
             pluginClasspath = project.configurations.spotbugsPlugins
             source = fileTree('src/main/java')
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index beb936156f..d649f5644b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,6 @@
-#Thu Apr 18 07:07:10 CEST 2019
+#Wed Aug 21 07:03:37 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
-distributionSha256Sum=53b71812f18cdb2777e9f1b2a0f2038683907c90bdc406bc64d8b400e1fb2c3b
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/scripts/analysis/findbugs-up.rb b/scripts/analysis/findbugs-up.rb
index 61b4fe1428..6b5c1da7e6 100644
--- a/scripts/analysis/findbugs-up.rb
+++ b/scripts/analysis/findbugs-up.rb
@@ -47,6 +47,7 @@ require 'xmlsimple'
 
 # run FindBugs
 puts "running FindBugs..."
+system './gradlew assembleGplayDebug'
 system './gradlew spotbugsGplayDebug'
 
 # find FindBugs report file
diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt
index fd047cb4a6..07b704560a 100644
--- a/scripts/analysis/lint-results.txt
+++ b/scripts/analysis/lint-results.txt
@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 58 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 59 warnings</span>
diff --git a/src/main/java/com/nextcloud/client/device/DeviceInfo.kt b/src/main/java/com/nextcloud/client/device/DeviceInfo.kt
index 65ff2fa37f..68d70b9092 100644
--- a/src/main/java/com/nextcloud/client/device/DeviceInfo.kt
+++ b/src/main/java/com/nextcloud/client/device/DeviceInfo.kt
@@ -24,9 +24,10 @@ package com.nextcloud.client.device
 import android.content.Context
 import android.content.pm.PackageManager
 import android.os.Build
+import java.util.Locale
 
 class DeviceInfo {
-    val vendor: String = Build.MANUFACTURER.toLowerCase()
+    val vendor: String = Build.MANUFACTURER.toLowerCase(Locale.ROOT)
     val apiLevel: Int = Build.VERSION.SDK_INT
 
     fun hasCamera(context: Context): Boolean {