3110 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
akwizgran	8e1ada4cdc	Don't allow other apps to open the panic prefs activity.	2017-03-30 12:26:33 +01:00
akwizgran	ac063b4c79	Require a system permission to open the settings activity.	2017-03-30 12:00:35 +01:00
akwizgran	9c89e83c20	Merge branch '913-simpler-password-strength-estimation' into 'master' ... Simpler password strength estimation Closes #913 See merge request !495	2017-03-29 15:01:44 +00:00
akwizgran	adc9bdeb68	Merge branch 'run-configurations' into 'master' ... Run configurations for tests See merge request !498	2017-03-29 08:18:05 +00:00
akwizgran	ff7f0bdc63	Added run configurations for tests to git.	2017-03-28 15:36:18 +01:00
akwizgran	2574354997	Merge branch '905_set_testing_constant_on_debug' into 'master' ... Set TESTING from BuildConfig Closes #905 See merge request !494	2017-03-28 12:30:00 +00:00
akwizgran	c4e42949cf	Simpler password strength estimation.	2017-03-28 13:27:04 +01:00
goapunk	1c5897f1cc	Set TESTING from BuildConfig ... Signed-off-by: goapunk <noobie@goapunks.net>	2017-03-27 23:39:39 +02:00
akwizgran	1918346ae8	Merge branch '911-link-sanitation' into 'master' ... Sanitize all HTML before displaying it Closes #911 See merge request !493	2017-03-27 09:45:17 +00:00
akwizgran	2a59515c72	Merge branch '907-panic-signout' into 'master' ... Require a panic app to be set before executing any panic actions Closes #907 See merge request !492	2017-03-27 09:43:30 +00:00
akwizgran	7161152b41	Merge branch '903_replace_Runtime_with_ProcessBuilder' into 'master' ... Use ProcessBuilder instead of Runtime to start tor See merge request !487	2017-03-27 09:37:00 +00:00
akwizgran	b42660edab	Merge branch 'emoji-soft-reference' into 'master' ... Fix potential NPE when getting soft reference See merge request !490	2017-03-27 09:28:30 +00:00
akwizgran	b405bbf98e	Merge branch 'setting-to-disable-tor' into 'master' ... Add a setting to disable Tor See merge request !489	2017-03-27 09:27:56 +00:00
akwizgran	c167938b61	Use constants for Tor network setting values.	2017-03-27 10:26:10 +01:00
Torsten Grote	24b531e6b2	Sanitize all HTML before displaying it	2017-03-24 16:45:36 -03:00
Torsten Grote	9cffff715a	Require a panic app to be set before executing any panic actions	2017-03-24 16:19:09 -03:00
Torsten Grote	804e912e19	Merge branch 'remove-placeholder-tests' into 'master' ... Remove placeholder tests See merge request !491	2017-03-24 18:12:13 +00:00
akwizgran	d67e3900e3	Removed placeholder tests. ... Evidently this way of nagging myself to write tests doesn't work.	2017-03-24 15:18:37 +00:00
akwizgran	e682f31898	Added a setting to disable Tor. ... Also fixed a bug with settings namespaces.	2017-03-24 14:56:30 +00:00
akwizgran	a9053808b4	Merge branch '908-rss-import-dns-leak' into 'master' ... Don't make DNS lookups during RSS import Closes #908 See merge request !488	2017-03-24 10:02:19 +00:00
akwizgran	d9a62a0431	Merge branch 'print_tor_errors' into 'master' ... Make Tor boot more verbose See merge request !486	2017-03-24 10:01:29 +00:00
akwizgran	15ba73276d	Merge branch '900-remove-error-state' into 'master' ... Remove error state and reset session on error instead Closes #900 See merge request !484	2017-03-24 09:57:03 +00:00
Torsten Grote	720dda784e	Remove error state and reset session on error instead	2017-03-23 14:14:23 -03:00
akwizgran	0ae55404f5	Merge branch '900-simplify-sharing-client-state-machine' into 'master' ... Remove REMOTE_LEFT state from sharing client state machine See merge request !483	2017-03-23 16:13:44 +00:00
akwizgran	9c41437870	Prevent OkHttp from making local DNS lookups.	2017-03-23 15:13:15 +00:00
akwizgran	da9cde083f	Include description of SOCKS error in exception.	2017-03-23 15:13:15 +00:00
goapunk	ce3156c9fe	Use ProcessBuilder instead of Runtime to start tor ... * ProcessBuilder copies the ENV from the current proc and preserves ANDROID_ROOT and ANDROID_DATA Signed-off-by: goapunk <noobie@goapunks.net>	2017-03-18 09:46:24 +01:00
goapunk	be3752bf2f	Set Android env vars ... Signed-off-by: goapunk <noobie@goapunks.net> (cherry picked from commit e26f663)	2017-03-17 16:00:34 +00:00
noobie	ef74db65aa	Make Tor boot more verbose ... Signed-off-by: noobie <noobie@goapunks.net>	2017-03-13 12:19:14 +01:00
Torsten Grote	867a233b6f	Update expiry	2017-03-06 18:46:15 +01:00
Torsten Grote	36f02b36d9	Update expiry and translations	2017-02-01 11:17:53 -02:00
Torsten Grote	59af25b2cd	Remove REMOTE_LEFT state from sharing client state machine	2017-01-12 15:19:28 -02:00
akwizgran	2fb11fba2a	Merge branch '877-save-invitation-outcome-to-invitation-message-and-make-available-to-ui' into 'master' ... Store invitation outcome in metadata and make it available to the UI This MR is based on !479 and should only be merged after that one has been merged as well. It stores the invitation outcome in the message metadata and includes it in the `canBeOpened()` calculation for private groups and sharables. Closes #877 See merge request !480	2017-01-06 16:06:19 +00:00
akwizgran	1d11857e75	Merge branch '476-blog-sharing-protocol-modifies-state-external-to-session' into 'master' ... Migrate blog sharing to new sharing client infrastructure This MR contains a second small commit that fixes #816 and adds a test for it. Closes #476, #701 See merge request !479	2017-01-06 16:04:17 +00:00
Torsten Grote	04508a7431	Store invitation outcome in metadata ... and include in canBeOpened calculation for private groups and sharables.	2017-01-06 13:29:21 -02:00
Torsten Grote	5653c6d650	Address review comments	2017-01-06 13:25:13 -02:00
Torsten Grote	ab100ad19b	Properly remove the blog when deleting a contact and inform all peers ... Fixes #816	2017-01-06 13:01:37 -02:00
Torsten Grote	c13eafef14	Migrate blog sharing to new sharing client infrastructure	2017-01-06 13:01:34 -02:00
akwizgran	d5443e9651	Merge branch '889-select-navdrawer-item-when-coming-from-notification' into 'master' ... Check the blog item in NavDrawer when opening a blog via notification There are three scenarios where the selected item in the NavDrawer changes: 1. The user selects an item -> the item is checked automatically. 2. The user pressed back -> already handled in onBackPressed (needs to be extended with #606) 3. The user touched a notification -> handled by this commit. Signed-off-by: goapunk <noobie@goapunks.net> Closes #889 See merge request !481	2017-01-06 14:59:21 +00:00
akwizgran	d5f9a3280d	Merge branch 'briar-recycler-view-log' into 'master' ... Stop periodic list update only once When testing the forum unread code, I noticed the recycler view is detaching twice. Once because the stop method is called and once because the view detaches from the window. Wouldn't it be safe to null the refresher when the updates are stopped? See merge request !478	2017-01-06 14:15:48 +00:00
goapunk	09b2ecaecf	Check the corresponding NavDrawer item when coming from a notification ... Signed-off-by: goapunk <noobie@goapunks.net>	2017-01-06 15:12:40 +01:00
Torsten Grote	dc6a6f27ab	Fix MessageTreeImplTest	2017-01-04 16:27:49 -02:00
Torsten Grote	8d9ddeeeee	Stop periodic list update only once	2017-01-04 11:15:19 -02:00
Torsten Grote	baed2b8483	Merge branch '879-remove-thread-collapsing-unread-count' into 'master' ... Remove code for collapsing threads and for reply count Besides removing lots of code, this MR also improves the encapsulation between adapter and view holders. Closes #478, #502, #526, #682, #683, #835, #836 See merge request !477	2017-01-04 13:00:16 +00:00
Torsten Grote	b3d3230549	Remove code for collapsing threads and for reply count	2017-01-04 10:58:31 -02:00
akwizgran	deb8787668	Merge branch '879-threaded-unread-messages' into 'master' ... Threaded Unread Handling  This leaves in the collapsing code for now and just hides the UI element for collapsing. The code can be removed in a second pass to simplify the adapter. Closes #879 See merge request !476	2017-01-04 11:12:24 +00:00
Torsten Grote	7034ea28f3	Merge branch '475-new-sharing-client' into 'master' ... New Forum Sharing Client This is very similar to how the private group invitations work and I am sure there's still some tiny bugs that I didn't catch. All existing integration tests either pass or have been modified to pass. Once this has been merged, the code should be usable for blog sharing as well. Closes #475 See merge request !467	2017-01-03 19:30:48 +00:00
Torsten Grote	51b78cf9b1	Address review comments for new sharing client	2017-01-03 17:25:45 -02:00
Torsten Grote	b4c669243b	Add UnreadMessageButton to threaded conversations	2017-01-03 13:25:31 -02:00
Torsten Grote	694e662028	New Forum Sharing Client	2017-01-03 11:23:02 -02:00