Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Major refactor #322

Merged
merged 28 commits into from
Mar 26, 2018
Merged

Major refactor #322

merged 28 commits into from
Mar 26, 2018

Conversation

micahflee
Copy link
Collaborator

In this pull request I:

  • Switch from python2 to python3
  • Switch from gtk2 to Qt5
  • Switch from twisted to requests/socks
  • Use QThreads for async, and now download, verify, and extract in separate threads too
  • Remove modem sound
  • Stopped refreshing the gpg keyring each time, and instead only refresh it when you hit a verification error (and then try verifying again before actually displaying the error)
  • On verification error, it saves a copy of the tarball and sig that failed to verify
  • Improved python style with flake8

This fixes #321, #213, #214, and #319.

…tion fails, it saves a backup. And it uses gpg2 to refresh the keyring instead of gpg1, which did nothing.
…of-date and I use systemwide packages for deps
@micahflee
Copy link
Collaborator Author

@intrigeri I know you're aiming to only focus on the AppArmor part of this project, but would you mind reviewing this PR before I merge it into develop? We don't have tests, so it would be good to have a second person manually test it to make sure it works as expected, and also to confirm that it doesn't change the AppArmor rules at all.

@intrigeri
Copy link
Collaborator

intrigeri commented Mar 24, 2018 via email

@micahflee
Copy link
Collaborator Author

Good idea, I will contact Roger.

@micahflee micahflee added this to the 0.3.0 milestone Mar 24, 2018
@micahflee micahflee merged commit f97b550 into develop Mar 26, 2018
@troubadoour
Copy link
Contributor

I forked from major refactor branch. (debian stretch in Qubes 4.0).

It does work fine, except for a minor (?) issue. The gui (empty) is showing whatever the state (tbb installed, latest version), and stays open after stopping Tor Browser. A second instance pops when restarting the launcher, and so on...

When torbrowser-launcher is started from command line, we have to ctrl-c or close the gui before being able to restart it.

@rogers0
Copy link
Contributor

rogers0 commented Mar 27, 2018

It does work fine, except for a minor (?) issue. The gui (empty) is showing whatever the state (tbb installed, latest version), and stays open after stopping Tor Browser. A second instance pops when restarting the launcher, and so on...

When torbrowser-launcher is started from command line, we have to ctrl-c or close the gui before being able to restart it.

@micahflee I can reproduce the issue mentioned.
Please kindly help to fix if possible. Thanks!

@troubadoour
Copy link
Contributor

troubadoour commented Mar 27, 2018

Please kindly help to fix if possible. Thanks!

Not sure this was addressed to me.

Anyhow, an update in __init__.py that seems to fix the issue. Could you review?

troubadoour/torbrowser-launcher@1402015

Minor
troubadoour/torbrowser-launcher@63646cb

@rogers0
Copy link
Contributor

rogers0 commented Mar 28, 2018

troubadoour/torbrowser-launcher@1402015
troubadoour/torbrowser-launcher@63646cb

@micahflee
I confirm the problem goes away after applying two patches above.

@troubadoour
Really appreciated!

@rogers0
Copy link
Contributor

rogers0 commented Mar 28, 2018

@micahflee @troubadoour
I just uploaded 0.3.0~dev-1~exp2 to debian experimental.
It should hit the archive shortly. After that you can install it if you use debian.

How to install from experimental repo can be referenced:

After you test it well, and upstream removes ".dev" in the version string, I think I can upload to unstable.

@troubadoour
Copy link
Contributor

troubadoour commented Mar 29, 2018

Tested OK.
Installing and reinstalling Tor Browser, settings... all look fine.

@micahflee micahflee deleted the major-refactor branch April 6, 2018 20:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
5 participants