mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-25 07:27:18 +01:00
Code Issues Projects Releases Packages Wiki Activity
12215 commits 3 branches 150 tags 4.1 GiB
Commit graph

12215 commits

This branch
This branch
All branches
Author SHA1 Message Date
chimp1984
9cf368c449
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:06:09 -05:00
chimp1984
c3d3e5230e
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:05:46 -05:00
chimp1984
6c114b44e8
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:05:21 -05:00
chimp1984
77ae1bddfa
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:04:45 -05:00
chimp1984
92902102ec
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:04:27 -05:00
chimp1984
4e2ccf249b
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:04:17 -05:00
chimp1984
1fef02e6f1
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:04:04 -05:00
chimp1984
dc15c7dfa7
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:03:53 -05:00
chimp1984
e3cc62ed60
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:03:41 -05:00
chimp1984
126f99668d
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:03:30 -05:00
chimp1984
08e2a2e0b0
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:03:18 -05:00
chimp1984
c448b1b58d
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:03:01 -05:00
chimp1984
285003743d
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:02:49 -05:00
chimp1984
6be21fa86c
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:02:11 -05:00
chimp1984
0258205211
Fix typos 2020-09-28 18:10:42 -05:00
chimp1984
eec13cd276
Refactor: Return early if not valid 2020-09-28 18:08:07 -05:00
chimp1984
ad83183cba
Revert copyright text from un-intended change 2020-09-28 18:05:09 -05:00
chimp1984
b31f5b7b23
Another stupid codacy enforcement 2020-09-27 02:16:27 -05:00
chimp1984
2191693946
Apply stupid Codacy rule 
https://stackoverflow.com/questions/1750435/comparing-java-enum-members-or-equals

```
enum Color { BLACK, WHITE };

Color nothing = null;
if (nothing == Color.BLACK);      // runs fine
if (nothing.equals(Color.BLACK)); // throws NullPointerException
```
```
enum Color { BLACK, WHITE };
enum Chiral { LEFT, RIGHT };

if (Color.BLACK.equals(Chiral.LEFT)); // compiles fine
if (Color.BLACK == Chiral.LEFT);      // DOESN'T COMPILE!!! Incompatible types!
```

"To summarize, the arguments for using == on enum are:

     It works.
     It's faster.
     It's safer at run-time.
     It's safer at compile-time.
"
 2020-09-27 02:13:39 -05:00
chimp1984
28a85c1ce5
Fix display strings 2020-09-27 02:04:35 -05:00
chimp1984
ab30e546b0
Merge branch 'master_upstream' into fix-delayed-payout-tx-issues 2020-09-27 01:28:51 -05:00
chimp1984
d08591551b
Add state listeners to warn icon columns to get correct state updates 2020-09-27 01:26:48 -05:00
chimp1984
6deeecb846
Move handling of mailbox messages from TradeManager to TradeProtocol 
Make removal of mailbox messages automated in TradeProtocol
 2020-09-26 23:38:01 -05:00
chimp1984
84a4982732
Remove TradeProtocol from Trade 
We keep the TradeProtocol now in TradeManager in a hashmap.
As TradeProtocol constructors get called now earlier we need to add an onInitialized method which signals that the TradeProtocol is ready.
The processModel needs to get set the transient fields after construction.
 2020-09-26 21:34:28 -05:00
chimp1984
cabc5af2c6
Make processModel in Trade final and pass in constructor instead of in init method 2020-09-26 19:36:07 -05:00
chimp1984
f0a30221ab
Fix bug with showing popup once arbitration has been started 2020-09-26 19:11:54 -05:00
chimp1984
5309f04b40
DO not deactivate move to failed trades button. Use different text in popup if all txs are valid. 
Fix icon style issues.
 2020-09-26 18:33:25 -05:00
chimp1984
6c6332d68d
Allow also Trade.Phase.PAYOUT_PUBLISHED in onPaymentReceived to support in failure situations to resend the msg 2020-09-26 17:37:34 -05:00
chimp1984
07bcf6c38f
Refactor: improve logs 2020-09-26 17:36:57 -05:00
chimp1984
3ce1ac9285
Refactor: improve logs 2020-09-26 17:36:41 -05:00
chimp1984
a9ad72d0e4
Remove offer at close to avoid that button stays active when taking the offer 
Cleanups
 2020-09-26 16:21:19 -05:00
chimp1984
74317636b0
Apply code inspection suggestions 2020-09-26 16:00:03 -05:00
chimp1984
27ac2d8e57
Remove never read field 2020-09-26 15:52:31 -05:00
chimp1984
d6c242922b
Remove timeouts as it was not used before. 2020-09-26 15:52:09 -05:00
chimp1984
143377b7e5
Make some fields in ProcessModel final. 
Make init methods more clear

There will be more refactoring commits in that area...
 2020-09-26 13:36:24 -05:00
chimp1984
c39a9b074f
Remove onPaymentReceived delegate method in seller trade 2020-09-26 12:56:42 -05:00
chimp1984
a661ce6ed5
Remove onPaymentStarted delegate method in buyer trade 2020-09-26 12:55:23 -05:00
chimp1984
7e16982b2b
Remove onTakeOffer delegate method in taker trade 2020-09-26 12:53:25 -05:00
chimp1984
456f16ddf4
Remove handleTakeOfferRequest delegate method in maker trade 2020-09-26 12:51:43 -05:00
chimp1984
766b1e2e1e
Add check to not add a duplicate address entry with same offer ID and context. 
In debugging trade protocol and taking same offer I could generate problems where the multisig entry was twice but with diff. keys, so take offer failed. I remember the error log to have seen in the past and I assume this was a rare bug we encountered when users took again the same offer which failed with an uncritical state earlier.
 2020-09-26 12:42:17 -05:00
chimp1984
2bb4bff41d
Refactor: move method, remove unneeded stream call 2020-09-26 12:40:09 -05:00
chimp1984
62a71e2173
Remove unused method 2020-09-26 12:28:52 -05:00
chimp1984
0c4af92f86
Refactor: rename methods 2020-09-26 12:28:38 -05:00
chimp1984
e61d04284e
Add ProcessModelServiceProvider to provide all the domain services to process model 2020-09-26 12:24:57 -05:00
chimp1984
9e5cdada5d
Remove precondition as trade was added at that moment 2020-09-26 12:14:10 -05:00
sqrrm
1ea94a539a
Merge pull request #4550 from oscarguindzberg/upgrade-bitcoinj 
Use bitcoinj 0.15.8 (commit 5312aa3)
 2020-09-26 17:25:12 +02:00
Oscar Guindzberg
93d321b995
Use bitcoinj 0.15.8 (commit 5312aa3) 2020-09-26 11:36:48 -03:00
chimp1984
191b031f38
Refactor: Rename MediationProtocol to DisputeProtocol 2020-09-25 23:56:58 -05:00
chimp1984
fded97fb9c
Refactor: Use task runner for peer publish delayed payout tx 2020-09-25 23:55:45 -05:00
chimp1984
561abd7a49
Refactor: Move publishDelayedPayoutTx from TradeManager to MediationProtocol 2020-09-25 23:07:16 -05:00