1124 Commits

Author SHA1 Message Date
Miguel Jacq
293c17cf00 Resolve conflict with upstream's onion.py 2018-01-14 18:53:46 +11:00
Micah Lee
8664b98b1a Merge branch 'mig5-493_500_detect_broken_tor_connection' 2018-01-13 22:50:57 -08:00
Micah Lee
a34cae0b17 Create the timer before the TorConnectionDialog dialog, but start it after. This way if you cancel the dialog, then click save in the settings, OnionShareGui.timer will already exist, even though though TorConnectionDialog hasn't closed yet 2018-01-13 22:46:57 -08:00
Micah Lee
2dd2052c69 Don't start the check_for_requests timer until after connected to Tor, and remove OnionShareGui.tor_con and TorConnectionDialog.t as class variables, making them local variables instead 2018-01-13 22:42:27 -08:00
Micah Lee
ac29bdb5df Better way to get the onion service_id 2018-01-13 19:18:33 -08:00
Micah Lee
1cd36f6bbf Merge branch 'mig5-525_catch_failure_to_obtain_service_id' 2018-01-13 19:14:33 -08:00
Micah Lee
861c4a7244 Merge branch '525_catch_failure_to_obtain_service_id' of https://github.com/mig5/onionshare into mig5-525_catch_failure_to_obtain_service_id 2018-01-13 19:09:03 -08:00
Micah Lee
552bfd7140 Merge branch 'mig5-520_fix_hyperlink_qlabel' 2018-01-13 17:01:55 -08:00
Micah Lee
97788976dd Merge branch '520_fix_hyperlink_qlabel' of https://github.com/mig5/onionshare into mig5-520_fix_hyperlink_qlabel 2018-01-13 16:59:24 -08:00
Micah Lee
369aa7e9a5 Merge branch 'mig5-disable_start_share_on_no_files' 2018-01-13 16:41:41 -08:00
Micah Lee
f76cf1e258 Merge branch 'disable_start_share_on_no_files' of https://github.com/mig5/onionshare into mig5-disable_start_share_on_no_files 2018-01-13 16:41:06 -08:00
Micah Lee
7c653b6a8d Merge branch '493_500_detect_broken_tor_connection' of https://github.com/mig5/onionshare into mig5-493_500_detect_broken_tor_connection 2018-01-13 16:32:56 -08:00
Micah Lee
3527c0440a Merge branch 'mig5-495_clear_status_bar_early' 2018-01-13 16:12:13 -08:00
Micah Lee
9df10c2d4c Merge branch '495_clear_status_bar_early' of https://github.com/mig5/onionshare into mig5-495_clear_status_bar_early 2018-01-13 16:09:11 -08:00
Micah Lee
d5c6cc482a Merge branch 'mig5-453_catch_oserror_on_crunching_files' 2018-01-13 15:59:46 -08:00
Micah Lee
22e8676eda Merge branch '453_catch_oserror_on_crunching_files' of https://github.com/mig5/onionshare into mig5-453_catch_oserror_on_crunching_files 2018-01-13 15:58:15 -08:00
Micah Lee
4453f12e20 Merge branch 'lazlolazlolazlo-dutch' 2018-01-13 15:05:22 -08:00
Micah Lee
daaf88ffb9 Merge branch 'dutch' of https://github.com/lazlolazlolazlo/onionshare into lazlolazlolazlo-dutch 2018-01-13 15:04:54 -08:00
Micah Lee
9a4c52ff20 Merge branch 'Baccount-Increasing-the-timeout' 2018-01-13 13:49:54 -08:00
Micah Lee
46eccb53f2 Merge branch 'Increasing-the-timeout' of https://github.com/Baccount/onionshare into Baccount-Increasing-the-timeout 2018-01-13 13:46:51 -08:00
Micah Lee
0ba357eb73 Merge branch 'master' of https://github.com/wondratsch/onionshare 2018-01-12 18:58:41 -08:00
Micah Lee
6f0ec022a5 Merge branch 'mig5-onion_cleanup_on_stop_server' 2018-01-12 18:57:36 -08:00
Micah Lee
cd85fe896a Merge branch 'onion_cleanup_on_stop_server' of https://github.com/mig5/onionshare into mig5-onion_cleanup_on_stop_server 2018-01-12 18:56:03 -08:00
Miguel Jacq
ffa7f97905 catch error in start_onion_service in case we somehow failed to parse a service_id in Stem controller response 2018-01-02 16:35:48 +11:00
Miguel Jacq
40eeb2cfd3 #520 trigger browser action properly in QLabel hyperlink 2017-12-27 20:08:38 +11:00
Baccount
f96ff3328f Update onion.py 2017-12-26 22:53:44 -08:00
Miguel Jacq
4d0ef50fac Emit the files_updated signal when deleting files. This will ensure that the share button gets disabled when there are no files in the list 2017-12-27 11:37:06 +11:00
Miguel Jacq
47e0ef4f83 Add systray notification when Tor connection is lost, thanks @Baccount 2017-12-27 09:29:45 +11:00
Miguel Jacq
0834580f02 Disable the 'Start Sharing' button if the connection to Tor has been lost. Re-enable it if we've subsequently reconnected to Tor via Settings dialog 2017-12-24 14:07:20 +11:00
Miguel Jacq
5faecdb3c6 Don't show alert dialogs when Tor disconnects - just display in statusbar and stop any active share. 2017-12-23 16:43:58 +11:00
Miguel Jacq
c3c50c0955 Fixes for the edge case where Tor connection dialog is canceled, but the Tor process remains open in the background, which was causing onion.is_authenticated() to True. Remove excessive alerts 2017-12-21 14:08:13 +11:00
Miguel Jacq
2b36938d53 Ensure we don't consider the Tor connection 'lost' if we're still in the connection dialog process (wait for that thread to finish).
Also various implementations of onion.is_authenticated() for a more robust check than onion.connected_to_tor,
which seemed to help some corner cases
2017-12-21 12:15:23 +11:00
Miguel Jacq
6e64f08f08 #493, #500 - detect if the Tor connection (bundled, TorBrowser or otherwise) has been lost while the app is open. Stop a running share if so 2017-12-21 09:22:53 +11:00
Miguel Jacq
da5946b4d4 Clear the status bar messages earlier when starting a new share 2017-12-20 07:39:55 +11:00
Miguel Jacq
4aabd38b74 Let the Tor connection take a little longer (60s) if bridges are in use 2017-12-14 17:31:15 +11:00
Miguel Jacq
e06f4f7230 Catch OSError when preparing the zip file during server start. Fixes #453 2017-12-12 17:02:11 +11:00
Miguel Jacq
1f47177c7b Fix the Bridges widgets so that they only appear when bundled Tor is chosen. Fixes all the other widget cramming issues. 2017-12-12 08:43:12 +11:00
Miguel Jacq
9c6a6970d6 remove debug file.. 2017-12-11 18:01:14 +11:00
Miguel Jacq
f7ea85d67f experimenting with adjustSize() which seems to help the widget issue. Also adjust the custom Bridge parsing so that it injects the Bridge prefix automatically (means we can copy/pasta from https://bridges.torproject.org/bridges) 2017-12-11 17:58:53 +11:00
Miguel Jacq
4b67045fb2 Improvements to the custom bridges textfield widget, still not perfect when used in conjunction with Tor socket/auth option widgets 2017-12-11 16:48:28 +11:00
Miguel Jacq
0c8231f726 fix tests for bridge support 2017-12-11 16:28:53 +11:00
Miguel Jacq
0ad2e3cb64 Forgot the UseBridges line for custom bridges 2017-12-11 16:20:42 +11:00
Miguel Jacq
25cf9ec9db Add bridge support (obfs4 or user-supplied) 2017-12-11 14:53:13 +11:00
Lazlo Westerhof
cbf173580d Add missing comma. 2017-12-08 21:56:09 +01:00
Lazlo Westerhof
1b610fa224 Update Dutch translation. 2017-12-08 21:53:51 +01:00
Micah Lee
d7190497cb Merge branch 'intrigeri-bugfix/nautilus-extension-dont-spam-logs' 2017-12-07 14:32:07 -08:00
Micah Lee
7c41c44b49 Merge branch 'bugfix/nautilus-extension-dont-spam-logs' of https://github.com/intrigeri/onionshare into intrigeri-bugfix/nautilus-extension-dont-spam-logs 2017-12-07 14:30:22 -08:00
wondratsch
1f9ee70efe add FreeBSD Support 2017-12-07 11:51:32 +01:00
intrigeri
f59fd5d525 Nautilus extension: avoid spamming the logs due to missing method.
Without this change I see a dozen or so warnings in the Journal:

    nautilus_menu_provider_get_background_items: assertion
    'NAUTILUS_IS_MENU_PROVIDER (provider)' failed

Nautilus upstream developers are going to discuss if/how they want to address
this on their side; in the meantime they recommend simply adding a no-op method
to silence the logs, so here we go.
2017-12-07 06:04:48 +00:00
Miguel Jacq
433c7c754e cleanup the ephemeral hidden service when GUI server is stopped, but don't disconnect from Tor 2017-12-07 16:10:52 +11:00