diff --git a/app/build.gradle b/app/build.gradle
index a464ab281..c8848d4b2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,13 +4,13 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "com.kunzisoft.keepass"
         minSdkVersion 14
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode = 23
         versionName = "2.5.0.0beta23"
         multiDexEnabled true
@@ -79,7 +79,7 @@ android {
     }
 }
 
-def supportVersion = "27.1.1"
+def supportVersion = "28.0.0"
 def spongycastleVersion = "1.58.0.0"
 def room_version = "1.1.1"
 
@@ -110,7 +110,7 @@ dependencies {
     implementation 'biz.source_code:base64coder:2010-12-19'
     // IO-Extras
     implementation 'com.github.davidmoten:io-extras:0.1'
-    implementation 'com.google.code.gson:gson:2.8.4'
+    implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.google.guava:guava:23.0-android'
     // Icon pack
     implementation project(path: ':icon-pack-classic')
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6402641ec..a2b155c43 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="com.kunzisoft.keepass"
     android:installLocation="auto">
     <supports-screens
@@ -8,6 +7,7 @@
       android:normalScreens="true"
       android:largeScreens="true"
       android:anyDensity="true" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
index f48739b16..d1e34241c 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
@@ -183,7 +183,7 @@ class GroupActivity : LockingActivity(),
         // Attach fragment to content view
         supportFragmentManager.beginTransaction().replace(
                 R.id.nodes_list_fragment_container,
-                mListNodesFragment,
+                mListNodesFragment!!,
                 fragmentTag)
                 .commit()
 
diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesFragment.kt
index 618f3bb0b..bf9696192 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesFragment.kt
@@ -130,7 +130,7 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
 
         onScrollListener?.let { onScrollListener ->
             listView?.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-                override fun onScrolled(recyclerView: RecyclerView?, dx: Int, dy: Int) {
+                override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
                     super.onScrolled(recyclerView, dx, dy)
                     onScrollListener.onScrolled(dy)
                 }
diff --git a/app/src/main/java/com/kunzisoft/keepass/utils/FileInfo.kt b/app/src/main/java/com/kunzisoft/keepass/utils/FileInfo.kt
index 5d559c0c8..9f30c3538 100644
--- a/app/src/main/java/com/kunzisoft/keepass/utils/FileInfo.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/utils/FileInfo.kt
@@ -52,17 +52,19 @@ open class FileInfo : Serializable {
     fun init() {
         this.filePath = fileUri.path
         if (EXTERNAL_STORAGE_AUTHORITY == fileUri.authority) {
-            val file = DocumentFile.fromSingleUri(context, fileUri)
-            size = file.length()
-            fileName = file.name
-            lastModification = Date(file.lastModified())
-        } else {
-            filePath?.let {
-                val file = File(it)
+            DocumentFile.fromSingleUri(context, fileUri)?.let { file ->
                 size = file.length()
                 fileName = file.name
                 lastModification = Date(file.lastModified())
             }
+        } else {
+            filePath?.let {
+                File(it).let { file ->
+                    size = file.length()
+                    fileName = file.name
+                    lastModification = Date(file.lastModified())
+                }
+            }
         }
 
         if (fileName == null || fileName!!.isEmpty()) {