213 Commits

All Branches

Search

Author	SHA1	Message	Date
Sarah Jamie Lewis	d372a15ff9	Remove EventHandler Map that isn't Used Anymore	2021-06-22 15:31:40 -07:00
Sarah Jamie Lewis	0f53ae0062	Merge pull request 'if no remote name, reask' (#61) from getNameAfterApproved into trunk ... Reviewed-on: #61	2021-06-17 17:23:08 -07:00
Sarah Jamie Lewis	f6eaa2d691	Merge branch 'trunk' into getNameAfterApproved	2021-06-17 17:23:03 -07:00
Sarah Jamie Lewis	8f1b1b8630	Merge pull request 'check acn status on reconnect' (#60) from reconnACNStatus into trunk ... Reviewed-on: #60	2021-06-17 17:21:57 -07:00
Dan Ballard	e2cf1d25e3	if no remote name, reask	2021-06-17 17:05:07 -07:00
Dan Ballard	7b3ff2c1af	check acn status on reconnect	2021-06-17 16:58:11 -07:00
Sarah Jamie Lewis	c6f1c4d0f9	Merge pull request 'counter sync events' (#59) from countersync into trunk ... Reviewed-on: #59	2021-06-17 15:45:23 -07:00
erinn	e7ef2fef4a	counter sync events	2021-06-17 15:41:41 -07:00
erinn	ffaca8d876	Merge pull request 'Fix import bundle for groups to auto accept' (#58) from beta_fixes into trunk ... Reviewed-on: #58	2021-06-17 13:53:14 -07:00
Sarah Jamie Lewis	6070d378c5	Merge branch 'trunk' into beta_fixes	2021-06-17 13:50:58 -07:00
Sarah Jamie Lewis	fafdb8132a	Merge pull request 'remove QueryACNVersion API, just do it on app launch; removed unused GetProfiles API' (#57) from fixReconnect into trunk ... Reviewed-on: #57	2021-06-17 13:50:50 -07:00
Sarah Jamie Lewis	9a764b5b35	Fix import bundle for groups to auto accept	2021-06-17 13:49:20 -07:00
Dan Ballard	3261d18118	remove QueryACNVersion API, just do it on app launch; removed unused GetProfiles API	2021-06-17 11:53:41 -07:00
Sarah Jamie Lewis	08b1b19f7a	Merge pull request 'add group message popup notifications' (#56) from groupnotifs into trunk ... Reviewed-on: #56	2021-06-16 17:00:11 -07:00
erinn	204cc35e0d	switch-ffi	2021-06-16 16:46:27 -07:00
erinn	28011ae674	add group message popup notifications	2021-06-16 16:45:15 -07:00
erinn	eb4150c0be	Merge branch 'trunk' of git.openprivacy.ca:flutter/libcwtch-go into groupnotifs	2021-06-16 15:59:00 -07:00
erinn	d9f9489fa2	add group message popup notifications	2021-06-16 15:58:54 -07:00
erinn	854dc1946f	Merge pull request 'Shutdown Event' (#55) from beta_fixes into trunk ... Reviewed-on: #55	2021-06-16 14:55:53 -07:00
Sarah Jamie Lewis	26b0151e79	Shutdown Event	2021-06-16 14:11:40 -07:00
Sarah Jamie Lewis	abe06912a1	Merge pull request 'add mutex on StartCwtch and ReconnectCwtchForeground' (#54) from fixReconnect into trunk ... Reviewed-on: #54	2021-06-16 12:03:23 -07:00
Dan Ballard	11f09c95d2	remove mutex 'fix', instead just don't reconnect, assume whole stale thread and abandon	2021-06-16 11:41:36 -07:00
Dan Ballard	9b18bef47a	add mutex on StartCwtch and ReconnectCwtchForeground	2021-06-16 08:58:53 -07:00
Sarah Jamie Lewis	c5f36a9480	Merge pull request 'goStart' (#53) from goStart into trunk ... Reviewed-on: #53	2021-06-15 11:07:03 -07:00
Dan Ballard	192d98a89b	Cleaned out more dead code; fixed bug where remote attrs could override local attrs in UI	2021-06-15 11:03:53 -07:00
Dan Ballard	00c5412551	finish removing unused code (getACNEvents, getContactEvents, getRepaintEvent, SelectProfile	2021-06-15 10:28:19 -07:00
Dan Ballard	d921612d25	move acn and cwtch app creation into a go routine, report success or error by message	2021-06-15 10:28:19 -07:00
erinn	39187a7db7	Merge pull request 'Delete Peer and Leave Conversation' (#52) from beta_fixes into trunk ... Reviewed-on: #52	2021-06-14 17:28:27 -07:00
erinn	6fabfa507d	Merge branch 'trunk' into beta_fixes	2021-06-14 17:28:21 -07:00
Sarah Jamie Lewis	6560fcef49	Delete Peer and Leave Conversation	2021-06-14 17:23:47 -07:00
Sarah Jamie Lewis	033de73b6a	Merge pull request 'android service and notifications' (#51) from androidservice into trunk ... Reviewed-on: #51	2021-06-11 14:41:20 -07:00
erinn	370e6090ce	loglevel oops	2021-06-11 14:26:55 -07:00
erinn	61d078f645	ffi switch oops	2021-06-11 14:25:00 -07:00
erinn	af4d994d6a	Merge branch 'trunk' of git.openprivacy.ca:flutter/libcwtch-go into androidservice	2021-06-11 14:21:16 -07:00
erinn	78a2e033dc	android service and notification support	2021-06-11 14:21:09 -07:00
Dan Ballard	fddfd41fbf	Merge pull request 'Upgrade cwtch' (#50) from update_flags into trunk ... Reviewed-on: #50	2021-06-10 11:36:27 -07:00
Sarah Jamie Lewis	936c45f234	Upgrade cwtch	2021-06-10 10:59:22 -07:00
Dan Ballard	08fe76bf30	Merge pull request 'Use int64 for UpdateMessageFlags api so gomobile can generate it' (#49) from update_flags into trunk ... Reviewed-on: #49	2021-06-09 12:45:50 -07:00
Sarah Jamie Lewis	2b86f7b282	Use int64 for UpdateMessageFlags api so gomobile can generate it	2021-06-09 11:58:23 -07:00
Dan Ballard	33945af046	Merge pull request 'Add UpdateMessageFlags' (#48) from update_flags into trunk ... Reviewed-on: #48	2021-06-09 11:31:59 -07:00
Sarah Jamie Lewis	9b1814e43d	Add UpdateMessageFlags	2021-06-09 11:27:51 -07:00
Sarah Jamie Lewis	4dd8d74bfb	Merge pull request 'api call for QueryACNVersion' (#47) from acnver into trunk ... Reviewed-on: #47	2021-06-07 09:13:58 -07:00
Sarah Jamie Lewis	772cf7949a	Merge branch 'trunk' into acnver	2021-06-07 09:13:52 -07:00
Dan Ballard	62a55a6fec	api call for QueryACNVersion	2021-06-06 10:40:58 -07:00
erinn	6a0e839bb6	Merge pull request 'ui-fixes' (#46) from ui-fixes into trunk ... Reviewed-on: #46	2021-06-02 12:40:33 -07:00
Sarah Jamie Lewis	53d11dc45d	spelling	2021-06-02 12:36:26 -07:00
Sarah Jamie Lewis	ee47798714	staticcheck fixes	2021-06-02 12:36:26 -07:00
Sarah Jamie Lewis	6f01c992af	Fix Tor Crashes, Upgrade Cwtch/Tapir	2021-06-02 12:36:26 -07:00
Dan Ballard	4f625c7f8e	Merge pull request 'Optimistically Sync Servers on Import Bundle' (#45) from ui-fixes into trunk ... Reviewed-on: #45	2021-05-31 16:30:47 -07:00
Sarah Jamie Lewis	ed868c140b	Optimistically Sync Servers on Import Bundle	2021-05-31 16:26:51 -07:00