d63d10d8ae
massive cleanup of merged code from Ony fork
...
removal/comment out of LoggerFactory log system
2015-02-02 14:01:08 -05:00
5c80572264
Merge branch 'master' of https://github.com/SuppSandroB/Ony into ony-dev
...
Conflicts:
AndroidManifest.xml
jni/Android.mk
res/menu/main.xml
src/org/torproject/android/OrbotMainActivity.java
src/org/torproject/android/service/TorService.java
src/org/torproject/android/ui/TipsAndTricks.java
src/org/torproject/android/vpn/OrbotVpnService.java
src/org/torproject/android/wizard/ConfigureTransProxy.java
src/org/torproject/android/wizard/Permissions.java
2015-02-02 13:42:56 -05:00
7c303f1589
refactoring into cleaner packages
2015-02-02 11:04:32 -05:00
c1fe536aeb
add button handle logic
2015-02-01 23:36:19 -05:00
6a83a0d2f6
update project and layout for v15 merged browser + VPN
2015-02-01 12:49:10 -05:00
1472b4e35d
some missing files added to git repo
2015-01-25 11:42:15 +01:00
21b75b4c56
vpn changes
2015-01-20 15:47:24 +01:00
09bdd8fd29
renable the network state receiver code
2014-12-03 09:36:35 -05:00
6feb32cfa9
re-enable network receiver
2014-12-01 11:03:56 -05:00
ad7d92fb4a
clean-up / remove un-used code
2014-11-29 00:43:01 -05:00
2d6c26a999
show exit node info in log
2014-11-29 00:42:51 -05:00
ec9204a5f3
clean-up of code to make service more long-lived and stable
2014-11-28 23:54:04 -05:00
695b5c32f1
removing jsocks proxy code (for VPN not needed anymore)
2014-11-28 23:53:19 -05:00
1e0f640a20
adding dummyactivity to stop task/broadcast from killing foreground service
2014-11-24 23:12:53 -05:00
87d5ac9c44
changes to improve longevity of background service/Tor process
2014-11-24 13:11:38 -05:00
611558218d
onResume() must finish before we call some APIs
2014-11-24 13:11:14 -05:00
cf21809052
improves in start/stop logic for background service
2014-11-17 23:28:33 -05:00
e389d007c3
remove unneeded imports
2014-11-17 16:06:37 -05:00
a7f458758f
version build to ensure nonPIE binaries are installed
2014-11-17 14:10:33 -05:00
f180f13d80
add support for other onboot events, including external storage mount
...
also version up to ensure install for PIE fix
2014-11-17 14:10:12 -05:00
dbd4efe86b
set values for nonPIE build
2014-11-17 11:59:49 -05:00
5917e63693
updates for Android L and PIE binary support
2014-11-13 13:42:14 -05:00
3ef94e009c
more fixes for VPN but not quite ready yet
2014-11-13 13:40:50 -05:00
97ca6fbd05
set MTU back to 1500 default
2014-10-28 01:05:53 -04:00
1b44dcbbe0
remove unused routes
2014-10-25 08:47:18 -04:00
a964bef825
moves VPN service to background Service so it doesn't die
...
(and other important fixes)
2014-10-24 15:44:17 -04:00
2d98a29d82
temporarily use udpgw-client to make DNS and UDP tunneling to work
2014-10-24 01:14:54 -04:00
f9e340b465
goodbye AIDL file... no longer using bound services
2014-10-24 01:14:39 -04:00
c9bb1c2890
remove bind service and use localbroadcast instead
...
this should fix problems with the service being killed on unbind
2014-10-24 01:14:02 -04:00
e45991899a
first commit of new OrbotVPN integration into Orbot
2014-10-21 12:30:13 -04:00
dbbd8292c2
Merge branch 'master' of https://github.com/freckles-the-pirate/orbot into freckles-the-pirate-master
2014-09-30 23:34:08 -04:00
a64e6b164f
update Orbot about dialog display to show tor version
2014-09-14 16:19:04 -04:00
ef98429068
update tor binary constant to force on device upgrade
2014-09-14 16:11:53 -04:00
08317a94d7
fixes for transproxy/iptables rules
...
- not all rules were not being cleared in flush
- per-app transproxy now still transproxies DNS for full device (not all DNS is done under the app UID)
- root shell now created only once and shared across calls
2014-09-14 16:07:18 -04:00
b35a239e44
ensure all iptables rules are always wiped
...
and reapply rules settings if modifed after settings menu accessed
2014-09-07 09:34:48 -04:00
313c92f863
add warning about restarting Orbot after settings changes
2014-09-06 01:02:38 -04:00
8ee5e9e0fb
more tuning of Tor service startup and status checking
2014-09-06 00:46:57 -04:00
9c4c3496f1
fix for reconnecting to exiting Tor process after service restart
2014-09-03 22:45:31 -04:00
1229da66cb
Merge branch 'master' of https://git.torproject.org/orbot
2014-09-01 19:27:17 -07:00
a0b32ba068
don't manually call onDestroy, just call finish()
2014-08-29 00:16:31 -04:00
b8912adbfb
improve error handling of tor startup sequence
...
don't use executor thread pool for time critical commands
2014-08-28 23:23:55 -04:00
c98509d8e6
remove duplicate service start/bind code in onResume()
...
also disable startup button if service is null
2014-08-28 23:22:45 -04:00
6e6546972a
ensure settings are updated and binary paths are on service restart
2014-08-26 23:01:46 -04:00
af433d37ba
remove unused variables/patterns
2014-08-26 22:43:58 -04:00
dafd295b97
simplify process reconnect and transproxy setup
...
- on reconnect to service, don't require call to getInfo before STATUS_ON is set
- transproxy should always delete/flush before adding in order to make sure old rules are cleared
2014-08-26 22:41:20 -04:00
390b89ed57
remove debug file logging for now until we can improve it
2014-08-22 11:10:47 -04:00
e53e03a727
tuning Orbot app conflict checker code
2014-08-22 11:09:11 -04:00
eaccf77116
don't call handle intents twice!
2014-08-21 10:10:14 -04:00
c78a8225d6
add transproxy flush option to settings
2014-08-21 09:47:33 -04:00
68495c3118
make delete iptables rules process match add for specific behavior
...
no more drop all output tables, etc
2014-08-21 09:47:01 -04:00
25bc4c0a6f
add new flush transproxy interface method
2014-08-21 09:46:36 -04:00
79a32e69c8
make sure control connection is not null on rebind
...
- also tune app conflict checker code for Samsung Link
2014-08-21 09:46:00 -04:00
b307d510f8
make default SOCKs port auto, and THEN try to set specified port
...
- also remove exit IP lookup loop bad code
2014-08-21 09:45:13 -04:00
8df98f5618
update to latest jtorctl with patches for thread, error handling
2014-08-14 14:35:57 -07:00
f3a9cbd84c
User has full control over app management. BUG: Button size will render text with incorrect line breaks on devices with small screens. BUG: interface is slow to respond, but is due to the app interfacing with shared preferences.
2014-08-14 14:01:38 -07:00
67555d1ed4
User can "Proxy all" or "Proxy none" apps in AppManager. TODO: fix invert button. It currently just selects none.
2014-08-14 13:15:17 -07:00
59b333984d
Add buttons to filter application selection.
2014-08-13 17:23:33 -07:00
3698e46105
create new thread for connecting to existing process
...
don't rely on executor yet, as we need it to happen fast
2014-08-12 02:04:10 -04:00
ea37b44fa3
create new thread to just for existing process
...
dont' rely on executor there yet
2014-08-12 02:03:43 -04:00
3a82421b63
no need for asynctask - just grab the status directly
2014-08-12 02:03:22 -04:00
e2f4f5f1f2
don't make these final, because the user might change them
2014-08-12 02:02:48 -04:00
05dd3317f1
update to latest jtorctl with patches for thread, error handling
2014-08-11 16:05:08 -04:00
ade6172145
enable transproxy refresh feature, default off
2014-08-11 11:18:46 -04:00
0d424797a2
make expanded notif off by default; handle exceptions better
...
- some devices seem to not like these new expanded/remoteviews notifications, so we are turning them off by default. This will also help with load issues on onionoo servers
2014-08-11 10:10:18 -04:00
11d3f59543
reduce the onionoo lookup to just the required fields
2014-08-07 15:54:12 -04:00
3e58ee9b75
multiple fixes for status check and new transproxy calls
...
- update to the new transproxy selective calls
- improve status resume/check code
2014-08-07 15:34:16 -04:00
6955c44e36
selectively disable/enable transproxy rules
2014-08-07 15:33:57 -04:00
ac6cdb70ba
enable app conflict checker for samsung users
2014-08-07 12:42:49 -04:00
1801ec179f
don't stop Tor when service is destroyed()
2014-08-07 12:11:53 -04:00
888b7cddaa
update version to latest OpenSSL 1.0.1i
2014-08-07 11:55:27 -04:00
c517d0fcee
Notification fix and change in finding existing process
...
- Only build expanded notification on supported platforms
- If service is re-created() try to find existing process then, and don't wait for bind() from client
2014-08-07 11:54:31 -04:00
03b39eae7a
make sure to clean up ps process/shell
2014-08-05 06:14:27 -04:00
e3385ab137
fixes for Tor processs tracking, control port, and start/stop
2014-08-03 14:39:01 -04:00
803620957a
fixes for transparent proxy tethering
2014-08-02 01:15:01 -04:00
31cf9816fb
Address issues related to onionoo relay/node info lookup
...
-Ensure streams, files are closed
-Add timeout values to socket, streams
-Change torrc CircuitStreamTimeout to 120
2014-08-02 00:57:18 -04:00
7ff49ff193
update Tor binary version number
2014-07-28 21:39:12 -04:00
cbf4e99d32
handle CONNECTING state properly
2014-07-19 20:39:55 -04:00
6ed7ab0d6d
onBoot perm should default to true
2014-07-19 20:39:42 -04:00
29a06410a5
make sure start on boot works properly
2014-07-17 13:42:59 -04:00
54a39f2046
only show notifications if we have data
2014-07-16 17:07:08 -04:00
9d541d8aad
added mobile martus to rec'd apps
2014-07-16 17:06:50 -04:00
4d6c32a6a2
support dynamic SOCKS ip in polipo configuration
2014-07-15 16:10:24 -04:00
c4cf845650
handle NPE in case service disconnects
2014-07-14 13:16:19 -04:00
e1ec776cb8
re-arch status callbacks and improve notification
2014-07-14 09:19:30 -04:00
f2f076c29c
fixes for layout and notification data
...
be sure to only get the IP of the last hop (that is the exit)
2014-07-10 12:34:31 -04:00
a6da4bf530
small cleanup of asynctask and error handling
2014-07-10 11:23:49 -04:00
3bc8760beb
Merge branch 'new_notification_expanded' of github.com:amoghbl1/orbot-1 into amoghbl1-new_notification_expanded
2014-07-10 11:05:59 -04:00
8a934c9cab
don't close socket, and use HALT for shutdown
2014-07-10 11:04:21 -04:00
f9b38e6379
if service is null, please start it
2014-07-10 11:04:11 -04:00
70615d669b
fixes for status, service, binding and start/stop
2014-06-30 15:45:14 -04:00
10ceafad3b
ensure status is not set to CONNECTING incorrectly
2014-06-27 13:02:55 -04:00
7f8e9b80be
remove test/diag option
2014-06-27 13:02:41 -04:00
e13d228dfc
fix bug with wrong apps being transproxied (typo!)
2014-06-27 13:02:21 -04:00
312c6da2c7
apps should only show those with internet permission
2014-06-27 13:01:48 -04:00
bb0b7e8fe2
unbind the service when the activity is destroyed
...
we don't want leaky services
2014-06-24 10:06:26 -04:00
247e2ed86d
don't kill Tor process and make sure service is sticky
2014-06-24 10:06:11 -04:00
367002bf3d
matcher null pointer fix
2014-06-20 02:20:13 +05:30
ff8bf0bddf
moved ip lookup into asynctask and also added some extra checking before the external ip is updated
2014-06-20 02:15:13 +05:30
43eac85644
fixed merge conflicts
2014-06-20 02:01:17 +05:30
298a01e519
make sure transproxy is renabled when network returns
2014-06-19 10:30:02 -04:00
133922f7b4
updated the expanded notification ui, calls for getting exit ip implemented, exit ip added temporarily in the title of the notification till the final ui is ready. Regex to match ip address on getting response from the exit node written.
2014-06-18 06:02:23 +05:30
2eb79a5185
fulfilles the wishes of #12413 by support --default-torrc and -f
2014-06-17 16:32:49 -04:00
b6715b4d3c
fixes #12411 and #12412 enables DNS and transport by default
...
with new Orbot settings to enable user to easily change/disable
2014-06-17 15:42:54 -04:00
01299768e3
improve ability to do a full clean stop of all services
2014-06-13 13:51:51 -04:00
af51290aa9
add support for updating Polipo config
2014-06-13 13:51:28 -04:00
156ed574e8
clean up unbind process and service shutdown
2014-06-13 13:50:55 -04:00
8a59cfb6d2
use canonical paths to ensure shell commands are correct
...
also cleanup torrc updating
2014-06-13 13:00:42 -04:00
f3d21eec4f
improve resource installer ability to update torrc
2014-06-13 12:59:36 -04:00
c0f7d754dd
use one prefs instance
2014-06-13 12:59:02 -04:00
dee0d19fe7
improve logic for updating torrc files (not so often)
2014-06-11 22:04:41 -04:00
44648f16c3
clean up bind/unbind and handleIntent wizard logic
2014-06-11 22:04:15 -04:00
917ec8d7a0
update torrc and torrcdiag when you need to
2014-06-11 22:03:57 -04:00
f91a35bbac
update tor binary constants to force upgrade
2014-06-11 22:03:30 -04:00
42e069800a
don't stop tor when service onStartCommand() is called again
2014-06-11 20:24:32 -04:00
fc6392932f
ensure diag/test mode stop's Tor on activity exit
2014-06-11 20:24:21 -04:00
328c6af2c6
tune bind/create service logic
2014-06-11 20:24:08 -04:00
c2be4ac15b
ensure polipo conf is updated; default to 9051 for ctrl port
2014-06-11 11:26:30 -04:00
aa8ff95e29
ensure readers are closed; ensure socks settings are applied
2014-06-11 08:08:11 -04:00
b4fa943fe9
improve process id finding using android 'toolbox'
2014-06-11 07:51:22 -04:00
d7f3f1989d
more fixes for UI disconnect issue
...
ensure service and status updates occur on new layout updates
2014-06-11 07:07:48 -04:00
af51a98535
allow support for adding custom lines to torrc
2014-06-09 18:47:48 -04:00
22938c9ed9
multiple fixes for tor start including "auto" control port
...
also try to kill hung tor process
2014-06-09 18:35:08 -04:00
022436515d
ensure torrc values are overwritten
2014-06-09 18:34:40 -04:00
bf6a1da3fa
update state when service connects
2014-06-06 21:49:21 -04:00
451cfed0ac
keep SOCKS port as default 9050 (instead of 'auto')
2014-06-06 17:01:18 -04:00
bedeb71cf2
more fixes for hidden service configuration
...
now multiple ports are properly configured
and notification will display correctly
2014-06-06 15:05:06 -04:00
051cce472c
don't allow the tor control port socket to timeout
2014-06-06 14:40:11 -04:00
120da6bfe2
more wizard flow fixes
2014-06-06 14:19:06 -04:00
da3c95575a
fixes for tor setConf/control port
...
fixes hidden service support
manages socks port conflicts
2014-06-06 09:59:10 -04:00
93451865f8
remove unnecessary line
2014-06-06 09:59:03 -04:00
707bca4daf
amek sure wizard only is shown once on start (not twice!)
2014-06-06 08:56:32 -04:00
b6116b5d5a
switch to 0.2.4.22 version of Tor for release
2014-06-05 11:11:39 -04:00
7622d2cb2f
update constant for 1.0.1h and latest openssl vuln
...
http://ccsinjection.lepidum.co.jp/blog/2014-06-05/CCS-Injection-en/index.html
2014-06-05 10:58:36 -04:00
d3924396e3
fix bridge append value from qrcode scan
2014-06-04 23:52:37 -04:00
d6f5720f27
remove synchronized - not needed, and causing blocking
2014-06-04 23:52:28 -04:00
f52c22aa0d
Merge branch 'amoghbl1-issue_3014_wizard_workflow'
2014-06-04 23:24:43 -04:00
f6750e135a
sometimes text can be null
2014-06-04 23:24:21 -04:00
fd47e70f44
fix control port connections with socket timeouts
2014-06-04 23:24:11 -04:00
36a6349b67
status should update whether there is msg or not
2014-05-30 11:26:48 -04:00
63b43047ed
Merge branch 'issue_3014_wizard_workflow' of https://github.com/amoghbl1/orbot-1 into amoghbl1-issue_3014_wizard_workflow
2014-05-30 10:40:53 -04:00
25f6499f6b
Merge branch 'master' of github.com:n8fr8/orbot
2014-05-30 10:37:14 -04:00
c1f9296164
new work on binding and service starting
2014-05-30 10:36:03 -04:00
758633c9e6
Merge branch 'master' of https://github.com/n8fr8/orbot into new_notification_expanded
2014-05-29 05:02:08 +05:30
99dfdd711d
added styles to build the custom notification, minor tweaks to old code
2014-05-29 04:56:06 +05:30
a787fdf8cd
notification layout for the expanded notification, still in testing. Also includes integration of remote view for the big layout
2014-05-29 04:27:07 +05:30
4759d9f143
implemented button click function for the story maker button, also url added in strings, change to liking at review
2014-05-24 03:15:33 +05:30
53e82b1769
general cleanup, removed log.d's
2014-05-24 02:57:22 +05:30
6488e6a699
cleaned Permissions workflow, implemented override for back button
2014-05-24 02:55:36 +05:30
935fa91199
cleaned LotsaText workflow, implemented override for back button
2014-05-24 02:43:28 +05:30
f29a49439e
cleaned ConfigureTransProxy workflow, implemented override for back button
2014-05-24 02:38:19 +05:30
ea384f95f6
cleaned ChooseLocaleWizardActivity workflow, implemented override for back button and added toast warning message string
2014-05-24 02:31:57 +05:30
ffcfce742b
cleaned TipsAndTricks workflow
2014-05-24 02:01:36 +05:30
278997de38
simple notification of bridge settings via URL
2014-05-08 09:54:48 -04:00
17934e6b33
initial support for setting bridge through URL
2014-05-08 09:52:11 -04:00
726cf0c6c9
work to stabilize Tor background service
...
auto-restart tor binary process if killed by Android OS
print out debug info related to memory mgmt requests
move bind/start code to async task
2014-05-07 23:49:54 -04:00
ba90f73828
cleanup of notification and process kill code
2014-05-05 00:00:50 -04:00
e80c3bf162
check if installed apps are enabled
2014-05-05 00:00:01 -04:00
69614fb649
updated Tor version to 0.2.5.4-alpha
...
heartbleed blacklists for non-updated tor nodes
2014-05-04 00:38:29 -04:00
53673dae75
fix bridge/PT enable code based on bridge types
2014-05-04 00:35:14 -04:00
42d8ca1377
for some devices, the process-id is listed first
2014-05-02 14:58:47 -04:00
fd5128170a
make sure the unbind intent is not null
2014-05-02 14:58:36 -04:00
b8140191ef
improvement for network state checking code
2014-05-02 10:10:09 -04:00
0dc50cc492
add log max size feature
2014-05-02 00:39:59 -04:00
b9f14b318b
ensure setConft on control port works consistently
2014-05-02 00:39:37 -04:00
b056e7f6cd
remove debug waiter
2014-05-01 21:37:36 -04:00
cbbc5e45e1
improve how we start/stop Tor, Polipo
...
to find process id, do ps of all, then filter (most compat)
use async service for Tor start/stop instead of threads
2014-05-01 21:36:03 -04:00
144460beed
fixes for preference handling in multi process context
2014-04-25 12:44:21 -04:00
d3865c0e78
fix settings handling and add more debug output
...
also make SOCKS a runtime config
2014-04-25 12:43:30 -04:00
d5293340d5
clean up wizard context use
2014-04-25 12:42:31 -04:00
40546c9ee5
change from privoxy to polipo for http proxy
2014-04-24 23:43:33 -04:00
a4d8669cc2
fix variable name to obfsclient
2014-04-24 12:35:52 -04:00
f485015f83
install obfsclient binary
2014-04-24 12:30:23 -04:00
1295f5cd24
don't kill Tor anymore; just reconnect to running instance!
2014-04-18 06:25:35 -04:00
16f3a53529
enable diagnostics and menu option
2014-04-18 06:22:37 -04:00
4aa3cd6ea2
moved diagnotics to menu option (not launcher)
2014-04-18 06:22:10 -04:00
b870dd3c7d
limit log length for diag share
2014-04-17 13:39:49 -04:00
edd3195ec8
only show app warning if debug is on
2014-04-17 13:39:40 -04:00
78e7af4372
check if needed ports are available
...
dont' reapply transproxy on network reconnect
2014-04-17 11:34:47 -04:00
2628565b45
fix issues with per-app filtering and ipv6
2014-04-17 11:34:31 -04:00
5551c59e50
fixes to ensure service does not block
2014-04-17 10:16:56 -04:00
ae906d00ac
use 127.0.0.1 and not localhost
2014-04-17 10:16:49 -04:00
1ea5281f82
improve diagnostics apps
2014-04-17 10:16:25 -04:00
2996fb2078
ensure ipv6 packets are dropped and shell cmds exit
2014-04-17 10:16:03 -04:00
4c0d7ada8f
check for evil samsung proxy app that blocks 9050
2014-04-17 10:15:15 -04:00
37eddfcbd2
add torrcdiag file to installer
2014-04-17 10:14:57 -04:00
eab54f7af9
small fixes for service (NPE handling) and resource installer
2014-04-16 16:22:09 -04:00
e70c8aca87
add new diagnostics activity for problem childs
2014-04-16 16:21:42 -04:00
b9eeb3711b
ensure Service has foreground priority so it is not killed
...
(and improve onBind() calls to reset state if it is killed)
2014-04-15 22:31:24 -04:00
3824bc56e5
improving control port connection code
...
adding additional logging for problems with Samsungs
2014-04-15 00:47:59 -04:00
cc020f54b6
small tweaks to Tor binary startup code
2014-04-15 00:25:28 -04:00
06d5a6fc09
improve process lookup code
2014-04-15 00:24:55 -04:00
cd8b7e45db
connect to "localhost" instead of 127.0.0.1
2014-04-15 00:24:17 -04:00
4673f04f8b
update UI on rebind of service
2014-04-15 00:24:01 -04:00
c68ce2ce1e
fixes for transproxy to fix DNS leaks in some cases
...
latest RC was leaking DNS due to updates iptables/xtables binary
and need for new iptables rules format
2014-04-15 00:22:52 -04:00
3413b341fc
fixes for getting process id of Tor process
2014-04-09 22:53:08 -04:00
831a52a7e9
improved logging and exit code reporting for transproxy
2014-04-09 09:12:00 -04:00
f8532715c0
fix Service init/bind logic
...
also remove updates for background drawing to save memory
2014-04-09 09:11:38 -04:00
8445f2e55d
ensure appmgr doesn't fail on loading apps
...
also don't load icons to improve memory usage
2014-04-09 09:10:56 -04:00
60a79a2ae0
more updates to install clean-up process
2014-04-08 16:09:04 -04:00
f885059b94
fix problem with UI rotation and screen update
2014-04-08 15:46:10 -04:00
Nathan Freitas
SandroB
Jordan
amoghbl1