Commit Graph

5937 Commits

Author SHA1 Message Date
Manfred Karrer
80db056ca8
Merge pull request #1586 from ManfredKarrer/confirmation-message
Ack messages for all trade, offer- and dispute messages
2018-06-26 14:13:48 +02:00
Manfred Karrer
0b283767fa
Add @Nullable annotation 2018-06-26 00:44:03 +02:00
Manfred Karrer
243110710f
Add link to https://github.com/ManfredKarrer/tools 2018-06-26 00:34:37 +02:00
Manfred Karrer
0c206d7a1a
Add icon to trade message status field 2018-06-25 23:45:20 +02:00
Manfred Karrer
b6094112f0
Merge branch 'master' into confirmation-message 2018-06-25 18:20:59 +02:00
Manfred Karrer
97677e515e
Improve logging 2018-06-25 18:08:46 +02:00
Manfred Karrer
1d4ac86e0e
Merge pull request #1583 from ripcurlx/fix-currency-issues-after-editing-offer
Set default payment account for an edited offer to null
2018-06-25 14:54:30 +02:00
Christoph Atteneder
a16f6a8e53
Add nullable annotation 2018-06-25 12:09:40 +02:00
Christoph Atteneder
a323e2d9b9
Set default payment account for an edited offer to null 2018-06-25 11:56:00 +02:00
Manfred Karrer
e1c4a1fc76
Add support for AckMessage at offer availability protocol 2018-06-25 10:42:11 +02:00
Manfred Karrer
475875d7cc
Improve dispute AckMsg handling
- Show errors at send dispute msg and at ackMsg.

- Add supportedCapabilities of persisted or reported peers to a peer
from a new connection (which has empty supportedCapabilities).
2018-06-24 16:09:24 +02:00
Manfred Karrer
84a5b30c88
Add icons and message state text to disputes
We show now under the dispute msg the icon+text.

Icons:
- message arrived (ok sign, opacity 50%)
- messages stored in mailbox (letter sign, opacity 50%)
- arrival confirmed by receiver  (ok_circle sign, opacity 100%)
- error at receiver when processing msg (exclamation sign in red)

Beside that some display bug are fixed with msg state display.
2018-06-23 16:19:26 +02:00
Manfred Karrer
3c950c1d4a
Remove default values from constructor params 2018-06-23 10:59:17 +02:00
Manfred Karrer
84b346ffb0
Merge pull request #1563 from cbeams/dependency-verification
Rework recent changes to dependency verification
2018-06-22 18:41:30 +02:00
Manfred Karrer
0cc4f7b646
Merge pull request #1581 from ManfredKarrer/protobuffer-exception-handling
Handle unknown PB data from encrypted messages
2018-06-22 18:39:11 +02:00
Manfred Karrer
68c40893c9
Handle unknown PB data from encrypted messages
- Use ProtobufferException for
CoreNetworkProtoResolver.fromProto(PB.NetworkEnvelope proto)
- Add raw PB data in case if an exception
- log error if the encrypted data contains unknown PB data

Note: We should refactor the resolvers with checked exceptions instead
of the ProtobufferRuntimeException, but for the moment we leave that to
not add too much complexity/risk for that release.
2018-06-22 11:24:31 +02:00
Manfred Karrer
9b853cfeac
Persist MessageState in processModel 2018-06-21 18:33:11 +02:00
Manfred Karrer
511458b146
Dont show bitcoinLocalhostNode popup if dev mode 2018-06-20 08:44:35 +02:00
Manfred Karrer
a35aeb6e85
Merge pull request #1567 from ManfredKarrer/issue-1566
Fixes issue 1566
2018-06-14 15:00:01 +02:00
Manfred Karrer
b51d9a5a32
Fixes issue 1566
See https://github.com/bisq-network/bisq-desktop/issues/1566
2018-06-05 23:11:16 +02:00
Chris Beams
6467b557da
Update instructions for regenerating dependency verification hashes 2018-06-05 16:50:05 +02:00
Chris Beams
ba1419a515
Update libdohj and bitcoinj dependency verification hashes
This does the work that was intended to be done in commit
175e11d81c, but was done by first removing
the dependencyVerification block entirely, and then replacing it with
the output of the `calculateChecksums` task.

The entire process went like this:

 1. Remove existing dependencyVerification block from build.gradle
 2. Run `./gradlew -q calculateChecksums | grep -v network.bisq:bisq- >> build.gradle`
 3. Run `git diff` to see that only the checksums we expect to have
    changed have in fact changed (libdohj and bitcoinj in this case).
 4. Commit the changes (in this commit)

I'll update the instructions for the dependencyVerification block in a
subsequent commit to make this clearer in the future.
2018-06-05 16:40:31 +02:00
Chris Beams
536d13fbff
Revert "Update build.gradle to fix failing checksum tests"
This reverts commit 175e11d81c.
2018-06-05 16:39:02 +02:00
Manfred Karrer
35e5d82ece
Fix concurrent modification error 2018-06-05 13:24:41 +02:00
Manfred Karrer
175e11d81c
Update build.gradle to fix failing checksum tests
The calculated checksum from the calculateChecksums task did not
reflect updates of libdohj and bitcoinj.
libdohj is a dependency in common but seems the calculateChecksums task
in desktop did not resolve that correctly. It did not change the
checksum after the libdohj version has changed and led to build errors.
Adding the libdohj dependency in Desktop as well solves the issue.
@bceams: If there is a better solution to solve that feel free to
revert and apply....
2018-06-05 11:52:41 +02:00
Manfred Karrer
c013130bb1
Merge pull request #1557 from ManfredKarrer/remove-venmo-cashapp
Remove venmo cashapp
2018-05-28 13:15:14 +02:00
Manfred Karrer
30ab8c86cf
Merge pull request #1556 from ManfredKarrer/mk_master
Fix reuse of change addresses
2018-05-28 13:14:58 +02:00
Manfred Karrer
e7bdfecca1
Update hashes of libdohj, bitcoinj-core and commons-codec 2018-05-27 13:36:27 +02:00
Manfred Karrer
534f347064
Remove Venmo and CashApp
- Filter Venmo and CashApp at dropdown for account creation
- Delete Venmo and CashApp account if not used in offers or trades
- Set all Venmo and CashApp classes deprecated
2018-05-25 23:03:52 +02:00
Manfred Karrer
4e378e4b1a
Download hash file for jar
- See: https://github.com/bisq-network/bisq-core/issues/114
2018-05-25 22:04:26 +02:00
Manfred Karrer
1570ec3e74
Update tools.jar for deterministic builds
- Create hash of jar and copy it to deploy dir
- Remove BC jars from -srcfiles
- Remove commented out code for policy file
2018-05-25 22:03:42 +02:00
Manfred Karrer
8d939f0f37
Add tools.jar for reproducible builds
- tools.jar is built from: https://github.com/ManfredKarrer/tools
Should be included in main project to avoid to copy over the jar,
but as long the reproducible build is not complete we prefer to not
add too much changes to the code base
2018-05-25 15:18:36 +02:00
Manfred Karrer
aa7c9564f2
Update build file
- Remove BC inclusion (not working that way)
- Add support for reproducible builds
2018-05-25 15:16:22 +02:00
Manfred Karrer
e5003d9d28
Merge branch 'master' into mk_master 2018-05-25 15:11:23 +02:00
Manfred Karrer
aa6ec28d2e
Fix reuse of change addresses
Fixes issue: https://github.com/bisq-network/bisq-desktop/issues/1540
2018-05-25 14:54:45 +02:00
Manfred Karrer
88dfaf642e
Use USD as default for PerfectMoney dummy account 2018-05-25 13:37:26 +02:00
Manfred Karrer
586e5564af
Merge pull request #1553 from ripcurlx/relax-account-number-restriction-for-argentina
Remove validation for Argentinian account numbers and allow manual edit
2018-05-24 12:57:56 +02:00
Christoph Atteneder
5b2a84ffea
Remove validation for Argentinian account numbers and allow manual edit 2018-05-23 19:30:11 +02:00
Manfred Karrer
de283a56f6
Merge pull request #1552 from ripcurlx/fix-format-duration-as-words
Fix wrong duration translation in double digit numbers
2018-05-23 19:06:14 +02:00
Christoph Atteneder
8eed6908c7
Fix wrong singular word translation in double digit numbers 2018-05-23 18:50:43 +02:00
Manfred Karrer
fc81c92f20
Merge branch 'master' into mk_master 2018-05-15 23:17:34 +02:00
Manfred Karrer
323d058025
Revert version to -SNAPSHOT 2018-05-11 20:23:53 +02:00
Manfred Karrer
35cf7f4c3c
Update finalize script 2018-05-11 19:57:18 +02:00
Manfred Karrer
a7825a2e1e
Add gpg keys 2018-05-11 19:56:53 +02:00
Manfred Karrer
564f306a75
Add releases/* to gitignore 2018-05-11 19:56:40 +02:00
Manfred Karrer
25ba64f318
Fix layout issue 2018-05-11 18:59:45 +02:00
Manfred Karrer
ccf4580882
Fix path. Add build to provide BC libs. 2018-05-11 18:33:05 +02:00
Manfred Karrer
bd690d3878
Add BC jars 2018-05-11 18:16:05 +02:00
Manfred Karrer
32db0f9524
Add missing directory 2018-05-11 16:49:03 +02:00
Manfred Karrer
70b1dd7f34
Add copy build script task 2018-05-11 16:23:48 +02:00