From 46dda8567de7bfadb3f4c1f0415b8d73a017d03e Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Wed, 26 Aug 2020 23:43:49 +0200
Subject: [PATCH] Remove warnings and better gzip view implementation

---
 .../keepass/adapters/EntryAttachmentsItemsAdapter.kt        | 6 +-----
 .../keepass/database/element/database/BinaryAttachment.kt   | 4 ----
 .../keepass/database/file/output/DatabaseOutputKDBX.kt      | 2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/EntryAttachmentsItemsAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/EntryAttachmentsItemsAdapter.kt
index 1e3f093b0..0836ca0f3 100644
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/EntryAttachmentsItemsAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/EntryAttachmentsItemsAdapter.kt
@@ -28,7 +28,6 @@ import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
 import com.kunzisoft.keepass.model.AttachmentState
 import com.kunzisoft.keepass.model.EntryAttachmentState
@@ -39,8 +38,6 @@ class EntryAttachmentsItemsAdapter(context: Context)
 
     var onItemClickListener: ((item: EntryAttachmentState)->Unit)? = null
 
-    private val mDatabase = Database.getInstance()
-
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EntryBinariesViewHolder {
         return EntryBinariesViewHolder(inflater.inflate(R.layout.item_attachment, parent, false))
     }
@@ -53,8 +50,7 @@ class EntryAttachmentsItemsAdapter(context: Context)
         holder.binaryFileSize.text = Formatter.formatFileSize(context,
                 entryAttachmentState.attachment.binaryAttachment.length())
         holder.binaryFileCompression.apply {
-            if (mDatabase.compressionAlgorithm == CompressionAlgorithm.GZip
-                    || entryAttachmentState.attachment.binaryAttachment.isCompressed == true) {
+            if (entryAttachmentState.attachment.binaryAttachment.isCompressed) {
                 text = CompressionAlgorithm.GZip.getName(context.resources)
                 visibility = View.VISIBLE
             } else {
diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/database/BinaryAttachment.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/database/BinaryAttachment.kt
index 32d24b251..96ef57f91 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/element/database/BinaryAttachment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/element/database/BinaryAttachment.kt
@@ -100,8 +100,6 @@ class BinaryAttachment : Parcelable {
                         isCompressed = true
                     }
                 }
-            } else {
-                isCompressed = true
             }
         }
     }
@@ -125,8 +123,6 @@ class BinaryAttachment : Parcelable {
                         isCompressed = false
                     }
                 }
-            } else {
-                isCompressed = false
             }
         }
     }
diff --git a/app/src/main/java/com/kunzisoft/keepass/database/file/output/DatabaseOutputKDBX.kt b/app/src/main/java/com/kunzisoft/keepass/database/file/output/DatabaseOutputKDBX.kt
index a69d2fcf6..6ae0038f3 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/file/output/DatabaseOutputKDBX.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/file/output/DatabaseOutputKDBX.kt
@@ -440,7 +440,7 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX,
 
                 // Force decompression in this specific case
                 val binaryInputStream = if (mDatabaseKDBX.compressionAlgorithm == CompressionAlgorithm.None
-                                && binary.isCompressed == true) {
+                                && binary.isCompressed) {
                     GZIPInputStream(binary.getInputDataStream())
                 } else {
                     binary.getInputDataStream()