Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-29 07:52:50 -05:00
Code Packages Releases Activity

clipboard: fix hash duplication check, set isOwner for CopyFile

Browse Source
This commit is contained in:
bbedward
2026-01-27 22:35:20 -05:00
parent a168a8160c
commit a9cb2fe912
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/internal/server/clipboard/manager.go
View File

@@ -505,10 +505,10 @@ func computeHash(data []byte) uint64 {
} }
func extractHash(data []byte) uint64 { func extractHash(data []byte) uint64 {
if len(data) < 8 { if len(data) < 9 {
return 0 return 0
} }
return binary.BigEndian.Uint64(data[len(data)-8:]) return binary.BigEndian.Uint64(data[len(data)-9 : len(data)-1])
} }
func (m *Manager) hasSensitiveMimeType(mimes []string) bool { func (m *Manager) hasSensitiveMimeType(mimes []string) bool {
@@ -960,11 +960,21 @@ func (m *Manager) SetClipboard(data []byte, mimeType string) error {
} }
}) })
source.SetCancelledHandler(func(e ext_data_control.ExtDataControlSourceV1CancelledEvent) {
m.ownerLock.Lock()
m.isOwner = false
m.ownerLock.Unlock()
})
m.currentSource = source m.currentSource = source
m.sourceMutex.Lock() m.sourceMutex.Lock()
m.sourceMimeTypes = []string{mimeType} m.sourceMimeTypes = []string{mimeType}
m.sourceMutex.Unlock() m.sourceMutex.Unlock()
m.ownerLock.Lock()
m.isOwner = true
m.ownerLock.Unlock()
device := m.dataDevice.(*ext_data_control.ExtDataControlDeviceV1) device := m.dataDevice.(*ext_data_control.ExtDataControlDeviceV1)
if err := device.SetSelection(source); err != nil { if err := device.SetSelection(source); err != nil {
log.Errorf("Failed to set selection: %v", err) log.Errorf("Failed to set selection: %v", err)
@@ -1585,7 +1595,18 @@ func (m *Manager) CopyFile(filePath string) error {
} }
}) })
source.SetCancelledHandler(func(e ext_data_control.ExtDataControlSourceV1CancelledEvent) {
m.ownerLock.Lock()
m.isOwner = false
m.ownerLock.Unlock()
})
m.currentSource = source m.currentSource = source
m.ownerLock.Lock()
m.isOwner = true
m.ownerLock.Unlock()
device := m.dataDevice.(*ext_data_control.ExtDataControlDeviceV1) device := m.dataDevice.(*ext_data_control.ExtDataControlDeviceV1)
if err := device.SetSelection(source); err != nil { if err := device.SetSelection(source); err != nil {
log.Errorf("Failed to set selection: %v", err) log.Errorf("Failed to set selection: %v", err)