April 2014 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'public/bug9841_024_v2' into bug9841_025
by nickm＠torproject.org 08 Apr '14

08 Apr '14

commit ecf61e924d5807420aaeee8620dc83f3b952d77f Merge: 745434d 8b9a2cb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 13 14:49:15 2014 -0500 Merge remote-tracking branch 'public/bug9841_024_v2' into bug9841_025 Conflicts: src/or/circuitlist.c changes/bug9841 | 7 +++ src/or/circuitlist.c | 148 +++++++++++++++++++++++++++++++++++++++++++++----- src/or/circuitlist.h | 2 + src/or/or.h | 33 ++++++----- src/or/rendmid.c | 6 +- 5 files changed, 165 insertions(+), 31 deletions(-) diff --cc src/or/circuitlist.c index 9474896,8ab673c..04cfcbf --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@@ -43,8 -42,13 +44,11 @@@ struct global_circuitlist_s global_circ /** A list of all the circuits in CIRCUIT_STATE_CHAN_WAIT. */ static smartlist_t *circuits_pending_chans = NULL; -static void circuit_free(circuit_t *circ); -static void circuit_free_cpath(crypt_path_t *cpath); static void circuit_free_cpath_node(crypt_path_t *victim); static void cpath_ref_decref(crypt_path_reference_t *cpath_ref); + //static void circuit_set_rend_token(or_circuit_t *circ, int is_rend_circ, + // const uint8_t *token); + static void circuit_clear_rend_token(or_circuit_t *circ); /********* END VARIABLES ************/ diff --cc src/or/or.h index cc4e5ed,510b8ea..7c44c7d --- a/src/or/or.h +++ b/src/or/or.h @@@ -3209,14 -3173,27 +3197,33 @@@ typedef struct or_circuit_t * exit-ward queues of this circuit; reset every time when writing * buffer stats to disk. */ uint64_t total_cell_waiting_time; + + /** Maximum cell queue size for a middle relay; this is stored per circuit + * so append_cell_to_circuit_queue() can adjust it if it changes. If set + * to zero, it is initialized to the default value. + */ + uint32_t max_middle_cells; } or_circuit_t; + typedef struct or_circuit_rendinfo_s { + + #if REND_COOKIE_LEN != DIGEST_LEN + #error "The REND_TOKEN_LEN macro assumes REND_COOKIE_LEN == DIGEST_LEN" + #endif + #define REND_TOKEN_LEN DIGEST_LEN + + /** A hash of location-hidden service's PK if purpose is INTRO_POINT, or a + * rendezvous cookie if purpose is REND_POINT_WAITING. Filled with zeroes + * otherwise. + */ + char rend_token[REND_TOKEN_LEN]; + + /** True if this is a rendezvous point circuit; false if this is an + * introduction point. */ + unsigned is_rend_circ; + + } or_circuit_rendinfo_t; + /** Convert a circuit subtype to a circuit_t. */ #define TO_CIRCUIT(x) (&((x)->base_))

1 0

[tor/master] Tweak sign of rend_token params for consistency
by nickm＠torproject.org 08 Apr '14

08 Apr '14

commit 949c9ae26b4a77baea077e7e1834bdd7264cdb37 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 13 15:24:09 2014 -0500 Tweak sign of rend_token params for consistency --- src/or/circuitlist.c | 9 +++++---- src/or/circuitlist.h | 4 ++-- src/or/rendmid.c | 8 ++++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 04cfcbf..0d41b51 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1354,21 +1354,22 @@ circuit_set_rend_token(or_circuit_t *circ, int is_rend_circ, * Return NULL if no such circuit is found. */ or_circuit_t * -circuit_get_rendezvous(const char *cookie) +circuit_get_rendezvous(const uint8_t *cookie) { return circuit_get_by_rend_token_and_purpose( CIRCUIT_PURPOSE_REND_POINT_WAITING, - 1, cookie); + 1, (const char*)cookie); } /** Return the circuit waiting for intro cells of the given digest. * Return NULL if no such circuit is found. */ or_circuit_t * -circuit_get_intro_point(const char *digest) +circuit_get_intro_point(const uint8_t *digest) { return circuit_get_by_rend_token_and_purpose( - CIRCUIT_PURPOSE_INTRO_POINT, 0, digest); + CIRCUIT_PURPOSE_INTRO_POINT, 0, + (const char *)digest); } /** Set the rendezvous cookie of <b>circ</b> to <b>cookie</b>. If another diff --git a/src/or/circuitlist.h b/src/or/circuitlist.h index f9b95da..4a916ea 100644 --- a/src/or/circuitlist.h +++ b/src/or/circuitlist.h @@ -47,8 +47,8 @@ origin_circuit_t *circuit_get_ready_rend_circ_by_rend_data( const rend_data_t *rend_data); origin_circuit_t *circuit_get_next_by_pk_and_purpose(origin_circuit_t *start, const char *digest, uint8_t purpose); -or_circuit_t *circuit_get_rendezvous(const char *cookie); -or_circuit_t *circuit_get_intro_point(const char *digest); +or_circuit_t *circuit_get_rendezvous(const uint8_t *cookie); +or_circuit_t *circuit_get_intro_point(const uint8_t *digest); void circuit_set_rendezvous_cookie(or_circuit_t *circ, const uint8_t *cookie); void circuit_set_intro_point_digest(or_circuit_t *circ, const uint8_t *digest); origin_circuit_t *circuit_find_to_cannibalize(uint8_t purpose, diff --git a/src/or/rendmid.c b/src/or/rendmid.c index 8090bf2..4f4790b 100644 --- a/src/or/rendmid.c +++ b/src/or/rendmid.c @@ -94,7 +94,7 @@ rend_mid_establish_intro(or_circuit_t *circ, const uint8_t *request, /* Close any other intro circuits with the same pk. */ c = NULL; - while ((c = circuit_get_intro_point(pk_digest))) { + while ((c = circuit_get_intro_point((const uint8_t *)pk_digest))) { log_info(LD_REND, "Replacing old circuit for service %s", safe_str(serviceid)); circuit_mark_for_close(TO_CIRCUIT(c), END_CIRC_REASON_FINISHED); @@ -165,7 +165,7 @@ rend_mid_introduce(or_circuit_t *circ, const uint8_t *request, (char*)request, REND_SERVICE_ID_LEN); /* The first 20 bytes are all we look at: they have a hash of Bob's PK. */ - intro_circ = circuit_get_intro_point((char*)request); + intro_circ = circuit_get_intro_point((const uint8_t*)request); if (!intro_circ) { log_info(LD_REND, "No intro circ found for INTRODUCE1 cell (%s) from circuit %u; " @@ -235,7 +235,7 @@ rend_mid_establish_rendezvous(or_circuit_t *circ, const uint8_t *request, goto err; } - if (circuit_get_rendezvous((char*)request)) { + if (circuit_get_rendezvous(request)) { log_warn(LD_PROTOCOL, "Duplicate rendezvous cookie in ESTABLISH_RENDEZVOUS."); goto err; @@ -299,7 +299,7 @@ rend_mid_rendezvous(or_circuit_t *circ, const uint8_t *request, "Got request for rendezvous from circuit %u to cookie %s.", (unsigned)circ->p_circ_id, hexid); - rend_circ = circuit_get_rendezvous((char*)request); + rend_circ = circuit_get_rendezvous(request); if (!rend_circ) { log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, "Rejecting RENDEZVOUS1 cell with unrecognized rendezvous cookie %s.",

1 0

[orbot/master] ensure existing binaries are removed before install
by n8fr8＠torproject.org 08 Apr '14

08 Apr '14

commit b6a9b48e779d687271ef9e43c4a2a059acf79f37 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Apr 8 11:37:45 2014 -0400 ensure existing binaries are removed before install problems may be caused by soft links or old bins --- .../android/service/TorResourceInstaller.java | 24 ++++- src/org/torproject/android/service/TorService.java | 21 ++-- .../android/service/TorServiceConstants.java | 4 +- .../android/service/TorServiceUtils.java | 106 -------------------- 4 files changed, 38 insertions(+), 117 deletions(-) diff --git a/src/org/torproject/android/service/TorResourceInstaller.java b/src/org/torproject/android/service/TorResourceInstaller.java index b1a85a7..41e899c 100644 --- a/src/org/torproject/android/service/TorResourceInstaller.java +++ b/src/org/torproject/android/service/TorResourceInstaller.java @@ -3,19 +3,21 @@ package org.torproject.android.service; -import java.io.BufferedReader; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; -import java.io.FileReader; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.util.ArrayList; +import java.util.concurrent.TimeoutException; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; +import org.sufficientlysecure.rootcommands.Shell; +import org.sufficientlysecure.rootcommands.command.SimpleCommand; import org.torproject.android.R; import org.torproject.android.TorConstants; @@ -39,7 +41,7 @@ public class TorResourceInstaller implements TorServiceConstants { /* * Extract the Tor resources from the APK file using ZIP */ - public boolean installResources () throws IOException, FileNotFoundException + public boolean installResources () throws IOException, FileNotFoundException, TimeoutException { InputStream is; @@ -48,32 +50,48 @@ public class TorResourceInstaller implements TorServiceConstants { if (!installFolder.exists()) installFolder.mkdirs(); + Shell shell = Shell.startShell(new ArrayList<String>(),installFolder.getCanonicalPath()); + is = context.getResources().openRawResource(R.raw.torrc); outFile = new File(installFolder, TORRC_ASSET_KEY); + if (outFile.exists()) + shell.add(new SimpleCommand("rm " + outFile.getCanonicalPath())).waitForFinish(); streamToFile(is,outFile, false, false); is = context.getResources().openRawResource(R.raw.torrctether); outFile = new File(installFolder, TORRC_TETHER_KEY); + if (outFile.exists()) + shell.add(new SimpleCommand("rm " + outFile.getCanonicalPath())).waitForFinish(); streamToFile(is, outFile, false, false); is = context.getResources().openRawResource(R.raw.privoxy_config); outFile = new File(installFolder, PRIVOXYCONFIG_ASSET_KEY); + if (outFile.exists()) + shell.add(new SimpleCommand("rm " + outFile.getCanonicalPath())).waitForFinish(); streamToFile(is,outFile, false, false); is = context.getResources().openRawResource(R.raw.tor); outFile = new File(installFolder, TOR_ASSET_KEY); + if (outFile.exists()) + shell.add(new SimpleCommand("rm " + outFile.getCanonicalPath())).waitForFinish(); streamToFile(is,outFile, false, true); is = context.getResources().openRawResource(R.raw.privoxy); outFile = new File(installFolder, PRIVOXY_ASSET_KEY); + if (outFile.exists()) + shell.add(new SimpleCommand("rm " + outFile.getCanonicalPath())).waitForFinish(); streamToFile(is,outFile, false, true); is = context.getResources().openRawResource(R.raw.obfsproxy); outFile = new File(installFolder, OBFSPROXY_ASSET_KEY); + if (outFile.exists()) + shell.add(new SimpleCommand("rm " + outFile.getCanonicalPath())).waitForFinish(); streamToFile(is,outFile, false, true); is = context.getResources().openRawResource(R.raw.xtables); outFile = new File(installFolder, IPTABLES_ASSET_KEY); + if (outFile.exists()) + shell.add(new SimpleCommand("rm " + outFile.getCanonicalPath())).waitForFinish(); streamToFile(is,outFile, false, true); return true; diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index fc49df1..471d35b 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -25,7 +25,6 @@ import net.freehaven.tor.control.ConfigEntry; import net.freehaven.tor.control.EventHandler; import net.freehaven.tor.control.TorControlConnection; -import org.sufficientlysecure.rootcommands.RootCommands; import org.sufficientlysecure.rootcommands.Shell; import org.sufficientlysecure.rootcommands.Toolbox; import org.sufficientlysecure.rootcommands.command.SimpleCommand; @@ -55,7 +54,6 @@ import android.os.RemoteException; import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat.Builder; import android.util.Log; -import android.widget.Toast; public class TorService extends Service implements TorServiceConstants, TorConstants, Runnable, EventHandler { @@ -528,7 +526,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst TorResourceInstaller installer = new TorResourceInstaller(this, appBinHome); boolean success = installer.installResources(); - prefs.edit().putString(PREF_BINARY_TOR_VERSION_INSTALLED,BINARY_TOR_VERSION).commit(); + if (success) + prefs.edit().putString(PREF_BINARY_TOR_VERSION_INSTALLED,BINARY_TOR_VERSION).commit(); } else if (!fileTorRc.exists()) { @@ -537,7 +536,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst TorResourceInstaller installer = new TorResourceInstaller(this, appBinHome); boolean success = installer.installResources(); - prefs.edit().putString(PREF_BINARY_TOR_VERSION_INSTALLED,BINARY_TOR_VERSION).commit(); + if (success) + prefs.edit().putString(PREF_BINARY_TOR_VERSION_INSTALLED,BINARY_TOR_VERSION).commit(); } @@ -556,7 +556,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (!fileBin.canExecute()) { logNotice("(re)Setting permission on binary: " + fileBin.getCanonicalPath()); - Shell shell = Shell.startShell(new ArrayList<String>(), appBinHome.getAbsolutePath()); + Shell shell = Shell.startShell(new ArrayList<String>(), appBinHome.getCanonicalPath()); shell.add(new SimpleCommand("chmod " + CHMOD_EXE_VALUE + ' ' + fileBin.getCanonicalPath())).waitForFinish(); @@ -588,7 +588,16 @@ public class TorService extends Service implements TorServiceConstants, TorConst public void initTor () throws Exception { - initBinaries(); + try + { + initBinaries(); + } + catch (IOException e) + { + logNotice("There was a problem installing the Tor binaries: " + e.getLocalizedMessage()); + Log.d(TAG,"error installing binaries",e); + return; + } updateSettings (); diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index db73e70..b1c9945 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -46,7 +46,7 @@ public interface TorServiceConstants { public final static String CHMOD_EXE_VALUE = "770"; - public final static int FILE_WRITE_BUFFER_SIZE = 2048; + public final static int FILE_WRITE_BUFFER_SIZE = 1024; //HTTP Proxy server port public final static int PORT_HTTP = 8118; //just like Privoxy! @@ -80,7 +80,7 @@ public interface TorServiceConstants { public static final int DISABLE_TOR_MSG = 3; public static final int LOG_MSG = 4; - public static final String BINARY_TOR_VERSION = "0.2.4.21-openssl1.0.1g"; + public static final String BINARY_TOR_VERSION = "0.2.4.21-openssl1.0.1g-installfix"; public static final String BINARY_PRIVOXY_VERSION = "3.0.12"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INTALLED"; public static final String PREF_BINARY_PRIVOXY_VERSION_INSTALLED = "BINARY_PRIVOXY_VERSION_INTALLED"; diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java index e5cf25e..96a2c8a 100644 --- a/src/org/torproject/android/service/TorServiceUtils.java +++ b/src/org/torproject/android/service/TorServiceUtils.java @@ -117,110 +117,4 @@ public class TorServiceUtils implements TorServiceConstants { return procId; } - - /** - public static int doShellCommand(String[] cmds, StringBuilder log, boolean runAsRoot, boolean waitFor) throws Exception - { - - Process proc = null; - int exitCode = -1; - - if (runAsRoot) - proc = Runtime.getRuntime().exec("su"); - else - proc = Runtime.getRuntime().exec("sh"); - - OutputStreamWriter out = new OutputStreamWriter(proc.getOutputStream()); - - for (int i = 0; i < cmds.length; i++) - { - if (TorService.ENABLE_DEBUG_LOG) - Log.d(TorService.TAG,"executing shell cmd: " + cmds[i] + "; runAsRoot=" + runAsRoot + ";waitFor=" + waitFor); - - out.write(cmds[i]); - out.write("\n"); - } - - out.flush(); - out.write("exit\n"); - out.flush(); - - if (waitFor) - { - - final char buf[] = new char[10]; - - // Consume the "stdout" - InputStreamReader reader = new InputStreamReader(proc.getInputStream()); - int read=0; - while ((read=reader.read(buf)) != -1) { - if (log != null) log.append(buf, 0, read); - } - - // Consume the "stderr" - reader = new InputStreamReader(proc.getErrorStream()); - read=0; - while ((read=reader.read(buf)) != -1) { - if (log != null) log.append(buf, 0, read); - } - - exitCode = proc.waitFor(); - - } - - - return exitCode; - - } - - public static int doShellCommand(String cmd, StringBuilder log, boolean runAsRoot, boolean waitFor) throws Exception - { - - Process proc = null; - int exitCode = -1; - - if (runAsRoot) - proc = Runtime.getRuntime().exec("su"); - else - proc = Runtime.getRuntime().exec("sh"); - - OutputStreamWriter out = new OutputStreamWriter(proc.getOutputStream()); - - // TorService.logMessage("executing shell cmd: " + cmds[i] + "; runAsRoot=" + runAsRoot + ";waitFor=" + waitFor); - - out.write(cmd); - out.write("\n"); - - - out.flush(); - out.write("exit\n"); - out.flush(); - - if (waitFor) - { - - final char buf[] = new char[10]; - - // Consume the "stdout" - InputStreamReader reader = new InputStreamReader(proc.getInputStream()); - int read=0; - while ((read=reader.read(buf)) != -1) { - if (log != null) log.append(buf, 0, read); - } - - // Consume the "stderr" - reader = new InputStreamReader(proc.getErrorStream()); - read=0; - while ((read=reader.read(buf)) != -1) { - if (log != null) log.append(buf, 0, read); - } - - exitCode = proc.waitFor(); - - } - - return exitCode; - - } - **/ }

1 0

[orbot/master] fix large icon incorrect display in alert dialogs
by n8fr8＠torproject.org 08 Apr '14

08 Apr '14

commit ef14ac5c3ee8a989dc7b2419708fde7154b503a7 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Apr 8 11:37:18 2014 -0400 fix large icon incorrect display in alert dialogs --- src/org/torproject/android/Orbot.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index d18cd07..c84dced 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -632,7 +632,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic else { AlertDialog aDialog = new AlertDialog.Builder(Orbot.this) - .setIcon(R.drawable.onion) + .setIcon(R.drawable.onion32) .setTitle(R.string.install_apps_) .setMessage(R.string.it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_) .setPositiveButton(android.R.string.ok, new OnClickListener () @@ -759,7 +759,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic if (button) { aDialog = new AlertDialog.Builder(Orbot.this) - .setIcon(R.drawable.onion) + .setIcon(R.drawable.onion32) .setTitle(title) .setMessage(msg) .setPositiveButton(android.R.string.ok, null) @@ -768,7 +768,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic else { aDialog = new AlertDialog.Builder(Orbot.this) - .setIcon(R.drawable.onion) + .setIcon(R.drawable.onion32) .setTitle(title) .setMessage(msg) .show();

1 0

[orbot/master] small fixes for the wizard with new UI
by n8fr8＠torproject.org 08 Apr '14

08 Apr '14

commit bab67b7c131915273df1987b237407a2bec2b05d Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Apr 8 11:36:59 2014 -0400 small fixes for the wizard with new UI --- res/layout/layout_wizard_locale.xml | 2 +- res/layout/layout_wizard_root.xml | 20 +----------- res/layout/layout_wizard_tips.xml | 33 +------------------- res/layout/scrollingtext_buttons_view.xml | 33 -------------------- .../android/wizard/ConfigureTransProxy.java | 4 +-- src/org/torproject/android/wizard/LotsaText.java | 14 +++------ src/org/torproject/android/wizard/Permissions.java | 12 ++----- .../torproject/android/wizard/TipsAndTricks.java | 15 +++------ 8 files changed, 17 insertions(+), 116 deletions(-) diff --git a/res/layout/layout_wizard_locale.xml b/res/layout/layout_wizard_locale.xml index 1918f56..ae3aecb 100644 --- a/res/layout/layout_wizard_locale.xml +++ b/res/layout/layout_wizard_locale.xml @@ -14,7 +14,7 @@ android:textColor="#FFFFFF" android:layout_alignParentTop="true" android:layout_height="wrap_content" - android:id="@+id/WizardTextTitle" + android:id="@+id/WizardLocaleTitle" android:layout_width="wrap_content" android:fadingEdge="vertical" android:text="@string/wizard_locale_title" diff --git a/res/layout/layout_wizard_root.xml b/res/layout/layout_wizard_root.xml index 7e230a6..cdda4f4 100644 --- a/res/layout/layout_wizard_root.xml +++ b/res/layout/layout_wizard_root.xml @@ -4,25 +4,7 @@ android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent"> - -<RelativeLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:id="@+id/relativeLayout1" - android:layout_gravity="center_horizontal" - android:background="#000000"> - <TextView android:textSize="10pt" - android:textColor="#FFFFFF" - android:layout_alignParentTop="true" - android:layout_height="wrap_content" - android:id="@+id/WizardTextTitle" - android:layout_width="wrap_content" - android:fadingEdge="vertical" - android:text="TITLE" - android:singleLine="true" - android:padding="20px" android:layout_centerInParent="true"> - </TextView> - </RelativeLayout> + <TableLayout android:id="@+id/TableLayout01" android:stretchColumns="*" android:layout_height="fill_parent" android:layout_width="wrap_content"> <TableRow android:layout_margin="10dip" android:id="@+id/TableRow01" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="fill_parent"> diff --git a/res/layout/layout_wizard_tips.xml b/res/layout/layout_wizard_tips.xml index 98b7196..5129935 100644 --- a/res/layout/layout_wizard_tips.xml +++ b/res/layout/layout_wizard_tips.xml @@ -5,38 +5,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent"> - -<RelativeLayout - android:layout_width="fill_parent" - android:layout_height="70sp" - android:id="@+id/relativeLayout1" - android:layout_gravity="center_vertical|center_horizontal" - android:background="#000000" - > - <ImageView - android:src="@drawable/warning" - android:id="@+id/orbot_image" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:paddingLeft="20sp" > - </ImageView> - <TextView - android:textColor="#FFFFFF" - android:textSize="10pt" - android:layout_toRightOf="@id/orbot_image" - android:gravity="center_vertical" - android:layout_height="fill_parent" - android:id="@+id/WizardTextTitle" - android:layout_width="wrap_content" - android:fadingEdge="vertical" - android:text="TITLE" - android:singleLine="true" - android:layout_centerInParent="true" - android:paddingLeft="5sp" - > - </TextView> - </RelativeLayout> + <TableLayout android:id="@+id/TableLayout01" android:stretchColumns="*" android:layout_height="fill_parent" android:layout_width="wrap_content"> <TableRow android:layout_margin="10dip" android:id="@+id/TableRow01" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="fill_parent"> diff --git a/res/layout/scrollingtext_buttons_view.xml b/res/layout/scrollingtext_buttons_view.xml index 9a879b7..beea00a 100644 --- a/res/layout/scrollingtext_buttons_view.xml +++ b/res/layout/scrollingtext_buttons_view.xml @@ -6,40 +6,7 @@ android:layout_height="fill_parent" > -<RelativeLayout - android:id="@+id/relativeLayout1" - android:layout_width="fill_parent" - android:layout_height="70sp" - android:layout_gravity="center_vertical|center_horizontal" - android:background="#000000" > - - <ImageView - android:id="@+id/orbot_image" - android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:paddingLeft="40sp" - android:src="@drawable/warning" - android:gravity="center_vertical" - - > - - </ImageView> - - <TextView - android:id="@+id/WizardTextTitle" - android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:layout_alignParentTop="true" - android:layout_centerHorizontal="true" - android:fadingEdge="vertical" - android:gravity="center_vertical" - android:paddingLeft="5sp" - android:singleLine="true" - android:text="TITLE" - android:textColor="#FFFFFF" - android:textSize="20dp" /> - </RelativeLayout> <TableLayout android:id="@+id/TableLayout01" android:stretchColumns="*" android:layout_height="fill_parent" android:layout_width="wrap_content" > diff --git a/src/org/torproject/android/wizard/ConfigureTransProxy.java b/src/org/torproject/android/wizard/ConfigureTransProxy.java index 974c968..856fd0f 100644 --- a/src/org/torproject/android/wizard/ConfigureTransProxy.java +++ b/src/org/torproject/android/wizard/ConfigureTransProxy.java @@ -108,8 +108,8 @@ public class ConfigureTransProxy extends Activity implements TorConstants { private void stepSix(){ String title = context.getString(R.string.wizard_transproxy_title); - TextView txtTitle = ((TextView)findViewById(R.id.WizardTextTitle)); - txtTitle.setText(title); + + setTitle(title); Button back = ((Button)findViewById(R.id.btnWizard1)); Button next = ((Button)findViewById(R.id.btnWizard2)); diff --git a/src/org/torproject/android/wizard/LotsaText.java b/src/org/torproject/android/wizard/LotsaText.java index 2bff373..b831cca 100644 --- a/src/org/torproject/android/wizard/LotsaText.java +++ b/src/org/torproject/android/wizard/LotsaText.java @@ -14,6 +14,7 @@ import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.os.Bundle; import android.preference.PreferenceManager; +import android.support.v4.app.ActivityCompat; import android.view.View; import android.widget.Button; import android.widget.ImageView; @@ -80,18 +81,15 @@ public class LotsaText extends Activity implements TorConstants{ String title = context.getString(R.string.wizard_title); String msg = context.getString(R.string.wizard_title_msg); - TextView txtTitle = ((TextView)findViewById(R.id.WizardTextTitle)); - txtTitle.setText(title); + setTitle(title); TextView txtBody = ((TextView)findViewById(R.id.WizardTextBody)); txtBody.setText(msg); Button btn1 = ((Button)findViewById(R.id.btnWizard1)); Button btn2 = ((Button)findViewById(R.id.btnWizard2)); - ImageView img = (ImageView) findViewById(R.id.orbot_image); btn1.setVisibility(Button.INVISIBLE); - img.setImageResource(R.drawable.tor); btn2.setOnClickListener(new View.OnClickListener() { @@ -114,18 +112,16 @@ public class LotsaText extends Activity implements TorConstants{ String title = context.getString(R.string.wizard_warning_title); String msg = context.getString(R.string.wizard_warning_msg); - TextView txtTitle = ((TextView)findViewById(R.id.WizardTextTitle)); - txtTitle.setText(title); - + setTitle(title); + TextView txtBody = ((TextView)findViewById(R.id.WizardTextBody)); txtBody.setText(msg); Button btn1 = ((Button)findViewById(R.id.btnWizard1)); Button btn2 = ((Button)findViewById(R.id.btnWizard2)); - ImageView img = (ImageView) findViewById(R.id.orbot_image); btn1.setVisibility(Button.VISIBLE); - img.setImageResource(R.drawable.warning); + btn1.setOnClickListener(new View.OnClickListener() { diff --git a/src/org/torproject/android/wizard/Permissions.java b/src/org/torproject/android/wizard/Permissions.java index dd4a217..0b876b6 100644 --- a/src/org/torproject/android/wizard/Permissions.java +++ b/src/org/torproject/android/wizard/Permissions.java @@ -63,13 +63,9 @@ public class Permissions extends Activity implements TorConstants { private void stepFourRoot(){ - String title = context.getString(R.string.wizard_permissions_title); String msg1 = context.getString(R.string.wizard_permissions_root_msg1); String msg2 = context.getString(R.string.wizard_permissions_root_msg2); - TextView txtTitle = ((TextView)findViewById(R.id.WizardTextTitle)); - txtTitle.setText(title); - TextView txtBody1 = ((TextView)findViewById(R.id.WizardTextBody1)); txtBody1.setText(msg1); @@ -174,9 +170,8 @@ public class Permissions extends Activity implements TorConstants { String title = context.getString(R.string.wizard_permissions_title); String msg = context.getString(R.string.wizard_permissions_no_root_msg); - TextView txtTitle = ((TextView)findViewById(R.id.WizardTextTitle)); - txtTitle.setText(title); - + setTitle(title); + TextView txtBody = ((TextView)findViewById(R.id.WizardTextBody1)); txtBody.setText(msg); @@ -184,9 +179,6 @@ public class Permissions extends Activity implements TorConstants { Button btn2 = ((Button)findViewById(R.id.btnWizard2)); btn2.setEnabled(true); - ImageView img = (ImageView) findViewById(R.id.orbot_image); - img.setImageResource(R.drawable.warning); - TextView txtBody2 = ((TextView)findViewById(R.id.WizardTextBody2)); txtBody2.setVisibility(TextView.GONE); diff --git a/src/org/torproject/android/wizard/TipsAndTricks.java b/src/org/torproject/android/wizard/TipsAndTricks.java index 66b08d6..7b32ec3 100644 --- a/src/org/torproject/android/wizard/TipsAndTricks.java +++ b/src/org/torproject/android/wizard/TipsAndTricks.java @@ -62,13 +62,10 @@ public class TipsAndTricks extends Activity implements TorConstants { void stepFive(){ + String title = getString(R.string.wizard_tips_title); - TextView txtTitle = ((TextView)findViewById(R.id.WizardTextTitle)); - txtTitle.setText(title); - - ImageView img = (ImageView) findViewById(R.id.orbot_image); - img.setImageResource(R.drawable.onion); - + + setTitle(title); Button btnLink = (Button)findViewById(R.id.WizardRootButtonInstallGibberbot); @@ -171,19 +168,17 @@ public class TipsAndTricks extends Activity implements TorConstants { String title = getString(R.string.wizard_final); String msg = getString(R.string.wizard_final_msg); - TextView txtTitle = ((TextView)findViewById(R.id.WizardTextTitle)); - txtTitle.setText(title); + setTitle(title); TextView txtBody = ((TextView)findViewById(R.id.WizardTextBody)); txtBody.setText(msg); Button btn1 = ((Button)findViewById(R.id.btnWizard1)); Button btn2 = ((Button)findViewById(R.id.btnWizard2)); - ImageView img = (ImageView) findViewById(R.id.orbot_image); + btn2.setText(getString(R.string.btn_finish)); btn1.setVisibility(Button.VISIBLE); - img.setImageResource(R.drawable.onion); btn1.setOnClickListener(new View.OnClickListener() {

1 0

[orbot/master] updated to dark icon
by n8fr8＠torproject.org 08 Apr '14

08 Apr '14

commit 9d1311c3427387945b38189a4851c3c82f378e7d Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Apr 8 10:46:11 2014 -0400 updated to dark icon --- web_hi_res_512_dark.png | Bin 0 -> 187867 bytes web_hi_res_512_dark.xcf | Bin 0 -> 671813 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web_hi_res_512_dark.png b/web_hi_res_512_dark.png new file mode 100644 index 0000000..d9b109e Binary files /dev/null and b/web_hi_res_512_dark.png differ diff --git a/web_hi_res_512_dark.xcf b/web_hi_res_512_dark.xcf new file mode 100644 index 0000000..3e2fe58 Binary files /dev/null and b/web_hi_res_512_dark.xcf differ

1 0

[orbot/master] updates for icons, backgrounds and improved drawing
by n8fr8＠torproject.org 08 Apr '14

08 Apr '14

commit 3d1f3912eaa1b4602a82ce59b4e95d011adad265 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Apr 8 10:46:52 2014 -0400 updates for icons, backgrounds and improved drawing code to solve issues related to outofmemory --- res/drawable/ic_launcher.png | Bin 8751 -> 0 bytes res/drawable/icon.png | Bin 7036 -> 0 bytes res/drawable/onion.png | Bin 93700 -> 77446 bytes res/drawable/onionrootonly.png | Bin 129702 -> 97350 bytes res/drawable/onionrootonlygold.png | Bin 132042 -> 97365 bytes res/drawable/onionrootonlygrey.png | Bin 129862 -> 97377 bytes res/drawable/onionroots.png | Bin 178600 -> 91020 bytes res/drawable/toroff.png | Bin 67176 -> 63700 bytes res/drawable/toron.png | Bin 109520 -> 93076 bytes res/drawable/torstarting.png | Bin 68493 -> 53619 bytes res/layout/layout_wizard_permissions.xml | 33 -------- res/values/strings.xml | 2 + src/org/torproject/android/Orbot.java | 83 ++++++++++---------- .../torproject/android/wizard/TipsAndTricks.java | 4 +- 14 files changed, 46 insertions(+), 76 deletions(-) diff --git a/res/drawable/ic_launcher.png b/res/drawable/ic_launcher.png deleted file mode 100644 index 05980b5..0000000 Binary files a/res/drawable/ic_launcher.png and /dev/null differ diff --git a/res/drawable/icon.png b/res/drawable/icon.png deleted file mode 100644 index 9e0ed2f..0000000 Binary files a/res/drawable/icon.png and /dev/null differ diff --git a/res/drawable/onion.png b/res/drawable/onion.png index 80e3f94..cf7cd50 100644 Binary files a/res/drawable/onion.png and b/res/drawable/onion.png differ diff --git a/res/drawable/onionrootonly.png b/res/drawable/onionrootonly.png index aac8d01..dcd4116 100644 Binary files a/res/drawable/onionrootonly.png and b/res/drawable/onionrootonly.png differ diff --git a/res/drawable/onionrootonlygold.png b/res/drawable/onionrootonlygold.png index 544aecb..8f80ece 100644 Binary files a/res/drawable/onionrootonlygold.png and b/res/drawable/onionrootonlygold.png differ diff --git a/res/drawable/onionrootonlygrey.png b/res/drawable/onionrootonlygrey.png index 0524f9e..9f89a06 100644 Binary files a/res/drawable/onionrootonlygrey.png and b/res/drawable/onionrootonlygrey.png differ diff --git a/res/drawable/onionroots.png b/res/drawable/onionroots.png index cb80633..10f6327 100644 Binary files a/res/drawable/onionroots.png and b/res/drawable/onionroots.png differ diff --git a/res/drawable/toroff.png b/res/drawable/toroff.png index 4dceca3..4b23e0b 100644 Binary files a/res/drawable/toroff.png and b/res/drawable/toroff.png differ diff --git a/res/drawable/toron.png b/res/drawable/toron.png index 9d338d8..2a0fc65 100644 Binary files a/res/drawable/toron.png and b/res/drawable/toron.png differ diff --git a/res/drawable/torstarting.png b/res/drawable/torstarting.png index a7aae1e..e98c067 100644 Binary files a/res/drawable/torstarting.png and b/res/drawable/torstarting.png differ diff --git a/res/layout/layout_wizard_permissions.xml b/res/layout/layout_wizard_permissions.xml index b61a1f8..5e3b1ed 100644 --- a/res/layout/layout_wizard_permissions.xml +++ b/res/layout/layout_wizard_permissions.xml @@ -5,39 +5,6 @@ android:layout_width="fill_parent" android:layout_height="fill_parent"> -<RelativeLayout - android:layout_width="fill_parent" - android:layout_height="70sp" - android:id="@+id/relativeLayout1" - android:layout_gravity="center_vertical|center_horizontal" - android:background="#000000" - > - <ImageView - android:src="@drawable/icon" - android:id="@+id/orbot_image" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:paddingLeft="20sp" - android:paddingTop="10sp" > - - </ImageView> - - <TextView - android:id="@+id/WizardTextTitle" - android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:layout_alignParentTop="true" - android:layout_centerHorizontal="true" - android:fadingEdge="vertical" - android:gravity="center_vertical" - android:paddingLeft="5sp" - android:singleLine="true" - android:text="TITLE" - android:textColor="#FFFFFF" - android:textSize="10pt" /> - - </RelativeLayout> <TableLayout android:id="@+id/TableLayout01" android:stretchColumns="*" android:layout_height="fill_parent" android:layout_width="wrap_content"> diff --git a/res/values/strings.xml b/res/values/strings.xml index f6ee084..94e9d36 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -247,5 +247,7 @@ <string name="permission_manage_tor_label">Manage Tor</string> <string name="permission_manage_tor_description">Enable this app to control the Tor service</string> + <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">It doesn\'t seem like you have Orweb installed. Want help with that, or should we just open the browser?</string> + <string name="install_apps_">Install apps?</string> </resources> diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 14a865f..d18cd07 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -632,9 +632,9 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic else { AlertDialog aDialog = new AlertDialog.Builder(Orbot.this) - .setIcon(R.drawable.icon) - .setTitle("Install apps?") - .setMessage("It doesn't seem like you have Orweb installed. Want help with that, or should we just open the browser?") + .setIcon(R.drawable.onion) + .setTitle(R.string.install_apps_) + .setMessage(R.string.it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_) .setPositiveButton(android.R.string.ok, new OnClickListener () { @@ -759,7 +759,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic if (button) { aDialog = new AlertDialog.Builder(Orbot.this) - .setIcon(R.drawable.icon) + .setIcon(R.drawable.onion) .setTitle(title) .setMessage(msg) .setPositiveButton(android.R.string.ok, null) @@ -768,7 +768,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic else { aDialog = new AlertDialog.Builder(Orbot.this) - .setIcon(R.drawable.icon) + .setIcon(R.drawable.onion) .setTitle(title) .setMessage(msg) .show(); @@ -785,28 +785,32 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic { try { + int newTorStatus = -1; + //if the serivce is bound, query it for the curren status value (int) if (mService != null) - torStatus = mService.getStatus(); + newTorStatus = mService.getStatus(); //now update the layout_main UI based on the status if (imgStatus != null) { - if (torStatus == TorServiceConstants.STATUS_ON) + if (newTorStatus == TorServiceConstants.STATUS_ON) { - imgStatus.setImageResource(R.drawable.toron); - - mViewMain.setBackgroundResource(R.drawable.onionrootonly); - // hideProgressDialog(); - - String lblMsg = getString(R.string.status_activated); - - lblStatus.setText(lblMsg); + if (torStatus != newTorStatus) + { + imgStatus.setImageResource(R.drawable.toron); + mViewMain.setBackgroundResource(R.drawable.onionrootonly); + String lblMsg = getString(R.string.status_activated); + lblStatus.setText(lblMsg); + + if (mItemOnOff != null) + mItemOnOff.setTitle(R.string.menu_stop); + + } if (torServiceMsg != null && torServiceMsg.length() > 0) { - // showAlert("Update", torServiceMsg,xte appendLogTextAndScroll(torServiceMsg); } @@ -825,9 +829,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } - if (mItemOnOff != null) - mItemOnOff.setTitle(R.string.menu_stop); - if (autoStartFromIntent) { @@ -836,38 +837,38 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } } - else if (torStatus == TorServiceConstants.STATUS_CONNECTING) + else if (newTorStatus == TorServiceConstants.STATUS_CONNECTING) { - + if (torStatus != newTorStatus) + { imgStatus.setImageResource(R.drawable.torstarting); - mViewMain.setBackgroundResource(R.drawable.onionrootonlygold); - - if (lblStatus != null && torServiceMsg != null) - if (torServiceMsg.indexOf('%')!=-1) - lblStatus.setText(torServiceMsg); - - appendLogTextAndScroll(torServiceMsg); - + if (mItemOnOff != null) mItemOnOff.setTitle(R.string.menu_stop); + } + + if (lblStatus != null && torServiceMsg != null) + if (torServiceMsg.indexOf('%')!=-1) + lblStatus.setText(torServiceMsg); + + appendLogTextAndScroll(torServiceMsg); + } - else + else if (torStatus != newTorStatus) { - - - // hideProgressDialog(); - mViewMain.setBackgroundResource(R.drawable.onionrootonlygrey); - - imgStatus.setImageResource(R.drawable.toroff); - lblStatus.setText(getString(R.string.status_disabled) + "\n" + getString(R.string.press_to_start)); - - if (mItemOnOff != null) - mItemOnOff.setTitle(R.string.menu_start); - + mViewMain.setBackgroundResource(R.drawable.onionrootonlygrey); + imgStatus.setImageResource(R.drawable.toroff); + lblStatus.setText(getString(R.string.status_disabled) + "\n" + getString(R.string.press_to_start)); + + if (mItemOnOff != null) + mItemOnOff.setTitle(R.string.menu_start); + } } + + torStatus = newTorStatus; } catch (RemoteException e) diff --git a/src/org/torproject/android/wizard/TipsAndTricks.java b/src/org/torproject/android/wizard/TipsAndTricks.java index 49bc311..66b08d6 100644 --- a/src/org/torproject/android/wizard/TipsAndTricks.java +++ b/src/org/torproject/android/wizard/TipsAndTricks.java @@ -67,7 +67,7 @@ public class TipsAndTricks extends Activity implements TorConstants { txtTitle.setText(title); ImageView img = (ImageView) findViewById(R.id.orbot_image); - img.setImageResource(R.drawable.icon); + img.setImageResource(R.drawable.onion); Button btnLink = (Button)findViewById(R.id.WizardRootButtonInstallGibberbot); @@ -183,7 +183,7 @@ public class TipsAndTricks extends Activity implements TorConstants { btn2.setText(getString(R.string.btn_finish)); btn1.setVisibility(Button.VISIBLE); - img.setImageResource(R.drawable.icon); + img.setImageResource(R.drawable.onion); btn1.setOnClickListener(new View.OnClickListener() {

1 0

[orbot/master] update to 13.0.6-BETA-5
by n8fr8＠torproject.org 08 Apr '14

08 Apr '14

commit 981123f5fe44b378e9d475dc81ba52b5d74bf133 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Apr 8 11:38:24 2014 -0400 update to 13.0.6-BETA-5 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 35795c1..2eef4a3 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="13.0.6-BETA-4" - android:versionCode="74" + android:versionName="13.0.6-BETA-5" + android:versionCode="75" android:installLocation="auto" >

1 0

[bridgedb/develop] Remove duplicate log statement from EmailServer.replyToMail().
by isis＠torproject.org 08 Apr '14

08 Apr '14

commit 3f0e105d554191878579f15ea40ca3f452cadbbc Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 7 02:49:21 2014 +0000 Remove duplicate log statement from EmailServer.replyToMail(). --- lib/bridgedb/EmailServer.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index eb04917..37a4a82 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -278,7 +278,6 @@ def replyToMail(lines, ctx): return response.seek(0) - logging.info("Sending reply to %r", util.logSafely(sendToUser)) d = defer.Deferred() factory = smtp.SMTPSenderFactory(ctx.smtpFromAddr, sendToUser,

1 0

[bridgedb/develop] Fix old-style class EmailServer.MailContext.
by isis＠torproject.org 08 Apr '14

08 Apr '14

commit b0157d695ef55692de163f92eccf6d65d50bec8b Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 7 02:50:53 2014 +0000 Fix old-style class EmailServer.MailContext. --- lib/bridgedb/EmailServer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index 37a4a82..56e6aea 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -312,7 +312,7 @@ def getLocaleFromRequest(request): lang = lang[0] return I18n.getLang(lang) -class MailContext: +class MailContext(object): """Helper object that holds information used by email subsystem.""" def __init__(self, cfg, dist, sched):

1 0