Commit Graph

190 Commits

Author SHA1 Message Date
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 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 6a83a0d2f6 update project and layout for v15 merged browser + VPN 2015-02-01 12:49:10 -05:00
SandroB 21b75b4c56 vpn changes 2015-01-20 15:47:24 +01:00
Nathan Freitas 84d7f4978b updating primary manifest for Lollipop 2014-12-01 11:04:31 -05:00
Nathan Freitas b7fcbdc4e8 update all the manifests! 2014-11-29 00:54:33 -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 1e0f640a20 adding dummyactivity to stop task/broadcast from killing foreground service 2014-11-24 23:12:53 -05:00
Nathan Freitas 87d5ac9c44 changes to improve longevity of background service/Tor process 2014-11-24 13:11:38 -05:00
Nathan Freitas 4df4586476 update to 14.1.1
- also add new support onboot events
2014-11-17 14:10:55 -05:00
Nathan Freitas 4559d61f8a manifest for non-PIE build 2014-11-14 11:25:18 -05:00
Nathan Freitas 5917e63693 updates for Android L and PIE binary support 2014-11-13 13:42:14 -05:00
Nathan Freitas cd22a68615 update to 15.0.0-ALPHA-1 2014-10-24 01:17:01 -04:00
Nathan Freitas 9f311a2d89 update service config to run in same process, and not use largeheap 2014-10-24 01:15:14 -04:00
Nathan Freitas e45991899a first commit of new OrbotVPN integration into Orbot 2014-10-21 12:30:13 -04:00
Nathan Freitas 5af082e9fe update to 14.0.8.1 2014-09-14 16:19:20 -04:00
Nathan Freitas 3d67ce58bb update to 14.0.8 2014-09-06 01:03:04 -04:00
Nathan Freitas d1b08ee4e8 update to 14.0.7.3 2014-08-28 23:24:38 -04:00
Nathan Freitas d2c71d7268 update to 14.0.7.2 2014-08-26 23:14:17 -04:00
Nathan Freitas c2672cc95f update to 14.0.7.1 2014-08-21 12:01:58 -04:00
Nathan Freitas 24a3db8873 update to 14.0.7 2014-08-21 09:48:44 -04:00
Nathan Freitas 56dfff0971 bumped to 14.0.6 2014-08-11 16:22:29 -04:00
Nathan Freitas 73d4297d05 bump to 14.0.5.4 2014-08-11 11:35:50 -04:00
Nathan Freitas f13269fae2 update to 14.0.5.3 2014-08-07 13:10:56 -04:00
Nathan Freitas 387e74ec7c bump to 14.0.5.2 2014-08-05 06:20:12 -04:00
Nathan Freitas 8481e6199f update to 14.0.5.1 2014-08-02 01:34:39 -04:00
Nathan Freitas 0c239b434e update to 14.0.5 2014-07-30 05:34:25 -04:00
Nathan Freitas 668ed68c10 update to 14.0.5-RC1 2014-07-28 21:40:08 -04:00
Nathan Freitas 023ef2d4ce boot receive does not need HOME category 2014-07-19 20:40:19 -04:00
Nathan Freitas 5f52092cd9 update for 14.0.5-beta-2 2014-07-17 13:57:16 -04:00
Nathan Freitas d439176fea update to 14.0.5-beta 2014-07-14 13:39:16 -04:00
Nathan Freitas 498f6472bf remove external storage perm (debug log written internally)
need to add ability to share internal file after
marking it global read
2014-07-14 09:20:09 -04:00
Nathan Freitas 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
Nathan Freitas 41064d8548 add persistent flag 2014-07-10 11:04:46 -04:00
Nathan Freitas 522f2938c7 update to 14.0.4.3 2014-06-30 15:45:57 -04:00
Nathan Freitas fbc1a87c28 update to 14.0.5-alpha 2014-06-27 13:03:21 -04:00
Nathan Freitas d56c87eaf5 update to 14.0.4.2 2014-06-24 10:11:30 -04:00
amoghbl1 43eac85644 fixed merge conflicts 2014-06-20 02:01:17 +05:30
Nathan Freitas 7ec6de72e6 update to 14.0.4.1 2014-06-19 10:30:17 -04:00
amoghbl1 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
Nathan Freitas fc608d364f update to 14.0.4 2014-06-14 05:56:46 -04:00
Nathan Freitas 9025fc52f4 update to 14.0.3.1 2014-06-11 22:04:56 -04:00
Nathan Freitas c04fc9599c update to 14.0.3 2014-06-11 20:25:05 -04:00
Nathan Freitas 00b535e7dd updated to 14.0.2.1 2014-06-11 11:27:26 -04:00
Nathan Freitas b26b9d4739 update to 14.0.2 2014-06-11 08:57:01 -04:00
Nathan Freitas 2d6a7b35c0 renable large heap request 2014-06-11 07:50:33 -04:00
Nathan Freitas 7e76162b88 bumping to 14.0.1 2014-06-09 18:48:54 -04:00
Nathan Freitas 81bd61764c updating to 14.0.0 build 100! 2014-06-07 23:10:17 -04:00
Nathan Freitas 5776a870ce update to 14.0.0-RC3 2014-06-06 21:50:00 -04:00