- tor-commits - lists.torproject.org

r24633: {projects} updating our license to include Privoxy (projects/android/trunk/Orbot)
by Nathan Freitas 16 Apr '11

16 Apr '11

Author: n8fr8 Date: 2011-04-16 13:16:49 +0000 (Sat, 16 Apr 2011) New Revision: 24633 Modified: projects/android/trunk/Orbot/LICENSE Log: updating our license to include Privoxy Modified: projects/android/trunk/Orbot/LICENSE =================================================================== --- projects/android/trunk/Orbot/LICENSE 2011-04-15 16:39:35 UTC (rev 24632) +++ projects/android/trunk/Orbot/LICENSE 2011-04-16 13:16:49 UTC (rev 24633) @@ -3,7 +3,7 @@ It also lists the licenses for other components used by Orbot. -For more information about Orbot, see http://guardianproject.info/ +For more information about Orbot, see https://guardianproject.info/apps/orbot If you got this file as a part of a larger bundle, there may be other license terms that you should be aware of. @@ -41,15 +41,21 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***** -Orbot contains a binary distribution of the JSocks library: -http://code.google.com/p/jsocks-mirror/ -which is licensed under the GNU Lesser General Public License: -http://www.gnu.org/licenses/lgpl.html +Orbot contains a binary distribution of Privoxy (http://www.privoxy.org/) +Copyright © 2001-2010 by Privoxy Developers <ijbswa-developers(a)lists.sourceforge.net> +http://www.privoxy.org/user-manual/copyright.html -***** -Orbot contains the source code for HttpProxy developed and freely licensed -by: Julian Robichaux -- http://www.nsftools.com +Some source code is based on code Copyright © 1997 by Anonymous Coders and Junkbusters, Inc. +and licensed under the GNU General Public License. +Privoxy is free software; you can redistribute it and/or modify it under the terms of the +GNU General Public License, version 2, as published by the Free Software Foundation. + +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; +without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for details. +http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + ****** Orbot contains a binary distribution of Tor: @@ -63,7 +69,6 @@ If you got this file as a part of a larger bundle, there may be other license terms that you should be aware of. - =============================================================================== Tor is distributed under this license:

1 0

[torperf/master] Add ChangeLog entry for including <arpa/inet.h>.
by karsten＠torproject.org 16 Apr '11

16 Apr '11

commit d8e30744d176167d9015d3d390c588927384bd11 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Apr 16 12:18:47 2011 +0200 Add ChangeLog entry for including <arpa/inet.h>. --- ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index d05cd70..b41f1be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ Torperf change log: Changes in version 0.0.2 - 2011-??-?? + - Include <arpa/inet.h> for the BSDs that don't get ntohl from any of + the other includes. Changes in version 0.0.1 - 2011-04-12 - Initial release

1 0

[torperf/master] (util.c): #include <arpa/inet.h> for ntohl().
by karsten＠torproject.org 16 Apr '11

16 Apr '11

commit 28061a3d049ce72ade656c9970f2cf75750af57f Author: Linus Nordberg <linus(a)nordberg.se> Date: Thu Apr 14 23:24:53 2011 +0200 (util.c): #include <arpa/inet.h> for ntohl(). The BSD's don't get ntohl from any of the other includes. --- util.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/util.c b/util.c index fdf7681..96cee0a 100644 --- a/util.c +++ b/util.c @@ -13,6 +13,7 @@ #include <sys/types.h> #include <sys/socket.h> +#include <arpa/inet.h> #include <unistd.h> #include <stdint.h> #include <assert.h>

1 0

[metrics-web/master] Simplify refresh functions a bit.
by karsten＠torproject.org 15 Apr '11

15 Apr '11

commit 3038ee939fb7690e75a9b046e6d6e3b756036d82 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Apr 15 22:23:45 2011 +0200 Simplify refresh functions a bit. --- db/tordir.sql | 128 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 64 insertions(+), 64 deletions(-) diff --git a/db/tordir.sql b/db/tordir.sql index d5238ea..ab0482e 100644 --- a/db/tordir.sql +++ b/db/tordir.sql @@ -378,25 +378,27 @@ CREATE OR REPLACE FUNCTION refresh_network_size() RETURNS INTEGER AS $$ INSERT INTO network_size (date, avg_running, avg_exit, avg_guard, avg_fast, avg_stable) - SELECT - DATE(validafter) AS date, - COUNT(*) / relay_statuses_per_day.count AS avg_running, - SUM(CASE WHEN isexit IS TRUE THEN 1 ELSE 0 END) - / relay_statuses_per_day.count AS avg_exit, - SUM(CASE WHEN isguard IS TRUE THEN 1 ELSE 0 END) - / relay_statuses_per_day.count AS avg_guard, - SUM(CASE WHEN isfast IS TRUE THEN 1 ELSE 0 END) - / relay_statuses_per_day.count AS avg_fast, - SUM(CASE WHEN isstable IS TRUE THEN 1 ELSE 0 END) - / relay_statuses_per_day.count AS avg_stable - FROM statusentry - JOIN relay_statuses_per_day - ON DATE(validafter) = relay_statuses_per_day.date - WHERE isrunning = TRUE + SELECT date, + isrunning / count AS avg_running, + isexit / count AS avg_exit, + isguard / count AS avg_guard, + isfast / count AS avg_fast, + isstable / count AS avg_stable + FROM ( + SELECT DATE(validafter) AS date, + COUNT(*) AS isrunning, + COUNT(NULLIF(isexit, FALSE)) AS isexit, + COUNT(NULLIF(isguard, FALSE)) AS isguard, + COUNT(NULLIF(isfast, FALSE)) AS isfast, + COUNT(NULLIF(isstable, FALSE)) AS isstable + FROM statusentry + WHERE isrunning = TRUE AND DATE(validafter) >= (SELECT MIN(date) FROM updates) AND DATE(validafter) <= (SELECT MAX(date) FROM updates) AND DATE(validafter) IN (SELECT date FROM updates) - GROUP BY DATE(validafter), relay_statuses_per_day.count; + GROUP BY DATE(validafter) + ) b + NATURAL JOIN relay_statuses_per_day; RETURN 1; END; @@ -412,10 +414,10 @@ CREATE OR REPLACE FUNCTION refresh_network_size_hour() RETURNS INTEGER AS $$ INSERT INTO network_size_hour (validafter, avg_running, avg_exit, avg_guard, avg_fast, avg_stable) SELECT validafter, COUNT(*) AS avg_running, - SUM(CASE WHEN isexit IS TRUE THEN 1 ELSE 0 END) AS avg_exit, - SUM(CASE WHEN isguard IS TRUE THEN 1 ELSE 0 END) AS avg_guard, - SUM(CASE WHEN isfast IS TRUE THEN 1 ELSE 0 END) AS avg_fast, - SUM(CASE WHEN isstable IS TRUE THEN 1 ELSE 0 END) AS avg_stable + COUNT(NULLIF(isexit, FALSE)) AS avg_exit, + COUNT(NULLIF(isguard, FALSE)) AS avg_guard, + COUNT(NULLIF(isfast, FALSE)) AS avg_fast, + COUNT(NULLIF(isstable, FALSE)) AS avg_stable FROM statusentry WHERE isrunning = TRUE AND DATE(validafter) >= (SELECT MIN(date) FROM updates) @@ -436,35 +438,37 @@ CREATE OR REPLACE FUNCTION refresh_relay_platforms() RETURNS INTEGER AS $$ INSERT INTO relay_platforms (date, avg_linux, avg_darwin, avg_bsd, avg_windows, avg_other) - SELECT DATE(validafter), - SUM(CASE WHEN platform LIKE '%Linux%' THEN 1 ELSE 0 END) / - relay_statuses_per_day.count AS avg_linux, - SUM(CASE WHEN platform LIKE '%Darwin%' THEN 1 ELSE 0 END) / - relay_statuses_per_day.count AS avg_darwin, - SUM(CASE WHEN platform LIKE '%BSD%' THEN 1 ELSE 0 END) / - relay_statuses_per_day.count AS avg_bsd, - SUM(CASE WHEN platform LIKE '%Windows%' THEN 1 ELSE 0 END) / - relay_statuses_per_day.count AS avg_windows, - SUM(CASE WHEN platform NOT LIKE '%Windows%' - AND platform NOT LIKE '%Darwin%' - AND platform NOT LIKE '%BSD%' - AND platform NOT LIKE '%Linux%' THEN 1 ELSE 0 END) / - relay_statuses_per_day.count AS avg_other - FROM descriptor RIGHT JOIN statusentry - ON statusentry.descriptor = descriptor.descriptor - JOIN relay_statuses_per_day - ON DATE(validafter) = relay_statuses_per_day.date - WHERE isrunning = TRUE + SELECT date, + linux / count AS avg_linux, + darwin / count AS avg_darwin, + bsd / count AS avg_bsd, + windows / count AS avg_windows, + other / count AS avg_other + FROM ( + SELECT DATE(validafter) AS date, + SUM(CASE WHEN platform LIKE '%Linux%' THEN 1 ELSE 0 END) + AS linux, + SUM(CASE WHEN platform LIKE '%Darwin%' THEN 1 ELSE 0 END) + AS darwin, + SUM(CASE WHEN platform LIKE '%BSD%' THEN 1 ELSE 0 END) + AS bsd, + SUM(CASE WHEN platform LIKE '%Windows%' THEN 1 ELSE 0 END) + AS windows, + SUM(CASE WHEN platform NOT LIKE '%Windows%' + AND platform NOT LIKE '%Darwin%' + AND platform NOT LIKE '%BSD%' + AND platform NOT LIKE '%Linux%' THEN 1 ELSE 0 END) + AS other + FROM descriptor + RIGHT JOIN statusentry + ON statusentry.descriptor = descriptor.descriptor + WHERE isrunning = TRUE AND DATE(validafter) >= (SELECT MIN(date) FROM updates) AND DATE(validafter) <= (SELECT MAX(date) FROM updates) AND DATE(validafter) IN (SELECT date FROM updates) - AND DATE(relay_statuses_per_day.date) >= - (SELECT MIN(date) FROM updates) - AND DATE(relay_statuses_per_day.date) <= - (SELECT MAX(date) FROM updates) - AND DATE(relay_statuses_per_day.date) IN - (SELECT date FROM updates) - GROUP BY DATE(validafter), relay_statuses_per_day.count; + GROUP BY DATE(validafter) + ) b + NATURAL JOIN relay_statuses_per_day; RETURN 1; END; @@ -479,24 +483,20 @@ CREATE OR REPLACE FUNCTION refresh_relay_versions() RETURNS INTEGER AS $$ INSERT INTO relay_versions (date, version, relays) - SELECT DATE(validafter), SUBSTRING(platform, 5, 5) AS version, - COUNT(*) / relay_statuses_per_day.count AS relays - FROM descriptor RIGHT JOIN statusentry - ON descriptor.descriptor = statusentry.descriptor - JOIN relay_statuses_per_day - ON DATE(validafter) = relay_statuses_per_day.date - WHERE isrunning = TRUE - AND DATE(validafter) >= (SELECT MIN(date) FROM updates) - AND DATE(validafter) <= (SELECT MAX(date) FROM updates) - AND DATE(validafter) IN (SELECT date FROM updates) - AND DATE(relay_statuses_per_day.date) >= - (SELECT MIN(date) FROM updates) - AND DATE(relay_statuses_per_day.date) <= - (SELECT MAX(date) FROM updates) - AND DATE(relay_statuses_per_day.date) IN - (SELECT date FROM updates) - AND platform IS NOT NULL - GROUP BY 1, 2, relay_statuses_per_day.count; + SELECT date, version, relays / count AS relays + FROM ( + SELECT DATE(validafter), SUBSTRING(platform, 5, 5) AS version, + COUNT(*) AS relays + FROM descriptor RIGHT JOIN statusentry + ON descriptor.descriptor = statusentry.descriptor + WHERE isrunning = TRUE + AND platform IS NOT NULL + AND DATE(validafter) >= (SELECT MIN(date) FROM updates) + AND DATE(validafter) <= (SELECT MAX(date) FROM updates) + AND DATE(validafter) IN (SELECT date FROM updates) + GROUP BY 1, 2 + ) b + NATURAL JOIN relay_statuses_per_day; RETURN 1; END;

1 0

[metrics-web/master] Remove unknown versions from graph.
by karsten＠torproject.org 15 Apr '11

15 Apr '11

commit d7fec0847540b945074d37b3f11f5a6c288445f3 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Apr 15 22:20:37 2011 +0200 Remove unknown versions from graph. --- rserve/graphs.R | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rserve/graphs.R b/rserve/graphs.R index c3d0ea3..a37f9bd 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -52,11 +52,13 @@ plot_versions <- function(start, end, path, dpi) { versions <- fetch(rs, n = -1) dbDisconnect(con) dbUnloadDriver(drv) + known_versions <- c("0.1.0", "0.1.1", "0.1.2", "0.2.0", "0.2.1", + "0.2.2", "0.2.3") + versions <- versions[versions$version %in% known_versions, ] visible_versions <- sort(unique(versions$version)) versions <- rbind(data.frame( date = as.Date(rep(end, 7)), - version = c("0.1.0", "0.1.1", "0.1.2", "0.2.0", "0.2.1", "0.2.2", - "0.2.3"), + version = known_versions, relays = rep(NA, 7)), versions) ggplot(versions, aes(x = as.Date(date, "%Y-%m-%d"), y = relays, colour = version)) +

1 0

r24632: {projects} small changes to README etc files (in projects/android/trunk/Orbot: . assets)
by Nathan Freitas 15 Apr '11

15 Apr '11

Author: n8fr8 Date: 2011-04-15 16:39:35 +0000 (Fri, 15 Apr 2011) New Revision: 24632 Removed: projects/android/trunk/Orbot/assets/privoxy.config projects/android/trunk/Orbot/assets/torrc Modified: projects/android/trunk/Orbot/.classpath projects/android/trunk/Orbot/AUTHORS projects/android/trunk/Orbot/BUILD projects/android/trunk/Orbot/CHANGELOG projects/android/trunk/Orbot/INSTALL projects/android/trunk/Orbot/TODO projects/android/trunk/Orbot/default.properties Log: small changes to README etc files Modified: projects/android/trunk/Orbot/.classpath =================================================================== --- projects/android/trunk/Orbot/.classpath 2011-04-15 16:39:22 UTC (rev 24631) +++ projects/android/trunk/Orbot/.classpath 2011-04-15 16:39:35 UTC (rev 24632) @@ -3,7 +3,6 @@ <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="gen"/> <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> - <classpathentry kind="lib" path="libs/asocks.jar"/> <classpathentry kind="lib" path="libs/jtorctrl.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: projects/android/trunk/Orbot/AUTHORS =================================================================== --- projects/android/trunk/Orbot/AUTHORS 2011-04-15 16:39:22 UTC (rev 24631) +++ projects/android/trunk/Orbot/AUTHORS 2011-04-15 16:39:35 UTC (rev 24632) @@ -1,12 +1,11 @@ This file lists the authors for Orbot, a free software project to provide anonymity on the Internet on Android smartphones. -For more information about Orbot, see http://guardianproject.info/ +For more information about Orbot, see https://guardianproject.info/apps/orbot If you got this file as a part of a larger bundle, there are probably other authors that you should be aware of. - Main Authors: ------------- Nathan Freitas <nathan(a)freitas.net> developed the primary Android @@ -17,11 +16,18 @@ and review. Most recently he has been promoted to Chief Application Resource Editor. +Derek Halliday <derek(a)guardianproject.info> has designed and implemented +new user interface components and layouts since the 1.0.4 release. + Contributors: ------------- Nick Mathewson <nickm(a)freehaven.net> wrote some of the patch code to support the compiling of Tor and Libevent on Android, and generally provided guidance in the entire effort. -Adam Langley <> made the original valiant effort to port Tor to Android. +Adam Langley made the original valiant effort to port Tor to Android. +Sathyanarayanan <gsathya.ceg(a)gmail.com> created a patch for the wizard +which updated the icon and link for the secure chat app info to point +to Gibberbot, and hopefully will continue to contribute useful patches. + Modified: projects/android/trunk/Orbot/BUILD =================================================================== --- projects/android/trunk/Orbot/BUILD 2011-04-15 16:39:22 UTC (rev 24631) +++ projects/android/trunk/Orbot/BUILD 2011-04-15 16:39:35 UTC (rev 24632) @@ -1,4 +1,8 @@ -nThis document explains how to properly build an Android package of Orbot from + +// 2011/04/15 this document is a bit out of date. We will be updating to use +// the standalone cross-compiler that is offered by the Android NDK soon + +This document explains how to properly build an Android package of Orbot from source. It covers building on Debian Lenny (5.0.3). Please install the following prerequisites (instructions for each follows): Modified: projects/android/trunk/Orbot/CHANGELOG =================================================================== --- projects/android/trunk/Orbot/CHANGELOG 2011-04-15 16:39:22 UTC (rev 24631) +++ projects/android/trunk/Orbot/CHANGELOG 2011-04-15 16:39:35 UTC (rev 24632) @@ -2,6 +2,12 @@ 1.0.5 - Removed unused Socks client code from android.net package +- Updated wizard to show link to Gibberbot (formerly OTRchat) chat app +- Bundled iptables 1.4.7 for ARM instead of relying on installed version +- Fixed various issues related to iptables, transproxying for CyanogenMod7/Android 2.3.* +- Changed how settings changed are processed through the control port (batched instead of one by one) +- Stopped app by app flushing of iptables rules, in favor of complete flush of 'nat' and 'filter' type +- removed useless log screen (logs can be viewed/retrieved using 'alogcat' 3rd party app) 1.0.4 - Added Russian, Persian, Arabic and other .po translations (see res/values-* folders) Modified: projects/android/trunk/Orbot/INSTALL =================================================================== --- projects/android/trunk/Orbot/INSTALL 2011-04-15 16:39:22 UTC (rev 24631) +++ projects/android/trunk/Orbot/INSTALL 2011-04-15 16:39:35 UTC (rev 24632) @@ -18,12 +18,13 @@ point your application to HTTP port 8118 or SOCKS port 9050 on localhost IP 127.0.0.1. -You can also set the Android system-wide HTTP proxy using the Mobile -Network APN: -Settings->Mobile networks->Access Point Names->(select your Carrier APN): +If you have root access, and a version of Android with iptables that +supports the netfilter owner module, then Orbot can setup transparent +proxying for any application. -Proxy: 127.0.0.1 -Port:8118 +Finally, Firefox on Android is available, and we have released an +add-on named ProxyMob for configuring SOCKS proxy settings for use +with the local Tor socks proxy. ** A Few Notes ** @@ -35,5 +36,5 @@ *********************************************** -/* Copyright (c) 2009-2010, Nathan Freitas, The Guardian Project +/* Copyright (c) 2009,2010,2011, Nathan Freitas, The Guardian Project * http://guardianproject.info/ */ Modified: projects/android/trunk/Orbot/TODO =================================================================== --- projects/android/trunk/Orbot/TODO 2011-04-15 16:39:22 UTC (rev 24631) +++ projects/android/trunk/Orbot/TODO 2011-04-15 16:39:35 UTC (rev 24632) @@ -1,14 +1,8 @@ -See http://bugs.noreply.org/flyspray/index.php?tasks=all&project=8 -for the latest active bug and enhancment tickets. +Current tracked tickets for Orbot can be found here: +https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=new&status=reopened&group=component&component=Orbot&order=priority -In addition, here are some other big areas that need work: +If you would like to join the project, we have some ideas for volunteering here: +http://www.torproject.org/getinvolved/volunteer.html.en#project-orbot -- Android Java UI work: Improved home screen to show better statistics about data transferred (up/down), number of circuits connected, quality of connection and so on. The "Tether Wifi" Android application is a good model to follow in how it shows a realtime count of bytes transferred as well as notifications when wifi client connect. In addition, better display/handling of Tor system/error messages would also be very helpful. Finally, the addition of a wizard or tutorial walkthrough for novice users to explain to them exactly what or what is not anonymized or protected would greatly improve the likelihood they will use Orbot correctly. - -- Android Java OS/Core app work: Better system-wide indicator either via the notification bar, "Toast" pop-up dialogs or some other indicator that an application's traffic is indeed moving through Orbot/Tor. For instance, right now you need to first go to a torcheck web service to ensure your browser is routing via Tor. Orbot should be able to notify you that circuits are being opened, used, etc. The aforementioned data transfer tracker might provide this type of awareness as well. - -- Android Java Library/Community Outreach work: We need to package a simple library for use with third-party application to easily enable them to support "Torification" on non-root devices (aka w/o transparent proxying). This library should include a wrapper for the Apache HTTPClient library, a utility class for detecting the state of Orbot connectivity, and other relevant/useful things an Android app might need to anonymize itself. This work would include the creation of the library, documentation, and sample code. Outreach or effort to implement the library within other open-source apps would follow. - -- Android OS/C/Linux work: The port of Tor to Android is basically a straight cross-compile to Linux ARM. There has been no work done in looking the optimization of Tor within a mobile hardware environment, on the ARM processor or other Android hardware, or on mobile networks. It should be noted, that even without optimization, Tor is handling the mobile network environment very well, automatically detecting change in IP addresses, reconnecting circuits, etc across switching from 2G to 3G to Wifi, and so forth. - +You can find us in IRC on FREENODE or OFTC in the #guardianproject and #tor-dev channels \ No newline at end of file Deleted: projects/android/trunk/Orbot/assets/privoxy.config =================================================================== --- projects/android/trunk/Orbot/assets/privoxy.config 2011-04-15 16:39:22 UTC (rev 24631) +++ projects/android/trunk/Orbot/assets/privoxy.config 2011-04-15 16:39:35 UTC (rev 24632) @@ -1,27 +0,0 @@ -# Generally, this file goes in /etc/privoxy/config -# -# Tor listens as a SOCKS4a proxy here: -forward-socks4a / 127.0.0.1:9050 . -confdir /data/data/org.torproject.android -logdir /data/data/org.torproject.android -# actionsfile standard # Internal purpose, recommended -#actionsfile default.action # Main actions file -#actionsfile user.action # User customizations -#filterfile default.filter - -# Don't log interesting things, only startup messages, warnings and errors -#logfile logfile -#jarfile jarfile -#debug 1 -#debug 0 # show each GET/POST/CONNECT request -#debug 4096 # Startup banner and warnings -#debug 8192 # Errors - *we highly recommended enabling this* - -#user-manual /usr/share/doc/privoxy/user-manual -listen-address 127.0.0.1:8118 -toggle 1 -accept-intercepted-requests 1 -enable-remote-toggle 0 -enable-edit-actions 0 -enable-remote-http-toggle 0 -buffer-limit 4096 \ No newline at end of file Deleted: projects/android/trunk/Orbot/assets/torrc =================================================================== --- projects/android/trunk/Orbot/assets/torrc 2011-04-15 16:39:22 UTC (rev 24631) +++ projects/android/trunk/Orbot/assets/torrc 2011-04-15 16:39:35 UTC (rev 24632) @@ -1,13 +0,0 @@ -SocksPort 9050 -TestSocks 1 -WarnUnsafeSocks 1 -Log notice stdout -DataDirectory /data/data/org.torproject.android/data -ControlPort 9051 -CookieAuthentication 1 -RelayBandwidthRate 20 KBytes -RelayBandwidthBurst 20 KBytes -UseBridges 0 -AutomapHostsOnResolve 1 -TransPort 9040 -DNSPort 5400 Modified: projects/android/trunk/Orbot/default.properties =================================================================== --- projects/android/trunk/Orbot/default.properties 2011-04-15 16:39:22 UTC (rev 24631) +++ projects/android/trunk/Orbot/default.properties 2011-04-15 16:39:35 UTC (rev 24632) @@ -10,5 +10,5 @@ # Indicates whether an apk should be generated for each density. split.density=false # Project target. -target=android-8 +target=android-4 apk-configurations=

1 0

r24631: {projects} handling settings update to stop hanging (projects/android/trunk/Orbot/src/org/torproject/android)
by Nathan Freitas 15 Apr '11

15 Apr '11

Author: n8fr8 Date: 2011-04-15 16:39:22 +0000 (Fri, 15 Apr 2011) New Revision: 24631 Modified: projects/android/trunk/Orbot/src/org/torproject/android/OnBootReceiver.java projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java Log: handling settings update to stop hanging Modified: projects/android/trunk/Orbot/src/org/torproject/android/OnBootReceiver.java =================================================================== --- projects/android/trunk/Orbot/src/org/torproject/android/OnBootReceiver.java 2011-04-15 16:38:53 UTC (rev 24630) +++ projects/android/trunk/Orbot/src/org/torproject/android/OnBootReceiver.java 2011-04-15 16:39:22 UTC (rev 24631) @@ -14,5 +14,6 @@ } + } Modified: projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java =================================================================== --- projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java 2011-04-15 16:38:53 UTC (rev 24630) +++ projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java 2011-04-15 16:39:22 UTC (rev 24631) @@ -16,6 +16,7 @@ import android.app.Activity; import android.app.AlertDialog; import android.app.NotificationManager; +import android.app.ProgressDialog; import android.content.ComponentName; import android.content.Context; import android.content.DialogInterface; @@ -44,10 +45,10 @@ { /* Useful UI bits */ - private TextView txtMessageLog = null; //the full screen log view of Tor control messages + //private TextView txtMessageLog = null; //the full screen log view of Tor control messages private TextView lblStatus = null; //the main text display widget private ImageView imgStatus = null; //the main touchable image for activating Orbot -// private ProgressDialog progressDialog; + private ProgressDialog progressDialog; private MenuItem mItemOnOff = null; /* Some tracking bits */ @@ -59,6 +60,8 @@ /* The primary interface we will be calling on the service. */ ITorService mService = null; private boolean autoStartOnBind = false; + + SharedPreferences prefs; Orbot mOrbot = null; @@ -69,9 +72,9 @@ mOrbot = this; setTheme(android.R.style.Theme_Black_NoTitleBar); - //setTitle(getString(R.string.app_name) + ' ' + getString(R.string.app_version)); - showMain(); - + + prefs = PreferenceManager.getDefaultSharedPreferences(this); + } /* @@ -93,8 +96,8 @@ mItem = menu.add(0, 7, Menu.NONE, getString(R.string.menu_verify)); mItem.setIcon(R.drawable.ic_menu_check); - mItem = menu.add(0,6, Menu.NONE, getString(R.string.menu_log)); - mItem.setIcon(R.drawable.ic_menu_reports); + // mItem = menu.add(0,6, Menu.NONE, getString(R.string.menu_log)); + // mItem.setIcon(R.drawable.ic_menu_reports); mItem = menu.add(0, 3, Menu.NONE, getString(R.string.menu_info)); mItem.setIcon(R.drawable.ic_menu_about); @@ -146,10 +149,6 @@ { showSettings(); } - else if (item.getItemId() == 6) - { - showMessageLog(); - } else if (item.getItemId() == 3) { showHelp(); @@ -193,6 +192,7 @@ * (non-Javadoc) * @see android.app.Activity#onKeyDown(int, android.view.KeyEvent) */ + /* public boolean onKeyDown(int keyCode, KeyEvent event){ if(keyCode==KeyEvent.KEYCODE_BACK){ @@ -209,7 +209,7 @@ return super.onKeyDown(keyCode, event); - } + }*/ /* (non-Javadoc) * @see android.app.Activity#onPause() @@ -306,7 +306,8 @@ protected void onResume() { super.onResume(); - + showMain(); + if (getIntent() == null) return; @@ -361,7 +362,8 @@ else { - + //setTitle(getString(R.string.app_name) + ' ' + getString(R.string.app_version)); + NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); mNotificationManager.cancelAll(); @@ -382,6 +384,7 @@ new WizardHelper(this).showWizard(); } + } } @@ -400,9 +403,6 @@ } - - - /* (non-Javadoc) * @see android.app.Activity#onStop() */ @@ -419,7 +419,7 @@ */ private void showMain () { - bindService(); //connect the UI activity to the remote service + // bindService(); //connect the UI activity to the remote service currentView = R.layout.layout_main; setContentView(currentView); @@ -458,6 +458,7 @@ /* * Show the message log UI */ + /* private void showMessageLog () { currentView = R.layout.layout_log; @@ -469,7 +470,7 @@ txtMessageLog.setText(logBuffer.toString()); - } + }*/ /* @@ -495,19 +496,17 @@ } catch (RemoteException e) { e.printStackTrace(); } + } } private void processSettings () throws RemoteException { - try { if (mService == null) return; //nothing to do if the service isn't connected yet - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - boolean useBridges = prefs.getBoolean(PREF_BRIDGES_ENABLED, false); //boolean autoUpdateBridges = prefs.getBoolean(PREF_BRIDGES_UPDATED, false); @@ -518,12 +517,10 @@ boolean enableHiddenServices = prefs.getBoolean("pref_hs_enable", false); - - boolean enableTransparentProxy = prefs.getBoolean(PREF_TRANSPARENT, false); - - + boolean enableTransparentProxy = prefs.getBoolean(PREF_TRANSPARENT, false); mService.updateTransProxy(); + String bridgeList = prefs.getString(PREF_BRIDGES_LIST,""); if (useBridges) @@ -648,11 +645,11 @@ } else { - mService.updateConfiguration("HiddenServiceDir","", false); - + mService.updateConfiguration("HiddenServiceDir","", false); } mService.saveConfiguration(); + } catch (Exception e) { @@ -665,6 +662,7 @@ } + private String getHiddenServiceHostname () { String appHome = "/data/data/" + TorServiceConstants.TOR_APP_USERNAME + "/"; @@ -709,7 +707,13 @@ { imgStatus.setImageResource(R.drawable.toron); // imgStatus.clearAnimation(); + if (progressDialog != null) + { + progressDialog.dismiss(); + progressDialog = null; + } + String lblMsg = getString(R.string.status_activated) + "\n" + torServiceMsg; lblStatus.setText(lblMsg); @@ -753,10 +757,15 @@ { imgStatus.setImageResource(R.drawable.torstarting); + if (progressDialog == null) + { + progressDialog =ProgressDialog.show(this, "", getString(R.string.status_starting_up)); + } + else + progressDialog.setMessage(torServiceMsg); + //lblStatus.setText(torServiceMsg); - lblStatus.setText(torServiceMsg); - /* int idx = torServiceMsg.indexOf("%"); @@ -774,12 +783,23 @@ imgStatus.setImageResource(R.drawable.torstopping); // imgStatus.clearAnimation(); + if (progressDialog != null) + { + progressDialog.dismiss(); + progressDialog = null; + } + lblStatus.setText(getString(R.string.status_shutting_down)); } else { + if (progressDialog != null) + { + progressDialog.dismiss(); + progressDialog = null; + } // imgStatus.clearAnimation(); @@ -953,17 +973,9 @@ break; case LOG_MSG: - - String torLogMsg = (String)msg.getData().getString(HANDLER_TOR_MSG); + //do nothing - logBuffer.append(torLogMsg); - logBuffer.append('\n'); - if (txtMessageLog != null) - { - txtMessageLog.append(torLogMsg + '\n'); - } - break; case ENABLE_TOR_MSG:

1 0

r24630: {} adding binaries to res/raw folder (in projects/android/trunk/Orbot/res: . raw)
by Nathan Freitas 15 Apr '11

15 Apr '11

Author: n8fr8 Date: 2011-04-15 16:38:53 +0000 (Fri, 15 Apr 2011) New Revision: 24630 Added: projects/android/trunk/Orbot/res/raw/ projects/android/trunk/Orbot/res/raw/busybox_g1 projects/android/trunk/Orbot/res/raw/iptables_g1 projects/android/trunk/Orbot/res/raw/iptables_n1 projects/android/trunk/Orbot/res/raw/privoxy projects/android/trunk/Orbot/res/raw/privoxy_config projects/android/trunk/Orbot/res/raw/tor projects/android/trunk/Orbot/res/raw/torrc Log: adding binaries to res/raw folder Added: projects/android/trunk/Orbot/res/raw/busybox_g1 =================================================================== (Binary files differ) Property changes on: projects/android/trunk/Orbot/res/raw/busybox_g1 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/android/trunk/Orbot/res/raw/iptables_g1 =================================================================== (Binary files differ) Property changes on: projects/android/trunk/Orbot/res/raw/iptables_g1 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/android/trunk/Orbot/res/raw/iptables_n1 =================================================================== (Binary files differ) Property changes on: projects/android/trunk/Orbot/res/raw/iptables_n1 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/android/trunk/Orbot/res/raw/privoxy =================================================================== (Binary files differ) Property changes on: projects/android/trunk/Orbot/res/raw/privoxy ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: projects/android/trunk/Orbot/res/raw/privoxy_config =================================================================== --- projects/android/trunk/Orbot/res/raw/privoxy_config (rev 0) +++ projects/android/trunk/Orbot/res/raw/privoxy_config 2011-04-15 16:38:53 UTC (rev 24630) @@ -0,0 +1,27 @@ +# Generally, this file goes in /etc/privoxy/config +# +# Tor listens as a SOCKS4a proxy here: +forward-socks4a / 127.0.0.1:9050 . +confdir /data/data/org.torproject.android +logdir /data/data/org.torproject.android +# actionsfile standard # Internal purpose, recommended +#actionsfile default.action # Main actions file +#actionsfile user.action # User customizations +#filterfile default.filter + +# Don't log interesting things, only startup messages, warnings and errors +#logfile logfile +#jarfile jarfile +#debug 1 +#debug 0 # show each GET/POST/CONNECT request +#debug 4096 # Startup banner and warnings +#debug 8192 # Errors - *we highly recommended enabling this* + +#user-manual /usr/share/doc/privoxy/user-manual +listen-address 127.0.0.1:8118 +toggle 1 +accept-intercepted-requests 1 +enable-remote-toggle 0 +enable-edit-actions 0 +enable-remote-http-toggle 0 +buffer-limit 4096 \ No newline at end of file Property changes on: projects/android/trunk/Orbot/res/raw/privoxy_config ___________________________________________________________________ Added: svn:executable + * Added: projects/android/trunk/Orbot/res/raw/tor =================================================================== (Binary files differ) Property changes on: projects/android/trunk/Orbot/res/raw/tor ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: projects/android/trunk/Orbot/res/raw/torrc =================================================================== --- projects/android/trunk/Orbot/res/raw/torrc (rev 0) +++ projects/android/trunk/Orbot/res/raw/torrc 2011-04-15 16:38:53 UTC (rev 24630) @@ -0,0 +1,12 @@ +SocksPort 9050 +SocksListenAddress 127.0.0.1 +SafeSocks 1 +Log notice stdout +ControlPort 9051 +CookieAuthentication 1 +RelayBandwidthRate 20 KBytes +RelayBandwidthBurst 20 KBytes +UseBridges 0 +AutomapHostsOnResolve 1 +TransPort 9040 +DNSPort 5400

1 0

r24629: {} new gibberbot icon for wizard (projects/android/trunk/Orbot/res/drawable)
by Nathan Freitas 15 Apr '11

15 Apr '11

Author: n8fr8 Date: 2011-04-15 16:38:19 +0000 (Fri, 15 Apr 2011) New Revision: 24629 Added: projects/android/trunk/Orbot/res/drawable/ic_launcher_gibberbot.png Log: new gibberbot icon for wizard Added: projects/android/trunk/Orbot/res/drawable/ic_launcher_gibberbot.png =================================================================== (Binary files differ) Property changes on: projects/android/trunk/Orbot/res/drawable/ic_launcher_gibberbot.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r24628: {projects} update to string for wizard with gibberbot link (in projects/android/trunk/Orbot/res: layout values values-ar values-ca values-de values-es values-fa values-mk values-nl values-pl values-ru values-zh)
by Nathan Freitas 15 Apr '11

15 Apr '11

Author: n8fr8 Date: 2011-04-15 16:37:58 +0000 (Fri, 15 Apr 2011) New Revision: 24628 Modified: projects/android/trunk/Orbot/res/layout/layout_main.xml projects/android/trunk/Orbot/res/layout/layout_wizard_tips.xml projects/android/trunk/Orbot/res/values-ar/strings.xml projects/android/trunk/Orbot/res/values-ca/strings.xml projects/android/trunk/Orbot/res/values-de/strings.xml projects/android/trunk/Orbot/res/values-es/strings.xml projects/android/trunk/Orbot/res/values-fa/strings.xml projects/android/trunk/Orbot/res/values-mk/strings.xml projects/android/trunk/Orbot/res/values-nl/strings.xml projects/android/trunk/Orbot/res/values-pl/strings.xml projects/android/trunk/Orbot/res/values-ru/strings.xml projects/android/trunk/Orbot/res/values-zh/strings.xml projects/android/trunk/Orbot/res/values/strings.xml Log: update to string for wizard with gibberbot link Modified: projects/android/trunk/Orbot/res/layout/layout_main.xml =================================================================== --- projects/android/trunk/Orbot/res/layout/layout_main.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/layout/layout_main.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -58,7 +58,7 @@ android:layout_gravity="center_horizontal" android:gravity="center_horizontal" android:textStyle="bold" - android:width="300px" + android:width="330px" android:height="75px" android:textColor="#ffffff" /> Modified: projects/android/trunk/Orbot/res/layout/layout_wizard_tips.xml =================================================================== --- projects/android/trunk/Orbot/res/layout/layout_wizard_tips.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/layout/layout_wizard_tips.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -17,7 +17,7 @@ <TextView android:text="@string/wizard_tips_msg" android:layout_gravity="left" android:textColor="#ffffff" android:id="@+id/TextView01" android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView> -<Button android:text="@string/wizard_tips_otrchat" android:layout_gravity="left" android:drawableLeft="@drawable/icon_otrchat" android:layout_marginTop="10px" android:id="@+id/WizardRootButtonInstallOtrchat" android:layout_width="wrap_content" android:layout_height="wrap_content"/> +<Button android:text="@string/wizard_tips_otrchat" android:layout_gravity="left" android:drawableLeft="@drawable/ic_launcher_gibberbot" android:layout_marginTop="10px" android:id="@+id/WizardRootButtonInstallOtrchat" android:layout_width="wrap_content" android:layout_height="wrap_content"/> <Button android:text="@string/wizard_tips_orweb" android:drawableLeft="@drawable/icon_orweb" android:layout_marginTop="10px" android:id="@+id/WizardRootButtonInstallOrweb" android:layout_width="wrap_content" android:layout_height="wrap_content"/> Modified: projects/android/trunk/Orbot/res/values/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values/strings.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/values/strings.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -94,7 +94,7 @@ <string name="wizard_tips_tricks">Orbot-enabled Apps</string> <string name="wizard_tips_msg">We encourage you to download & use apps that know how to connect directly to Orbot. Click on the buttons below to install.</string> - <string name="wizard_tips_otrchat">OTRCHAT - Secure instant messaging client for Android</string> + <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> <string name="wizard_tips_orweb">ORWEB (Android 1.x Only) - Browser designed for privacy & for Orbot</string> <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string> @@ -108,8 +108,8 @@ <string name="wizard_final">Orbot is ready!</string> <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons: journalists and bloggers, human rights workers, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string> - <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> - <string name="orweb_apk_url">https://guardianproject.info/getorweb</string> + <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> + <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>  Modified: projects/android/trunk/Orbot/res/values-ar/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-ar/strings.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/values-ar/strings.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -97,7 +97,7 @@ <string name="wizard_tips_tricks">تطبيقات مهيئة لأوربوت</string> <string name="wizard_tips_msg">نشجعكم على تحميل واستخدام التطبيقات التي تعرف كيفية الاتصال مباشرة بأوربوت. اضغط على الأزرار في الأسفل للتثبيت.</string> - <string name="wizard_tips_otrchat">OTRCHAT - عميل التراسل الفوري الآمن للأندرويد</string> + <string name="wizard_tips_otrchat">GibberBot - عميل التراسل الفوري الآمن للأندرويد</string> <string name="wizard_tips_orweb">ORWEB (أندرويد 1.x فقط) - متصفح مصمّم للخصوصية لأوربوت </string> <string name="wizard_tips_proxy">إعدادات الوكيل - تعلم كيفية تكوين التطبيقات لتعمل مع أوربوت</string> @@ -115,7 +115,7 @@ <string name="wizard_final">أوربوت جاهز!</string> <string name="wizard_final_msg">مئات الآلاف من الناس في جميع أنحاء العالم يستخدمون تور لأسباب عديدة: الصحفيين والمدونين، والعاملين في مجال حقوق الإنسان، والجنود والشركات والمواطنين من الأنظمة القمعية، والمواطنين العاديين ... والآن أنت مستعد لأن تستخدمه كذلك!</string> - <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> + <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>  Modified: projects/android/trunk/Orbot/res/values-ca/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-ca/strings.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/values-ca/strings.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -97,7 +97,7 @@ <string name="wizard_tips_tricks">Aplicacions per a usar-se amb Orbot</string> <string name="wizard_tips_msg">T\'animem a descarregar-te & utilitza aplicacions que sàpiguen com connectar-se directament a Orbot. Fes clic als botons de sota per instal·lar.</string> - <string name="wizard_tips_otrchat">OTRCHAT - Client de missatgeria instantània segura per a Android</string> + <string name="wizard_tips_otrchat">GibberBot - Client de missatgeria instantània segura per a Android</string> <string name="wizard_tips_orweb">ORWEB (Només Android 1.x) - Navegador dissenyat per la privacitat & per a Orbot</string> <string name="wizard_tips_proxy">Coniguració de Proxy - Aprèn a configurar aplicacions per a què funcionin amb Orbot</string> @@ -115,7 +115,7 @@ <string name="wizard_final">Orbot és a punt!</string> <string name="wizard_final_msg">Centenars de milers de persones arreu del món utilitzen Tor per un gran ventall de raons: periodistes i blocaires, treballadors pels drets humans, agents de l\'autoritat, soldats, corporacions, ciutadans de règims opressors, i ciutadans qualssevol... I ara tu també ho pots fer!</string> - <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> + <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>  Modified: projects/android/trunk/Orbot/res/values-de/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-de/strings.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/values-de/strings.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -97,7 +97,7 @@ <string name="wizard_tips_tricks">Programme, für die Orbot aktiviert ist</string> <string name="wizard_tips_msg">Wir raten Ihnen Programme herunterzuladen & zu nutzen, die wissen, wie sie sich direkt mit Orbot verbinden. Klicken Sie zum Installieren auf den Knopf unten.</string> - <string name="wizard_tips_otrchat">OTRCHAT - Ein sicheres Instant-Messaging-Programm für Android</string> + <string name="wizard_tips_otrchat">GibberBot - Ein sicheres Instant-Messaging-Programm für Android</string> <string name="wizard_tips_orweb">ORWEB (Nur Android 1.x) - Ein für Privatsphäre & Orbot entworfener Browser</string> <string name="wizard_tips_proxy">Proxy-Einstellungen - Lernen Sie Anwendungen so zu konfigurieren, dass sie mit Orbot zusammenarbeiten.</string> @@ -115,7 +115,7 @@ <string name="wizard_final">Orbot ist bereit!</string> <string name="wizard_final_msg">Hunderttausende Menschen auf der ganzen Welt nutzen Tor aus einer Vielzahl von Gründen: Journalisten und Blogger, Menschenrechtsaktivisten, Strafverfolgungsbehörden, Soldaten, Unternehmen, Bürger repressiver Regime und ganz normale Menschen... und sind Sie ebenfalls bereit!</string> - <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> + <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>  Modified: projects/android/trunk/Orbot/res/values-es/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-es/strings.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/values-es/strings.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -97,7 +97,7 @@ <string name="wizard_tips_tricks">Aplicaciones activas en Orbot</string> <string name="wizard_tips_msg">Le invitamos a descargar y utilizar aplicaciones que saben cómo conectarse directamente a Orbot. Haga clic en los botones a continuación para Instalar.</string> - <string name="wizard_tips_otrchat">OTRCHAT - Cliente de mensajería instantánea seguro para Android</string> + <string name="wizard_tips_otrchat">GibberBot - Cliente de mensajería instantánea seguro para Android</string> <string name="wizard_tips_orweb">ORWEB (Sólo Android 1.x) - Navegador diseñado para la privacidad y para Orbot</string> <string name="wizard_tips_proxy">Configuraciones Proxy - Aprenda cómo configurar aplicaciones para que trabajen con Orbot</string> @@ -115,7 +115,7 @@ <string name="wizard_final">¡Orbot está listo!</string> <string name="wizard_final_msg">Cientos de miles de personas alrededor del mundo usan Tor por una amplia variedad de razones: periodistas y bloggers, trabajadores de los derechos humanos, oficiales de policía, soldados, corporaciones, ciudadanos de regímenes represivos y ciudadanos ordinarios... ¡y ahora también lo estás!</string> - <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> + <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>  Modified: projects/android/trunk/Orbot/res/values-fa/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-fa/strings.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/values-fa/strings.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -95,7 +95,7 @@ <string name="wizard_tips_tricks">اپلیکیشن هایی که برای اوربات تنظیم شده اند</string> <string name="wizard_tips_msg">توصیه می کنیم داون لود و فعال کنید؛ اپلیکیشن هایی را استفاده کنید که مستقیم به اوربات وصل می شوند. دکمه های زیر را فشار دهید تا نصب شود. </string> - <string name="wizard_tips_otrchat">OTRCHAT - کاربر ایمن انتقال پیام فوری برای آندروید</string> + <string name="wizard_tips_otrchat">GibberBot - کاربر ایمن انتقال پیام فوری برای آندروید</string> <string name="wizard_tips_orweb">ORWEB (فقط آندروید 1.x) - مرورگر طراحی شده برای حفظ حریم خصوصی و افزونساز اوربات</string> <string name="wizard_tips_proxy">تنظیمات پروکسی - یادگیری تنظیم اپلیکیشن ها برای کار با اوربات</string> @@ -105,7 +105,7 @@ <string name="wizard_final">اوربات آماده استفاده میباشد!</string> <string name="wizard_final_msg">صدها هزار نفر در سراسر جهان به دلایل گوناگون از Tor استفاده می کنند: روزنامه نویسها و بلاگرها، کارکنان حقوق بشر، ماموران انتظامی، سربازان، شرکتها، شهروندان دولتهای سرکوبگر، و شهروندان عادی، و حالا شما نیز آماده استفاده از آن هستید!</string> - <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> + <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>  Modified: projects/android/trunk/Orbot/res/values-mk/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-mk/strings.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/values-mk/strings.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -95,7 +95,7 @@ <string name="wizard_tips_tricks">Орбот-вклучени апликации</string> <string name="wizard_tips_msg">Ви препорачуваме да презимате и користите апликации кои што знаат како директно да се поврзат со Орбот. Притиснете на копчињата подолу за инсталирање.</string> - <string name="wizard_tips_otrchat">OTRCHAT - Безбеден клиент за инстант-пораки за Андроид</string> + <string name="wizard_tips_otrchat">GibberBot - Безбеден клиент за инстант-пораки за Андроид</string> <string name="wizard_tips_orweb">ORWEB (само Андроид 1.x) - Браусер дизајниран за приватност и за Орбот</string> <string name="wizard_tips_proxy">Подесувања на прокси - Научете како да ги конфигурирате апликациите да работат со Орбот</string> @@ -109,7 +109,7 @@ <string name="wizard_final">Орбот е спремен!</string> <string name="wizard_final_msg">Стотици илјади луѓе низ целиот Свет го користат Тор од многу различни причини: новинари и блогери, борци за човекови права, полицајци, војници, корпорации, граѓани на репресивни режими, и обични граѓани... а сега и Вие сте спремин да го користите!</string> - <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> + <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>  Modified: projects/android/trunk/Orbot/res/values-nl/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-nl/strings.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/values-nl/strings.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -97,7 +97,7 @@ <string name="wizard_tips_tricks">Orbot-beschikbare Apps</string> <string name="wizard_tips_msg">We raden u aan om te apps te downloaden welke zich zich automatisch verbinden met Orbot. Klik op de buttons hier beneden om te installeren.</string> - <string name="wizard_tips_otrchat">OTRCHAT - Veilige instant message programma voor Android</string> + <string name="wizard_tips_otrchat">GibberBot - Veilige instant message programma voor Android</string> <string name="wizard_tips_orweb">ORWEB (Alleen Android 1.x) - Browser gemaakt voor privacy & voor Orbot</string> <string name="wizard_tips_proxy">Proxy Instellingen - Leer hoe u uw apps kunt configureren voor Orbot</string> @@ -114,7 +114,7 @@ <string name="wizard_final">Orbot is klaar!</string> <string name="wizard_final_msg">Honderdduizenden verschillende mensen over de wereld gebruiken Tor, zoals: journalisten, bloggers, mensen rechten medewerkers, soldaten, bedrijven, burgers met onderdrukte religies, en natuurlijk normale mensen... En nu bent u ook klaar om te gaan!</string> - <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> + <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>  Modified: projects/android/trunk/Orbot/res/values-pl/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-pl/strings.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/values-pl/strings.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -95,7 +95,7 @@ <string name="wizard_tips_tricks">Aplikacje skonfigurowane dla Orbota</string> <string name="wizard_tips_msg">Zachęcamy do pobierania i używania aplikacji, które wiedzą, jak łączyć się bezpośrednio z Orbotem. Kliknij na poniższe przyciski, by zainstalować.</string> - <string name="wizard_tips_otrchat">OTRCHAT - Bezpieczny klieny rozmów dla Androida</string> + <string name="wizard_tips_otrchat">GibberBot - Bezpieczny klieny rozmów dla Androida</string> <string name="wizard_tips_orweb">ORWEB (tylko Android 1.x) - Przeglądarka zaprojektowana do prywatności i dla Orbota</string> <string name="wizard_tips_proxy">Ustawienia Proxy - NDowiedz się, jak konfiguroać aplikacje do współpracy z Orbotem</string> @@ -109,7 +109,7 @@ <string name="wizard_final">Orbot jest gotowy!</string> <string name="wizard_final_msg">Setki tysięcy ludzi na całym świecie używają Tora z różnych powodów: dziennikarze i blogerzy, działacze na rzecz praw człowieka, stróże prawa, żołnierze, korporacje, obywatele represyjnych reżimów i zwykli obywatele... teraz Ty też możesz!</string> - <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> + <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>  Modified: projects/android/trunk/Orbot/res/values-ru/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-ru/strings.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/values-ru/strings.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -95,7 +95,7 @@ <string name="wizard_tips_tricks">Orbot-задействованные приложения</string> <string name="wizard_tips_msg">Мы советуем вам скачать и использовать приложения, которые умеют работать напрямую через Orbot. Нажмите на кнопки ниже, чтобы запустить процесс установки.</string> - <string name="wizard_tips_otrchat">OTRCHAT - Обезопасте обмен мгновенными сообщениями для клиентов в Android</string> + <string name="wizard_tips_otrchat">GibberBot - Обезопасте обмен мгновенными сообщениями для клиентов в Android</string> <string name="wizard_tips_orweb">ORWEB (Только для версии Android 1.x) - Браузер, разработанный для обеспечения безопасности и для Orbot</string> <string name="wizard_tips_proxy">Настройки прокси - узнайте как настроить приложения для работы с Orbot</string> @@ -109,7 +109,7 @@ <string name="wizard_final">Программа Orbot готова к использованию!</string> <string name="wizard_final_msg">Сотни тысяч людей по всему миру используют Tor по различным причинам: журналисты и блоггеры, активисты организаций, выступающих в защиту прав человека, судебные исполнители, солдаты, корпорации, граждане стран с репрессивным режимом, и простые люди... а теперь готовы и вы!</string> - <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> + <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>  Modified: projects/android/trunk/Orbot/res/values-zh/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-zh/strings.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/values-zh/strings.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -95,7 +95,7 @@ <string name="wizard_tips_tricks">可用 Orbot 的应用程序</string> <string name="wizard_tips_msg">我们建议您下载和使用能直接连接到 Orbot 的应用程序。点击以下按钮安装。</string> - <string name="wizard_tips_otrchat">OTRCHAT - Android 上的安全即时消息客户端</string> + <string name="wizard_tips_otrchat">GibberBot - Android 上的安全即时消息客户端</string> <string name="wizard_tips_orweb">ORWEB (仅 Android 1.x) - 着重隐私设计的浏览器</string> <string name="wizard_tips_proxy">代理设置 - 学习如何配置应用程序使用 Orbot</string> @@ -108,7 +108,7 @@ <string name="wizard_final">Orbot 已就绪！</string> <string name="wizard_final_msg">数以万计的各国人们因为各种原因使用 Tor：记者、人权工作者、法律工作者、士兵、公司、迫于实际情况使用的市民，当然也有普通的市民。现在你也即将成为其中的一员！</string> - <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> + <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>

1 0