From 732f472146ba1f70b77821a6d09de05ea3f56e05 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Tue, 13 Aug 2019 19:33:57 +0200
Subject: [PATCH] Fix warnings

---
 .../keepass/activities/FileDatabaseSelectActivity.kt          | 2 +-
 .../com/kunzisoft/keepass/database/file/load/ImporterV3.kt    | 4 ++--
 .../com/kunzisoft/keepass/settings/NestedSettingsFragment.kt  | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt
index 8d9ceaaeb..8d957b4b8 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt
@@ -330,7 +330,7 @@ class FileDatabaseSelectActivity : StylishActivity(),
      */
     private fun createDatabaseFile(path: Uri): Boolean {
 
-        val pathString = URLDecoder.decode(path.path)
+        val pathString = URLDecoder.decode(path.path, "UTF-8")
         // Make sure file name exists
         if (pathString.isEmpty()) {
             Log.e(TAG, getString(R.string.error_filename_required))
diff --git a/app/src/main/java/com/kunzisoft/keepass/database/file/load/ImporterV3.kt b/app/src/main/java/com/kunzisoft/keepass/database/file/load/ImporterV3.kt
index 01d702869..2c72ce9dc 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/file/load/ImporterV3.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/file/load/ImporterV3.kt
@@ -158,7 +158,7 @@ class ImporterV3 : Importer<PwDatabaseV3>() {
             throw InvalidPasswordException()
         }
 
-        var md: MessageDigest? = null
+        val md: MessageDigest
         try {
             md = MessageDigest.getInstance("SHA-256")
         } catch (e: NoSuchAlgorithmException) {
@@ -169,7 +169,7 @@ class ImporterV3 : Importer<PwDatabaseV3>() {
         val dos = DigestOutputStream(nos, md)
         dos.write(filebuf, PwDbHeaderV3.BUF_SIZE, encryptedPartSize)
         dos.close()
-        val hash = md!!.digest()
+        val hash = md.digest()
 
         if (!Arrays.equals(hash, hdr.contentsHash)) {
 
diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/NestedSettingsFragment.kt b/app/src/main/java/com/kunzisoft/keepass/settings/NestedSettingsFragment.kt
index 04aef85d0..a148cc09a 100644
--- a/app/src/main/java/com/kunzisoft/keepass/settings/NestedSettingsFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/settings/NestedSettingsFragment.kt
@@ -45,7 +45,6 @@ import com.kunzisoft.keepass.activities.dialogs.UnavailableFeatureDialogFragment
 import com.kunzisoft.keepass.activities.dialogs.UnderDevelopmentFeatureDialogFragment
 import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
 import com.kunzisoft.keepass.activities.stylish.Stylish
-import com.kunzisoft.keepass.app.App
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.education.Education
 import com.kunzisoft.keepass.fileselect.database.FileDatabaseHistory
@@ -177,8 +176,7 @@ class NestedSettingsFragment : PreferenceFragmentCompat(), Preference.OnPreferen
                     context?.let { context ->
                         AlertDialog.Builder(context)
                                 .setMessage(resources.getString(R.string.fingerprint_delete_all_warning))
-                                .setIcon(resources.getDrawable(
-                                        android.R.drawable.ic_dialog_alert))
+                                .setIcon(android.R.drawable.ic_dialog_alert)
                                 .setPositiveButton(resources.getString(android.R.string.yes)
                                 ) { _, _ ->
                                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {