Build #268

Plan branch:
Builds Spark (minus the Install4j distributables) after every change to the code.

Build: #268 was successful Changes by Guus der Kinderen

Code commits

Spark (master)

  • Guus der Kinderen

    Guus der Kinderen 45e9a036899106c22f1ad52de2ad4bfc13627077

    SPARK-2190: Add option to auto-accept file transfers
    This commit adds as setting (disabled by default) that will automatically accept a file transfer from a sender that is on the user's contact list (more specifically, that is subscribed to the presence of the local user).

    • core/src/main/java/org/jivesoftware/resource/Default.java (version 45e9a036899106c22f1ad52de2ad4bfc13627077)
    • core/src/main/java/org/jivesoftware/spark/filetransfer/preferences/FileTransferPreference.java (version 45e9a036899106c22f1ad52de2ad4bfc13627077)
    • core/src/main/java/org/jivesoftware/spark/filetransfer/preferences/FileTransferPreferencePanel.java (version 45e9a036899106c22f1ad52de2ad4bfc13627077)
    • core/src/main/java/org/jivesoftware/sparkimpl/plugin/filetransfer/transfer/ui/ReceiveFileTransfer.java (version 45e9a036899106c22f1ad52de2ad4bfc13627077)
    • core/src/main/java/org/jivesoftware/sparkimpl/plugin/filetransfer/transfer/ui/SendFileTransfer.java (version 45e9a036899106c22f1ad52de2ad4bfc13627077)
    • core/src/main/java/org/jivesoftware/sparkimpl/settings/local/LocalPreferences.java (version 45e9a036899106c22f1ad52de2ad4bfc13627077)
    • core/src/main/resources/default.properties (version 45e9a036899106c22f1ad52de2ad4bfc13627077)
    • core/src/main/resources/i18n/spark_i18n.properties (version 45e9a036899106c22f1ad52de2ad4bfc13627077)
    • core/src/main/resources/i18n/spark_i18n_nl.properties (version 45e9a036899106c22f1ad52de2ad4bfc13627077)
  • Guus der Kinderen

    Guus der Kinderen 4c407d259c0a8e06fada041fab222569fcfbabb8

    SPARK-2192: Fix duration of file transfer.
    Sometimes, the startTime of the transfer hasn't been recorded yet when it already finished.

    • core/src/main/java/org/jivesoftware/sparkimpl/plugin/filetransfer/transfer/ui/SendFileTransfer.java (version 4c407d259c0a8e06fada041fab222569fcfbabb8)
    • core/src/main/java/org/jivesoftware/sparkimpl/plugin/filetransfer/transfer/ui/TransferUtils.java (version 4c407d259c0a8e06fada041fab222569fcfbabb8)