12 commits

Author	SHA1	Message	Date
technillogue	aef4115f1f	remove some duplicated code	2021-04-25 19:43:16 -04:00
technillogue	b5fd2f920d	hopefully fixed some stuff	2021-04-25 19:05:59 -04:00
technillogue	4c59d4b9e8	fixed some bad merges but there's more...	2021-04-24 22:47:31 -04:00
technillogue	cc5bb13519	fix unmerged files	2021-04-24 22:37:59 -04:00
technillogue	685fce477c	try to merge again	2021-04-24 22:23:52 -04:00
technillogue	6d18f311e6	Merge remote-tracking branch 'upstream/master' into stdio	2020-12-29 19:26:44 -05:00
AsamK	67f62947c6	Add null check and change some formatting	2020-12-23 11:33:01 +01:00
Atomic-Bean	58db3cbd53	Quotes, Mentions and Reactions in non-daemon JSON mode (#389) ... * Added support for quotes, mentions and reactions in non-daemon JSON output	2020-12-23 11:23:40 +01:00
AsamK	2617757edb	Add group v2 id to json output	2020-12-21 14:30:42 +01:00
AsamK	591c0fe8a3	Reformat project	2020-12-08 20:59:20 +01:00
technillogue	43a2b4674f	it works!	2020-11-09 16:41:21 -05:00
AsamK	ae41d0c502	Output json when receiving messages from dbus and --json parameter is given ... Fixes #138	2020-04-03 16:22:10 +02:00

Renamed from src/main/java/org/asamk/signal/JsonDataMessage.java (Browse further)