Commit graph

2379 commits

Author SHA1 Message Date
danda
6198307d76 Merge branch 'upstream-dev' into route_bitcoinj_over_jtoryproxy 2016-07-19 16:44:02 -07:00
danda
1bfee1e6c9 merged in upstream/Development 2016-07-19 16:40:04 -07:00
Manfred Karrer
513f07d58c Fix null pointer 2016-07-20 01:20:29 +02:00
Manfred Karrer
d4946ef443 Add seednodes and useTor options, re-enable useTor in preferences and settingsview 2016-07-20 01:13:08 +02:00
Manfred Karrer
f0e3370dbb Rename option classes 2016-07-20 00:34:50 +02:00
danda
fcb08c12ad some cleanup of the bitcoinj/jtorproxy integration 2016-07-19 12:54:48 -07:00
Manfred Karrer
5cb6a4f912 Adjust delay at remove offers at shutdown 2016-07-19 19:11:56 +02:00
Manfred Karrer
f15bbf98eb Increase timout for shutdown, reduce delay at remove offers at shutdown 2016-07-19 19:00:59 +02:00
Manfred Karrer
ee9df3e476 Increase delay at shutdown 2016-07-19 18:47:52 +02:00
Manfred Karrer
a0947d903f Add more details for logging. 2016-07-19 18:45:41 +02:00
Manfred Karrer
3bf075b7c2 Remove scanner as it conflicts when running seednode with nohup 2016-07-19 18:44:48 +02:00
Manfred Karrer
902ce4dd88 Prevent that shutdown is called twice 2016-07-19 17:40:06 +02:00
Manfred Karrer
3835d9d09c Fix time period formatting 2016-07-19 17:16:51 +02:00
Manfred Karrer
fd8db49d25 Improve logging 2016-07-19 16:28:13 +02:00
Manfred Karrer
9f22fe2450 Add missing master thread 2016-07-19 16:27:59 +02:00
Manfred Karrer
59ce63471f Change logging, add getTruncatedMessage method 2016-07-19 16:27:33 +02:00
Manfred Karrer
ef1aaff264 Clone map before iterating to avoid ConcurrentModificationException exception 2016-07-18 00:55:45 +02:00
Manfred Karrer
e07a67e825 Fix layout 2016-07-17 23:28:31 +02:00
Manfred Karrer
7b7e0e721e Change log level 2016-07-17 23:19:18 +02:00
Manfred Karrer
31748cbe15 Change log level 2016-07-17 23:03:24 +02:00
Manfred Karrer
0b74d79d39 Add null check 2016-07-17 22:57:19 +02:00
Manfred Karrer
7eded1aaf6 v0.4.9 2016-07-17 16:33:31 +02:00
Manfred Karrer
952c2f1d48 Fix missing super call 2016-07-17 16:32:09 +02:00
Manfred Karrer
02ab26513e Fix wrong confirm popup msg for crypto currencies. add eth/ethc fork warning to create and take offer screens 2016-07-17 14:05:20 +02:00
Manfred Karrer
a4573208b4 Fix wrong thread at shutdownhook 2016-07-17 13:03:12 +02:00
Manfred Karrer
6f641bff1c Fix busy animation display 2016-07-16 17:50:46 +02:00
Manfred Karrer
874b05b67b Add sorting 2016-07-16 17:50:30 +02:00
Manfred Karrer
6282da8201 Add nr of bid/ask offers to statistics view 2016-07-16 03:29:05 +02:00
Manfred Karrer
3b01caee7b Add error msg when take offer attempt failed, decrease Connection timeout to 60 sec 2016-07-16 02:44:17 +02:00
Manfred Karrer
1490102deb Add ETHC 2016-07-16 02:43:33 +02:00
Manfred Karrer
604c8cfb5b Add date check for ETHC 2016-07-16 02:43:22 +02:00
Manfred Karrer
546737a728 Fix missing handling of mailbox msg 2016-07-15 22:27:00 +02:00
danda
84e78c40fd Change SafeSocks setting to 0. enables bitcoinj over jtorproxy 2016-07-14 19:07:54 -07:00
danda
6333452255 initial work/investigation towards routing bitcoinj over jtorproxy. work in progress 2016-07-13 14:49:59 -07:00
Manfred Karrer
b4917c1822 Add handling for mailbox messages after all is initialized 2016-07-13 16:07:04 +02:00
Manfred Karrer
2d05ad99b6 Remove reSendConfirmation calls 2016-07-13 15:08:58 +02:00
Manfred Karrer
729354529f Improve logging of stored data 2016-07-13 15:08:11 +02:00
Manfred Karrer
2b524e0e09 Filter logs 2016-07-13 15:07:42 +02:00
Manfred Karrer
8fd3169a56 Add FlorinCoin 2016-07-13 11:55:30 +02:00
Manfred Karrer
6ed063411a Remove jdkfix jar 2016-07-12 17:26:47 +02:00
Manfred Karrer
0c791cd07b rename bootstrap module to seednode 2016-07-12 17:25:11 +02:00
Manfred Karrer
9f5634fa90 Move old seednode class to tests, remove seednode module 2016-07-12 17:17:21 +02:00
Manfred Karrer
e1037d4eac Add myAddress and banList to P2PService 2016-07-12 16:58:12 +02:00
Manfred Karrer
929a357130 Add myAddress and banlist to options 2016-07-12 16:53:50 +02:00
Manfred Karrer
971ef95326 Add bootstrap module 2016-07-12 16:37:15 +02:00
Manfred Karrer
1df02ee750 Move methods to Superclass 2016-07-12 16:28:32 +02:00
Manfred Karrer
3e18ba94b0 Don't display multiple disputes from same trade (in case when both open dispute). Delay msg so the order is correct (open dispute msg need to be processed before comm. msg or close msg). Add check for isBoostrapped when opening dispute. Add error msg handler. 2016-07-12 14:55:00 +02:00
Manfred Karrer
9295d23df2 Set key to addressEntry at encryptWallet 2016-07-12 01:48:18 +02:00
Manfred Karrer
3e0ff3ae54 Improve logging 2016-07-12 00:41:53 +02:00
Manfred Karrer
9f8d626da2 Fix ConcurrentModificationException 2016-07-12 00:40:30 +02:00