Commit Graph

5816 Commits

Author SHA1 Message Date
csoler
5408427ea8
added auto delete active token feature to RsGxsIfaceHelper 2020-03-17 00:13:29 +01:00
csoler
db42c7a973
removed sleep in p3GxsTunnel::tick() since it is not needed and causes unwanted delays 2020-03-15 13:15:33 +01:00
sehraf
ddd6b91f71
i2pbob: fix deadlock on shutdown 2020-03-13 17:08:48 +01:00
csoler
4c4b7ce754
Merge pull request #1826 from csoler/v0.6-FT4
attempt to solve GXS data access problems in new blocking API
2020-03-13 14:37:53 +01:00
drbob
fc53af2646 TheWire fixup up display of messages
Process messages to group replies correctly and sort by age.
Expand message display to include replies.
Add coloring to distinguish between replies and actual msgs.
Enable subscribe / unsubscribe buttons.
Add Selection of which set of groups are visible.
Add missing setNetworkExchangeService calls for photo + wire services.
2020-03-13 16:44:15 +11:00
csoler
230eca985f
reverted unnecessary cancel of tokens after waitToken in p3gxscircles 2020-03-11 22:42:34 +01:00
csoler
a02bb0acb6
added cancel in waitToken in rstokenservice 2020-03-11 22:41:57 +01:00
csoler
dc3c3488df
added blocking API for createComment() in GxsCommentService and removed token queue from GxsCreateCommentDialog 2020-03-09 21:01:55 +01:00
csoler
4031b081c5
Merge pull request #1824 from drbob/photos_improve_sharing
Updates to PhotoSharing service
2020-03-08 23:14:38 +01:00
Gioacchino Mazzurco
57be2cb11e
Silence excessive debugging in miniupnp handler 2020-03-08 22:07:12 +01:00
csoler
ab2c1f23e9
attempt to solve GXS data access problems in new blocking API 2020-03-07 20:39:10 +01:00
csoler
1f0678075f
merged upstream/master 2020-03-06 22:12:06 +01:00
Gioacchino Mazzurco
b62b3ec54b
Fix crash on Android due to dangling reference
JSON API debug lambda returned a dangling reference on Android, fix by
  moving the scope of the returned object
What made this a bit tricky to understand was the fact that it happened
only on Android, while the code was formally incorrect for all
platforms, and strangely caused a stack overflow due to two std lib
functions (sentry and flush) calling each other ad infinitum

+#23379 0x603cb2a8 in std::__ndk1::basic_ostream<char, std::__ndk1::char_traits<char> >::flush (this=0x618e92bc) at /opt/android-ndk/sources/cxx-stl/llvm-libc++/include/ostream:949
+#23380 0x603cad08 in std::__ndk1::basic_ostream<char, std::__ndk1::char_traits<char> >::sentry::sentry (this=0x618e9284, __os=...) at /opt/android-ndk/sources/cxx-stl/llvm-libc++/include/ostream:270
+#23381 0x603cb2a8 in std::__ndk1::basic_ostream<char, std::__ndk1::char_traits<char> >::flush (this=0x618e92bc) at /opt/android-ndk/sources/cxx-stl/llvm-libc++/include/ostream:949
+#23382 0x603cad08 in std::__ndk1::basic_ostream<char, std::__ndk1::char_traits<char> >::sentry::sentry (this=0x618e9304, __os=...) at /opt/android-ndk/sources/cxx-stl/llvm-libc++/include/ostream:270
+#23383 0x603caa6c in std::__ndk1::__put_character_sequence<char, std::__ndk1::char_traits<char> > (__os=..., __str=0x61379a60 " user: ", __len=7) at /opt/android-ndk/sources/cxx-stl/llvm-libc++/include/ostream:726
+#23384 0x603caa30 in std::__ndk1::operator<< <std::__ndk1::char_traits<char> > (__os=..., __str=0x61379a60 " user: ") at /opt/android-ndk/sources/cxx-stl/llvm-libc++/include/ostream:869
+#23385 0x60522184 in t_RsLogger<(RsLoggerCategories)5>::operator<< <char [8]> (this=0x618e92bc, val=...) at ../../../../Development/rs-develop/libretroshare/src/util/rsdebug.h:53
+#23386 0x60bbe5ec in JsonApiServer::registerHandler(std::__ndk1::basic_string<char, std::__ndk1::char_traits<char>, std::__ndk1::allocator<char> > const&, std::__ndk1::function<void (std::__ndk1::shared_ptr<restbed::Session>)> const&, bool)::$_259::operator()(std::__ndk1::shared_ptr<restbed::Session>, std::__ndk1::function<void (std::__ndk1::shared_ptr<restbed::Session>)> const&) const (this=0x617d8364, session=..., callback=...) at ../../../../Development/rs-develop/libretroshare/src/jsonapi/jsonapi.cpp:517
2020-03-06 18:21:32 +01:00
drbob
88f76c5fbb Update the data in photoitems
Update PhotoItem members
 - remove excessive fields in Photo
 - add RsGxsFile to Photo
 - update ShareMode for Album
 - renamed photo.mThumbnail to mLowResImage
Update Photo GUI
 - enable setting of AlbumExtra parameters.
 - added data for Ordering of photos
 - stop showing duplicates in PhotoSlideShow
2020-03-07 00:13:25 +11:00
csoler
3bd23d612a
Merge pull request #1817 from G10h4ck/optional_dh_init_test
Add option to disable DH init check for faster init
2020-03-06 11:16:45 +01:00
csoler
f59193b625
fixed bug in SQL access where timeout was compared to a negative value 2020-03-05 20:51:02 +01:00
csoler
09fe628415
removed debug info 2020-03-05 20:50:25 +01:00
csoler
ae932b605a
fixed 2 bugs causing forums and channels to be notified when already known and added notification list for posted 2020-03-04 19:17:09 +01:00
Gioacchino Mazzurco
15c3e87bc5
Add option to disable DH init check for faster init
The check is not necessary and on Android it takes around 1 minute to
  complete.
2020-03-03 16:21:14 +01:00
csoler
97e7df82c5
Merge pull request #1816 from csoler/v0.6-FT4
TokenQueue cleanup
2020-03-01 17:29:44 +01:00
csoler
76596e678e
Merge pull request #1815 from drbob/thewire-get-basics-working
Get the basics of TheWire service working
2020-03-01 16:40:35 +01:00
csoler
f8d07a3e92
switched to more reasonnable timeout values in waitToken 2020-03-01 13:45:07 +01:00
csoler
c09e9c407b
removed warning about filtered packet 2020-02-29 23:06:43 +01:00
csoler
4124585b55
removed unused print methods in some RsItems since now print is handled by serializer 2020-02-29 12:14:37 +01:00
Gioacchino Mazzurco
6bb0950dd6
Fix typo in documentation 2020-02-29 11:05:22 +01:00
drbob
24fd4ae3e7 Get the basics of TheWire service working
Added REF fields to Wire Msgs to allow replys to work well.
Added description of how the Message fields should be used.
Added WireGroupDialog for creation of WireGroups.
Updated PulseAddDialog to support publishing Pulses and Replies.
Added classes to display Pulses / Groups.
Added single selection point of WireGroup for publishing.
Added basic "refresh" to reload new GXS data.
2020-02-29 11:47:00 +11:00
drbob
5d0e2bb71e Add Album Editing (add / remove photos)
Significant improvements to AlbumDialog
 - load Existing Photos to the Album
 - drag and drop add new Photos
 - mark photos for deletion
 - publish these changes
 - color photoitems depending on state

Fixed up Top-Level Photo display.
 - only show latest version of photo (hide deleted)
 - fixup grouping by "Own / Subscribed / Other" Albums
 - added Album detail editing using GxsGroupDialog
2020-02-25 00:11:51 +11:00
csoler
737b846e23
Merge branch 'master' into v0.6-FT4 2020-02-22 21:11:00 +01:00
csoler
a89f572edf
Merge pull request #1796 from drbob/photos_switch_to_gxscomments
Switch PhotoService to use GxsComments
2020-02-22 17:09:09 +01:00
csoler
5645d71699
fixed connexion between posted items and async API, and removed dead code and debug info 2020-02-19 21:52:55 +01:00
csoler
167380127b
merged upstream/master 2020-02-17 19:54:16 +01:00
G10h4ck
dff0138376
Merge pull request #1795 from G10h4ck/posted_api
Initial work on posted API
2020-02-17 14:24:45 +01:00
drbob
fe62dc1345 Switch PhotoService to use GxsComments
WIP improvements to PhotoService:
 - switch p3photoservice to use gxcommentservice
 - clean out old RsPhotoComment classes
 - redesign PhotoDialog to use standard GxsCommentService classes
 - remove unneeded old Comment classes from GUI
 - fix indenting for PhotoDialog and p3photoservice.h
 - fix layout issue in Extra Widgets for GxsGroupDialog
2020-02-16 15:21:20 +11:00
csoler
01b39bfe63
Merge pull request #1782 from sehraf/pr_improve_udpStunner
Reenable UDP stunner and add documentation
2020-02-15 22:15:36 +01:00
sehraf
f019a71472
only use external up from DHT stunner as fallback when no other source provides a valid IP 2020-02-15 17:51:22 +01:00
csoler
93ee9bdd18
Merge pull request #1793 from drbob/fix_photo_group_creation
Update RsPhotoItems and switch Photos to use GxsGroupDialog
2020-02-15 14:39:55 +01:00
drbob
095b5224d9 fixup licence formatting 2020-02-15 11:54:29 +11:00
drbob
1baa92f60c fixup serialisation and indentation 2020-02-15 11:39:29 +11:00
Gioacchino Mazzurco
5604f7082b
Initial work on posted API 2020-02-14 23:30:52 +01:00
Gioacchino Mazzurco
c9728cead0
Fix typo in channels deprecated method notice 2020-02-14 23:30:10 +01:00
drbob
d04518fd55 Update RsPhotoItems and switch to GxsGroupDialog.
WIP improvements to PhotoService:
 - Switch from custom image to use RsGxsImage
 - Update classes for new Image class
 - fix serialiser for photos
 - switch group creation to use GxGroupDialog
 - tweak GxsGroupDialog to display extra Widgets
 - add AlbumExtra widget
2020-02-15 01:01:19 +11:00
csoler
a498d4e370
merged upstream/master 2020-02-11 22:16:31 +01:00
csoler
4c54d9d633
added missing case for IDs events 2020-02-11 22:14:29 +01:00
csoler
f75d0add47
added notification for circle cache updates to avoid the need for an additional UI timer 2020-02-11 16:37:53 +01:00
csoler
e4f243694b
finished removing token queue from IdDialog.cpp 2020-02-11 08:36:35 +01:00
csoler
1a250f5138
half-removed token queue system from IdDialog.cpp 2020-02-10 22:33:21 +01:00
csoler
07527cfead
fixed notifications in identity 2020-02-10 20:39:52 +01:00
drbob
d748278637 update code to get Wiki / Wire and PhotoShare compiling again 2020-02-10 22:24:47 +11:00
csoler
41a81fa5d1
fixed notifications in posted 2020-02-09 20:54:11 +01:00
sehraf
f27022fe7b
review fixup 2020-02-09 20:31:18 +01:00
sehraf
6e3740f3b8
add more documentation to updstunner.h 2020-02-09 20:31:17 +01:00
sehraf
6f9d875fc6
* unify CONFIG option for DHT stunner
* implement optional (turned off by default) usage of dht stunner to determin external ip (this can be usefull for some corner case setups)
2020-02-09 20:31:17 +01:00
sehraf
e91d877af2
udpstunner: don't open code header fields, reference and follow (old) RFC 2020-02-09 20:31:17 +01:00
sehraf
4095d82a67
add some documentation to updstunner.h 2020-02-09 20:31:17 +01:00
sehraf
1874241ddd
first pass on udpstunner.cc 2020-02-09 20:31:17 +01:00
sehraf
a7500473eb
enable DHT stunner 2020-02-09 20:31:13 +01:00
csoler
62c5cda7f0
merged upstream/master 2020-02-08 20:04:27 +01:00
csoler
a9f24c85a0
Merge pull request #1774 from G10h4ck/json_api_improvements
JSON API improvements
2020-02-07 23:16:04 +01:00
csoler
f72b385ccf
Merge pull request #1776 from csoler/v0.6-FT
More switch to new notification system
2020-02-07 23:15:41 +01:00
csoler
8e153b4acc
started removal of GxsBroadcastBase class 2020-02-06 19:57:23 +01:00
Gioacchino Mazzurco
039e8f653d
Solve race condition in JSON API restart
Improve atomic access to restbed service
Protect JSON API restart against bursts
Fix JSON API error condition enum registration
Provide ostream helper for error_condition
Provide optional forced thread cancel for debugging purpose, disabled by
  default at compile time define RS_THREAD_FORCE_STOP to enable it
Avoid double fullstop in retroshare-gui json api apply button
2020-02-05 18:56:47 +01:00
csoler
595df99310
fixed notifications for distant search results in channels 2020-02-03 21:39:05 +01:00
csoler
c6643613b6
Merge pull request #1753 from hunbernd/New-Posted-Card-View
New posted card view enhancements
2020-02-01 18:50:27 +01:00
Gioacchino Mazzurco
7757c685c5
Fixup token parsing
If the token is like "somethingA:somethinchB:somethingC" then user is
"somethingA" and password is "somethinchB:somethingC"
2020-02-01 16:40:26 +01:00
csoler
81c1eb227c
moved file hashing and download count to new notification system 2020-01-30 23:02:23 +01:00
Gioacchino Mazzurco
b0358759e5
Delete experimental deadcode 2020-01-30 18:11:49 +01:00
csoler
10bee9f26b
added optional delay to check files after download in order to prevent skiping recently downloaded files 2020-01-29 22:04:29 +01:00
csoler
0efc6b00a1
fixed missing check in AvatarInfo against empty image data 2020-01-29 21:02:46 +01:00
csoler
06be689bef
fixed missing cache update in GxsCircles 2020-01-28 22:53:43 +01:00
csoler
b6366ac5bd
fixed misplaced notification event in GxsCircles 2020-01-28 22:47:30 +01:00
csoler
841ba9e579
added some missing notifications in circles dialog 2020-01-28 22:22:04 +01:00
Gioacchino Mazzurco
8c9310f754
Fix global shutdown call from JSON API 2020-01-27 23:40:18 +01:00
csoler
424e7be52f
added notifications for identities 2020-01-27 23:02:04 +01:00
csoler
90bb6c0011
fixed notifications in forums, posted and channels 2020-01-27 21:38:57 +01:00
Gioacchino Mazzurco
5dbbe1ffd7
Improve debugabbility of JSON API
JSON API server uses standardized error handling based on
  std::error_condition for a few method, this improve debugabbility both
  from library size and from API client side
JSON API auth token are now more flexible, now the only proibition is using
  colon character ':' in user name
Implemented TO_JSON operation for std::error_condition
Avoid unkown serial job handling code duplication via fatalUnknownSerialJob
Usability improvement in t_RsLogger
Disable compilation of now unused is_alphanumeric
2020-01-27 21:22:49 +01:00
csoler
fb9282f588
moved UserNotify to MainPage level, and added RsEvent handling code in Posted 2020-01-26 23:19:20 +01:00
csoler
9c65836503
Merge pull request #1768 from csoler/v0.6-SSL111Fix
fixed OpenSSL 1.1.1 bug on debian due to security level being set to …
2020-01-24 23:08:06 +01:00
csoler
afdf917188
fixed OpenSSL 1.1.1 bug on debian due to security level being set to 2 on default 2020-01-23 23:31:24 +01:00
hunbernd
b3ac3d58a9 Merge upstream 2020-01-22 00:16:41 +01:00
Gioacchino Mazzurco
92990c55e7
JSON API spit out CORS headers also on error
Browsers won't let JavaScript properly handle the error if the corsa
  headers are missing thanks Saud for report see:
  retroshare://forum?name=Shouldn%27t%20CORS%20headers%20be%20present%20for%20all%20API%20responses%3F&id=8fd22bd8f99754461e7ba1ca8a727995&msgid=e3232ae3a1b76698576a9159ba962fa5091e710c
2020-01-21 12:56:52 +01:00
csoler
912f5de90b
Fixed UDP bug (Congrats to Sehraf for finding this!) 2020-01-19 20:08:58 +01:00
csoler
6136ac08f5
removed grouter debug output 2020-01-19 17:43:57 +01:00
csoler
3e62ce2e0a
fixing -u flag not being accounted for 2020-01-18 21:26:34 +01:00
csoler
1370d1417e
Merge pull request #1756 from csoler/v0.6-GRouter
[WIP] V0.6 GRouter
2020-01-18 13:55:29 +01:00
csoler
c75d372f24
merged upstream/master 2020-01-17 22:16:24 +01:00
csoler
26df59971f
Merge pull request #1748 from csoler/v0.6-ImprovedGUI_2
V0.6 improved gui 2
2020-01-17 22:14:49 +01:00
csoler
8941a19db9
fixed mistake that causes missing FeedItems for messages and posted 2020-01-17 21:22:39 +01:00
hunbernd
2b2a9f9a89 Merge upstream 2020-01-13 11:21:59 +01:00
csoler
f0921886db
fixed glitch in previous commit 2020-01-11 19:08:11 +01:00
csoler
6a4c98b2ed
allowed some clients to Event handler to register with type NONE, which means that all event types will be sent to the client 2020-01-11 19:01:43 +01:00
csoler
45e579c98f
fixed bug where notification was missing on creation of new post in forums, channels and posted 2020-01-11 17:00:01 +01:00
csoler
f76b81ba49
fixed compilation in jsonapi to cope with new event type field in registerEventHandler() 2020-01-11 16:10:28 +01:00
csoler
2bd5bb5a3e
fixed merge with master 2020-01-11 00:08:36 +01:00
Gioacchino Mazzurco
33c2f56a8e
Fixup jsonapi server stopping 2020-01-08 23:16:05 +01:00
Gioacchino Mazzurco
f12ec2b535
JSON API service and RsThread fixups 2020-01-08 14:24:46 +01:00
hunbernd
0e8b12ff9f Merge upstream 2020-01-07 15:05:21 +01:00
Gioacchino Mazzurco
014b5255ed
Fixup windows build 2020-01-07 02:00:57 +01:00
Gioacchino Mazzurco
8718a442d1
Merge branch 'master' of github.com:RetroShare/RetroShare 2020-01-07 01:50:44 +01:00
Gioacchino Mazzurco
880a328c91
Fixup nested include in rsinit.cc 2020-01-07 01:50:17 +01:00
Gioacchino Mazzurco
b17738f668
Merge branch 'csoler-v0.6-SecNotification' 2020-01-07 01:19:08 +01:00