dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,374 Commits 2 Branches 166 Tags 156 MiB
Commit Graph

1374 Commits

Author SHA1 Message Date
Nathan Freitas d6d3c5dd79 return app name to Orbot 2015-02-02 16:19:05 -05:00
Nathan Freitas d6ea648665 update permissions 2015-02-02 16:18:50 -05:00
Nathan Freitas d63d10d8ae massive cleanup of merged code from Ony fork 
removal/comment out of LoggerFactory log system
 2015-02-02 14:01:08 -05:00
Nathan Freitas a78e458a43 Merge branch 'ony-dev' into v15-dev 2015-02-02 13:43:54 -05:00
Nathan Freitas 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
Nathan Freitas 48f40b3494 update resources for new design 2015-02-02 11:26:43 -05:00
Nathan Freitas 7c303f1589 refactoring into cleaner packages 2015-02-02 11:04:32 -05:00
Nathan Freitas ee1d54826b clean up of manifest for unused functions 2015-02-01 23:36:46 -05:00
Nathan Freitas c1fe536aeb add button handle logic 2015-02-01 23:36:19 -05:00
Nathan Freitas 753e21f367 update makefile for badvpn tun2socks 2015-02-01 23:36:07 -05:00
Nathan Freitas cf50ec1433 more tweaks to new layout 2015-02-01 23:35:57 -05:00
Nathan Freitas 6a83a0d2f6 update project and layout for v15 merged browser + VPN 2015-02-01 12:49:10 -05:00
SandroB 1464901fe3 added badvpn as local folder 2015-01-25 12:08:34 +01:00
SandroB 72a017369b delete as it should not be as subproject 2015-01-25 12:06:02 +01:00
SandroB 90db557cec clone of badvpn for dns fix 2015-01-25 12:01:00 +01:00
SandroB 1472b4e35d some missing files added to git repo 2015-01-25 11:42:15 +01:00
SandroB 21b75b4c56 vpn changes 2015-01-20 15:47:24 +01:00
Nathan Freitas 09bdd8fd29 renable the network state receiver code 2014-12-03 09:36:35 -05:00
Nathan Freitas 2f899cb680 the lead developer appears! 2014-12-03 09:36:00 -05:00
Nathan Freitas 7ee0622a5e Revert "Deleted unnecessary files." 
This reverts commit c013c071eb.
 2014-12-01 11:04:56 -05:00
Nathan Freitas 84d7f4978b updating primary manifest for Lollipop 2014-12-01 11:04:31 -05:00
Nathan Freitas 6feb32cfa9 re-enable network receiver 2014-12-01 11:03:56 -05:00
Nathan Freitas b34d971193 update for 14.1.4 2014-11-29 15:06:18 -05:00
Nathan Freitas b7fcbdc4e8 update all the manifests! 2014-11-29 00:54:33 -05:00
Nathan Freitas 68c123749e add dummy activity 2014-11-29 00:45:29 -05:00
Nathan Freitas 917cfa1932 support SDK 16, add custom theme, make Orbot singleTop activity 2014-11-29 00:44:52 -05:00
Nathan Freitas 32119c428c ignore a few more things 2014-11-29 00:44:37 -05:00
Nathan Freitas 91f4fa0e16 cleanup landscape layout 2014-11-29 00:43:18 -05:00
Nathan Freitas ad7d92fb4a clean-up / remove un-used code 2014-11-29 00:43:01 -05:00
Nathan Freitas 2d6c26a999 show exit node info in log 2014-11-29 00:42:51 -05:00
Nathan Freitas 23bc4208d0 remove unused jar depends (from old jsocks code) 2014-11-28 23:57:03 -05:00
Nathan Freitas ec9204a5f3 clean-up of code to make service more long-lived and stable 2014-11-28 23:54:04 -05:00
Nathan Freitas 695b5c32f1 removing jsocks proxy code (for VPN not needed anymore) 2014-11-28 23:53:19 -05:00
Nathan Freitas d5823e3059 updates to layout to make it cleaner 2014-11-28 23:52:57 -05:00
Nathan Freitas da4866c648 update polipo to latest head 2014-11-26 21:32:37 -05:00
Nathan Freitas ce580b1a4b update lollipop manifest 2014-11-24 23:13:14 -05:00
Nathan Freitas 1e0f640a20 adding dummyactivity to stop task/broadcast from killing foreground service 2014-11-24 23:12:53 -05:00
Nathan Freitas 88873193c2 update changelog for 14.1.3 2014-11-24 13:23:29 -05:00
Nathan Freitas c1f3e64b6b update version specific manifests 2014-11-24 13:21:31 -05:00
Nathan Freitas 87d5ac9c44 changes to improve longevity of background service/Tor process 2014-11-24 13:11:38 -05:00
Nathan Freitas 611558218d onResume() must finish before we call some APIs 2014-11-24 13:11:14 -05:00
Nathan Freitas 406d83cb50 add layout tweaks for v21 2014-11-24 13:10:56 -05:00
Nathan Freitas cf21809052 improves in start/stop logic for background service 2014-11-17 23:28:33 -05:00
Nathan Freitas e3b9dae1c5 update changelog for 14.1.1 2014-11-17 16:49:12 -05:00
Nathan Freitas ec1c92f519 updated version for lollipop 2014-11-17 16:17:22 -05:00
Nathan Freitas e389d007c3 remove unneeded imports 2014-11-17 16:06:37 -05:00
Nathan Freitas f4e7129304 update to SDK 21 2014-11-17 16:04:08 -05:00
Nathan Freitas f994c63423 add targeted manifests 2014-11-17 15:03:23 -05:00
Nathan Freitas d70a36f64d Merge branch 'build_nonPIE' 
Conflicts:
	AndroidManifest.xml
 2014-11-17 14:12:13 -05:00
Nathan Freitas 16d87310a3 make sure polipo is really cleaned; add only PIE flags for polipo 2014-11-17 14:11:17 -05:00