rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix binary with KDB Database

Browse Source
This commit is contained in:
J-Jamet
2021-02-09 21:27:57 +01:00
parent 4e7c7ba8ce
commit 6f17c5dcac
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
View File

@@ -354,10 +354,6 @@ class EntryEditActivity : LockingActivity(),
when (entryAttachmentState.downloadState) { when (entryAttachmentState.downloadState) {
AttachmentState.START -> { AttachmentState.START -> {
entryEditFragment?.apply { entryEditFragment?.apply {
// When only one attachment is allowed
if (!mAllowMultipleAttachments) {
clearAttachments()
}
putAttachment(entryAttachmentState) putAttachment(entryAttachmentState)
// Scroll to the attachment position // Scroll to the attachment position
getAttachmentViewPosition(entryAttachmentState) { getAttachmentViewPosition(entryAttachmentState) {
@@ -470,6 +466,11 @@ class EntryEditActivity : LockingActivity(),
private fun startUploadAttachment(attachmentToUploadUri: Uri?, attachment: Attachment?) { private fun startUploadAttachment(attachmentToUploadUri: Uri?, attachment: Attachment?) {
if (attachmentToUploadUri != null && attachment != null) { if (attachmentToUploadUri != null && attachment != null) {
// When only one attachment is allowed
if (!mAllowMultipleAttachments) {
entryEditFragment?.clearAttachments()
}
// TODO if (!mAllowMultipleAttachments && !fileUploading)
// Start uploading in service // Start uploading in service
mAttachmentFileBinderManager?.startUploadAttachment(attachmentToUploadUri, attachment) mAttachmentFileBinderManager?.startUploadAttachment(attachmentToUploadUri, attachment)
// Add in temp list // Add in temp list

6
app/src/main/java/com/kunzisoft/keepass/adapters/AnimatedItemsAdapter.kt
View File

@@ -120,7 +120,9 @@ abstract class AnimatedItemsAdapter<Item, T: RecyclerView.ViewHolder>(val contex
} }
fun clear() { fun clear() {
itemsList.clear() if (itemsList.size > 0) {
notifyDataSetChanged() itemsList.clear()
notifyDataSetChanged()
}
} }
} }

2
app/src/main/java/com/kunzisoft/keepass/adapters/EntryAttachmentsItemsAdapter.kt
View File

@@ -90,6 +90,8 @@ class EntryAttachmentsItemsAdapter(context: Context)
} }
} }
} }
} else {
visibility = View.GONE
} }
this.setOnClickListener { this.setOnClickListener {
ImageViewerActivity.getInstance(context, entryAttachmentState.attachment) ImageViewerActivity.getInstance(context, entryAttachmentState.attachment)