item limit check

pull/53/head
Zlatin Balevsky 2020-11-02 10:54:44 +00:00
parent 9f488a465d
commit 6959a1b1d5
No known key found for this signature in database
GPG Key ID: A72832072D525E41
3 changed files with 11 additions and 2 deletions

View File

@ -10,6 +10,7 @@ public class Constants {
public static final int CHAT_VERSION = 1;
public static final byte COLLECTION_VERSION = (byte)1;
public static final byte COLLECTION_ENTRY_VERSION = (byte)1;
public static final int COLLECTION_MAX_ITEMS = (0x1 << 16) - 1;
public static final SigType SIG_TYPE = SigType.EdDSA_SHA512_Ed25519;

View File

@ -20,6 +20,7 @@ import javax.inject.Inject
import javax.swing.JOptionPane
import javax.swing.JTable
import com.muwire.core.Constants
import com.muwire.core.Core
import com.muwire.core.InfoHash
import com.muwire.core.Persona
@ -657,9 +658,14 @@ class MainFrameController {
def files = view.selectedSharedFiles()
if (files == null || files.size() < 2)
return
if (files.size() > Constants.COLLECTION_MAX_ITEMS) {
JOptionPane.showMessageDialog(null, trans("CREATE_COLLECTION_MAX_FILES", Constants.COLLECTION_MAX_ITEMS, files.size()),
trans("CREATE_COLLECTION_MAX_FILES_TITLE"), JOptionPane.WARNING_MESSAGE)
return
}
def params = [:]
params['files'] = files // TODO limit check
params['files'] = files
params['spk'] = model.core.spk
params['me'] = model.core.me
params['eventBus'] = model.core.eventBus

View File

@ -147,6 +147,8 @@ UNPUBLISH=Unpublish
SHARED=Shared
SHARE=Share
CREATE_COLLECTION=Create collection
CREATE_COLLECTION_MAX_FILES=A collection cannot contain more than {0} files. You have selected {1}. Please select fewer.
CREATE_COLLECTION_MAX_FILES_TITLE=Too many files
# Uploads table
CLEAR_FINISHED_UPLOADS=Clear Finished Uploads