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

[orbot/master] move HTTP VPN bypass proxy to 9998
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 9c77526f22f6a2bd1a27e0c480f91e28529d8390 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Feb 14 02:30:14 2015 -0500 move HTTP VPN bypass proxy to 9998 --- src/org/torproject/android/service/TorService.java | 10 +++++----- src/org/torproject/android/vpn/HttpProxy.java | 2 +- src/org/torproject/android/vpn/OrbotVpnService.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 01fa339..c3a771b 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -2120,9 +2120,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst { if (mUseVPN) //set the proxy here if we aren't using a bridge { - String proxyType = "http";//"socks5"; - String proxyHost = "10.0.0.1"; - int proxyPort = 8888;//9999; + String proxyType = "socks5"; + String proxyHost = "127.0.0.1"; + int proxyPort = 9999; updateConfiguration(proxyType + "Proxy", proxyHost + ':' + proxyPort, false); } @@ -2245,8 +2245,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (mUseVPN) { proxyType = "http"; //"socks5"; - String proxyHost = "10.0.0.1"; - int proxyPort = 8888; //9999; + String proxyHost = "127.0.0.1"; + int proxyPort = 9998; //9999; proxyBridge = " proxy=" + proxyType + "://" + proxyHost + ':' + proxyPort; diff --git a/src/org/torproject/android/vpn/HttpProxy.java b/src/org/torproject/android/vpn/HttpProxy.java index 617788b..d211342 100644 --- a/src/org/torproject/android/vpn/HttpProxy.java +++ b/src/org/torproject/android/vpn/HttpProxy.java @@ -211,7 +211,7 @@ public class HttpProxy extends Thread try { // create a server socket, and loop forever listening for // client connections - server = new ServerSocket(thisPort); + server = new ServerSocket(thisPort,5,InetAddress.getLocalHost()); if (debugLevel > 0) debugOut.println("Started HttpProxy on port " + thisPort); diff --git a/src/org/torproject/android/vpn/OrbotVpnService.java b/src/org/torproject/android/vpn/OrbotVpnService.java index 42a8b2b..dd5ffd9 100644 --- a/src/org/torproject/android/vpn/OrbotVpnService.java +++ b/src/org/torproject/android/vpn/OrbotVpnService.java @@ -125,7 +125,7 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { mThreadProxy.start(); - mHttpProxyServer = new HttpProxy(8888); + mHttpProxyServer = new HttpProxy(9998); HttpProxy.setVpnService(OrbotVpnService.this); mHttpProxyServer.setDebug(5, System.out); mHttpProxyServer.start();

1 0

[orbot/master] add a bridge toggle button
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit a1ba41ce0b183f8524bc99e2b9267e5adec9b5cb Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Feb 14 02:30:02 2015 -0500 add a bridge toggle button --- res/layout/layout_main.xml | 16 ++++++++++---- res/values/strings.xml | 2 +- src/org/torproject/android/OrbotMainActivity.java | 23 +++++++++++++++++++++ 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml index 7abd037..5f48818 100644 --- a/res/layout/layout_main.xml +++ b/res/layout/layout_main.xml @@ -146,7 +146,7 @@ android:textSize="14sp" android:gravity="center_vertical" android:fontFamily="sans-serif-light" - android:text="status" + android:text="" android:background="#aa333333" android:layout_gravity="center_horizontal|bottom" android:layout_margin="10dp" @@ -167,15 +167,23 @@ android:id="@+id/btnBrowser" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Open Browser" + android:text="@string/menu_verify_browser" /> <ToggleButton + android:id="@+id/btnBridges" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textOff="@string/bridges" + android:textOn="@string/bridges" + /> + + <ToggleButton android:id="@+id/btnVPN" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textOff="VPN Off" - android:textOn="VPN On" + android:textOff="@string/menu_vpn" + android:textOn="@string/menu_vpn" /> </LinearLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index f699314..d3bf0dd 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -301,5 +301,5 @@ <string name="you_do_not_have_root_access_enabled">You do not have ROOT access enabled</string> <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">You may need to stop and start Orbot for settings change to be enabled.</string> - <string name="menu_vpn">Start VPN</string> + <string name="menu_vpn">VPN</string> </resources> diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index f0ba484..af5c2e5 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -75,6 +75,8 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC private Button mBtnBrowser = null; private ToggleButton mBtnVPN = null; + private ToggleButton mBtnBridges = null; + private DrawerLayout mDrawer; private ActionBarDrawerToggle mDrawerToggle; @@ -267,6 +269,27 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC }); + mBtnBridges = (ToggleButton)findViewById(R.id.btnBridges); + boolean useBridges = mPrefs.getBoolean("pref_bridges_enabled", false); + mBtnBridges.setChecked(useBridges); + + mBtnBridges.setOnClickListener(new View.OnClickListener () + { + + @Override + public void onClick(View v) { + + Editor edit = mPrefs.edit(); + edit.putBoolean("pref_bridges_enabled", mBtnBridges.isChecked()); + edit.commit(); + + updateSettings(); + + } + + + }); + }

1 0

[orbot/master] layout changes for a modern, cleaner (purple!) look
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 70d6203fdbdf3375fb9fec602bfb7b150d580285 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Feb 15 01:22:15 2015 -0500 layout changes for a modern, cleaner (purple!) look --- res/drawable/button.xml | 37 +++++++++++++++++++++++++++++++++++++ res/drawable/button_off.xml | 37 +++++++++++++++++++++++++++++++++++++ res/drawable/toggle.xml | 8 ++++++++ res/layout/layout_main.xml | 14 +++++++++++--- res/values/colors.xml | 5 +++-- 5 files changed, 96 insertions(+), 5 deletions(-) diff --git a/res/drawable/button.xml b/res/drawable/button.xml new file mode 100644 index 0000000..4bff579 --- /dev/null +++ b/res/drawable/button.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8" ?> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" > + <shape> + <solid + android:color="@color/panel_background" /> + <stroke + android:width="1dp" + android:color="#ffffff" /> + <corners + android:radius="6dp" /> + <padding + android:left="10dp" + android:top="10dp" + android:right="10dp" + android:bottom="10dp" /> + </shape> + </item> + <item> + <shape> + <gradient + android:startColor="@color/panel_background_dark" + android:endColor="@color/panel_background_main" + android:angle="270" /> + <stroke + android:width="2dp" + android:color="#aaaaaa" /> + <corners + android:radius="6dp" /> + <padding + android:left="10dp" + android:top="10dp" + android:right="10dp" + android:bottom="10dp" /> + </shape> + </item> +</selector> \ No newline at end of file diff --git a/res/drawable/button_off.xml b/res/drawable/button_off.xml new file mode 100644 index 0000000..18da286 --- /dev/null +++ b/res/drawable/button_off.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8" ?> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" > + <shape> + <solid + android:color="@color/panel_background" /> + <stroke + android:width="1dp" + android:color="#ffffff" /> + <corners + android:radius="6dp" /> + <padding + android:left="10dp" + android:top="10dp" + android:right="10dp" + android:bottom="10dp" /> + </shape> + </item> + <item> + <shape> + <gradient + android:startColor="@color/panel_background_dark" + android:endColor="@color/panel_background_main" + android:angle="270" /> + <stroke + android:width="2dp" + android:color="#555555" /> + <corners + android:radius="6dp" /> + <padding + android:left="10dp" + android:top="10dp" + android:right="10dp" + android:bottom="10dp" /> + </shape> + </item> +</selector> \ No newline at end of file diff --git a/res/drawable/toggle.xml b/res/drawable/toggle.xml new file mode 100644 index 0000000..6b29ea1 --- /dev/null +++ b/res/drawable/toggle.xml @@ -0,0 +1,8 @@ +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:state_checked="false" + android:drawable="@drawable/button_off" /> + <item + android:state_checked="true" + android:drawable="@drawable/button" /> +</selector> \ No newline at end of file diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml index 5f48818..5ccc187 100644 --- a/res/layout/layout_main.xml +++ b/res/layout/layout_main.xml @@ -127,6 +127,8 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" + + android:background="@color/panel_background_main" > <org.torproject.android.ui.ImageProgressView android:id="@+id/imgStatus" @@ -143,11 +145,10 @@ android:textColor="@android:color/white" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="14sp" + android:textSize="16sp" android:gravity="center_vertical" android:fontFamily="sans-serif-light" android:text="" - android:background="#aa333333" android:layout_gravity="center_horizontal|bottom" android:layout_margin="10dp" @@ -168,6 +169,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/menu_verify_browser" + + android:background="@drawable/button" + android:layout_margin="3dp" /> <ToggleButton @@ -175,7 +179,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textOff="@string/bridges" - android:textOn="@string/bridges" + android:textOn="@string/bridges" + android:background="@drawable/toggle" + android:layout_margin="3dp" /> <ToggleButton @@ -184,6 +190,8 @@ android:layout_height="wrap_content" android:textOff="@string/menu_vpn" android:textOn="@string/menu_vpn" + android:background="@drawable/toggle" + android:layout_margin="3dp" /> </LinearLayout> diff --git a/res/values/colors.xml b/res/values/colors.xml index 3454a7b..8a93834 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -1,6 +1,7 @@ <resources> - <color name="panel_background">#460072</color> - <color name="panel_background_dark">#240020</color> + <color name="panel_background">#55460072</color> + <color name="panel_background_dark">#aa460072</color> + <color name="panel_background_main">#460072</color> </resources>

1 0

[orbot/master] more work to get bridge VPN mode to work
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit b2ec768d8d454bc9fcc170a13cf847d6b6c26025 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Feb 23 12:29:21 2015 -0500 more work to get bridge VPN mode to work --- src/org/torproject/android/vpn/HttpProxy.java | 84 +++++++++++++------- .../torproject/android/vpn/OrbotVpnService.java | 4 - 2 files changed, 57 insertions(+), 31 deletions(-) diff --git a/src/org/torproject/android/vpn/HttpProxy.java b/src/org/torproject/android/vpn/HttpProxy.java index d211342..ac62786 100644 --- a/src/org/torproject/android/vpn/HttpProxy.java +++ b/src/org/torproject/android/vpn/HttpProxy.java @@ -218,7 +218,6 @@ public class HttpProxy extends Thread while (true) { Socket client = server.accept(); - HttpProxy.vpnService.protect(client); ProxyThread t = new ProxyThread(client, fwdServer, fwdPort); t.setDebug(debugLevel, debugOut); t.setTimeout(ptTimeout); @@ -331,6 +330,7 @@ class ProxyThread extends Thread try { server = SocketChannel.open().socket(); + InetSocketAddress remoteHost = new InetSocketAddress(hostName, hostPort); if ((null != server) && (null != HttpProxy.vpnService)) { HttpProxy.vpnService.protect(server); @@ -338,18 +338,13 @@ class ProxyThread extends Thread if ((fwdServer.length() > 0) && (fwdPort > 0)) { - //server = new Socket(fwdServer, fwdPort); server.connect(new InetSocketAddress(fwdServer, fwdPort)); } else { - //server = new Socket(hostName, hostPort); - server.connect(new InetSocketAddress(hostName, hostPort)); + server.connect(remoteHost); } - - HttpProxy.vpnService.protect(server); - } catch (Exception e) { // tell the client there was an error String errMsg = "HTTP/1.0 500\nContent Type: text/plain\n\n" + @@ -360,31 +355,56 @@ class ProxyThread extends Thread if (server != null) { server.setSoTimeout(socketTimeout); + + BufferedInputStream serverIn = new BufferedInputStream(server.getInputStream()); BufferedOutputStream serverOut = new BufferedOutputStream(server.getOutputStream()); - // send the request out - serverOut.write(request, 0, requestLength); - serverOut.flush(); - - // and get the response; if we're not at a debug level that - // requires us to return the data in the response, just stream - // it back to the client to save ourselves from having to - // create and destroy an unnecessary byte array. Also, we - // should set the waitForDisconnect parameter to 'true', - // because some servers (like Google) don't always set the - // Content-Length header field, so we have to listen until - // they decide to disconnect (or the connection times out). - if (debugLevel > 1) + if (requestLength > 0) { - response = getHTTPData(serverIn, true); - responseLength = Array.getLength(response); - } else { - responseLength = streamHTTPData(serverIn, clientOut, true); + // send the request out + serverOut.write(request, 0, requestLength); + serverOut.flush(); + + // and get the response; if we're not at a debug level that + // requires us to return the data in the response, just stream + // it back to the client to save ourselves from having to + // create and destroy an unnecessary byte array. Also, we + // should set the waitForDisconnect parameter to 'true', + // because some servers (like Google) don't always set the + // Content-Length header field, so we have to listen until + // they decide to disconnect (or the connection times out). + if (debugLevel > 1) + { + response = getHTTPData(serverIn, true); + responseLength = Array.getLength(response); + } else { + responseLength = streamHTTPData(serverIn, clientOut, true); + } + + serverIn.close(); + serverOut.close(); + } + else + { + int i = 0; + byte[] buffer = new byte[4096]; + + int avail = clientIn.available(); + while (avail > 0 && (i = clientIn.read(buffer,0,avail))!=-1) + { + serverOut.write(buffer,0,i); + avail = clientIn.available(); + } + + while ((i = serverIn.read(buffer))!=-1) + clientOut.write(buffer,0,i); + + clientOut.close(); + clientIn.close(); + pSocket.close(); + return; } - - serverIn.close(); - serverOut.close(); } // send the response back to the client, if we haven't already @@ -488,6 +508,16 @@ class ProxyThread extends Thread debugOut.println("Error parsing response code " + rcString); } } + //CONNECT www.comodo.com:443 HTTP/1.1 + + else if (data.toLowerCase().startsWith("connect ")) + { + + String connectHost = data.substring(pos+1, data.indexOf(" ", pos+1)); + host.append(connectHost); + return 0; + + } } // get the rest of the header info diff --git a/src/org/torproject/android/vpn/OrbotVpnService.java b/src/org/torproject/android/vpn/OrbotVpnService.java index 365edab..f78f720 100644 --- a/src/org/torproject/android/vpn/OrbotVpnService.java +++ b/src/org/torproject/android/vpn/OrbotVpnService.java @@ -16,16 +16,12 @@ package org.torproject.android.vpn; -import java.io.IOException; import java.net.InetAddress; -import java.net.UnknownHostException; import java.util.Locale; import org.torproject.android.service.TorServiceConstants; import android.annotation.TargetApi; -import android.app.Notification; -import android.app.NotificationManager; import android.app.PendingIntent; import android.content.Intent; import android.net.VpnService;

1 0

[orbot/master] update pluto
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit f22978e53c072ab67ab41232e0389b8acd4863b3 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Feb 14 02:40:44 2015 -0500 update pluto --- external/pluto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/pluto b/external/pluto index 1631763..8fed2bb 160000 --- a/external/pluto +++ b/external/pluto @@ -1 +1 @@ -Subproject commit 1631763c8dd932785c8cdfaff88f36e2399bcfa3 +Subproject commit 8fed2bb08dfcfa3952f0e62c36bf666254dd9dd7

1 0

[orbot/master] look and feel updates
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 2c3b47eb16b941eb935a7607f8f1b3ae7f209058 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Feb 23 12:28:11 2015 -0500 look and feel updates --- res/drawable/button_on.xml | 35 +++++++++++++++++++++++++++++++++++ res/drawable/toggle.xml | 2 +- res/layout/layout_main.xml | 4 ++-- 3 files changed, 38 insertions(+), 3 deletions(-) diff --git a/res/drawable/button_on.xml b/res/drawable/button_on.xml new file mode 100644 index 0000000..348a6df --- /dev/null +++ b/res/drawable/button_on.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8" ?> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" > + <shape> + <solid + android:color="@color/bright_green" /> + <stroke + android:width="1dp" + android:color="#ffffff" /> + <corners + android:radius="6dp" /> + <padding + android:left="10dp" + android:top="10dp" + android:right="10dp" + android:bottom="10dp" /> + </shape> + </item> + <item> + <shape> + <solid + android:color="@color/dark_green" /> + <stroke + android:width="1dp" + android:color="#ffffff" /> + <corners + android:radius="6dp" /> + <padding + android:left="10dp" + android:top="10dp" + android:right="10dp" + android:bottom="10dp" /> + </shape> + </item> +</selector> \ No newline at end of file diff --git a/res/drawable/toggle.xml b/res/drawable/toggle.xml index 6b29ea1..0f9a36e 100644 --- a/res/drawable/toggle.xml +++ b/res/drawable/toggle.xml @@ -4,5 +4,5 @@ android:drawable="@drawable/button_off" /> <item android:state_checked="true" - android:drawable="@drawable/button" /> + android:drawable="@drawable/button_on" /> </selector> \ No newline at end of file diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml index 5ccc187..2576b27 100644 --- a/res/layout/layout_main.xml +++ b/res/layout/layout_main.xml @@ -101,7 +101,7 @@ > <TextView android:id="@+id/trafficDown" - android:textColor="#ccff2a" + android:textColor="@color/bright_green" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" @@ -112,7 +112,7 @@ <TextView android:id="@+id/trafficUp" - android:textColor="#ccff2a" + android:textColor="@color/bright_green" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true"

1 0

[orbot/master] update base torrc
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 09fc813ce947688ed42ee2ad08596be11cacfb7c Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Feb 23 12:28:31 2015 -0500 update base torrc --- res/raw/torrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/res/raw/torrc b/res/raw/torrc index e5a4c49..fd0223e 100644 --- a/res/raw/torrc +++ b/res/raw/torrc @@ -4,4 +4,5 @@ ControlPort auto SOCKSPort 0 DNSPort 0 TransPort 0 -CookieAuthentication 1 \ No newline at end of file +CookieAuthentication 1 +DisableNetwork 1 \ No newline at end of file

1 0

[orbot/master] remove unneeded wizard classes
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit a6245037b4fbe2ee81c8fd871a2e9f812ca2e7ee Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Feb 15 01:22:38 2015 -0500 remove unneeded wizard classes --- src/org/torproject/android/OrbotMainActivity.java | 5 +- .../android/ui/ChooseLocaleWizardActivity.java | 4 +- src/org/torproject/android/ui/LotsaText.java | 137 -------------------- src/org/torproject/android/ui/TipsAndTricks.java | 43 +----- .../torproject/android/vpn/OrbotVpnService.java | 2 + 5 files changed, 14 insertions(+), 177 deletions(-) diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index af5c2e5..0856326 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -242,6 +242,7 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC }); + mBtnBrowser.setEnabled(false); mBtnVPN = (ToggleButton)findViewById(R.id.btnVPN); @@ -888,7 +889,8 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC imgStatus.setImageResource(R.drawable.toron); - + mBtnBrowser.setEnabled(true); + if (mItemOnOff != null) mItemOnOff.setTitle(R.string.menu_stop); @@ -948,6 +950,7 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC imgStatus.setImageResource(R.drawable.toroff); lblStatus.setText(""); //lblStatus.setText(getString(R.string.status_disabled) + "\n" + getString(R.string.press_to_start)); + mBtnBrowser.setEnabled(false); if (mItemOnOff != null) mItemOnOff.setTitle(R.string.menu_start); diff --git a/src/org/torproject/android/ui/ChooseLocaleWizardActivity.java b/src/org/torproject/android/ui/ChooseLocaleWizardActivity.java index ff4a0aa..95f8766 100644 --- a/src/org/torproject/android/ui/ChooseLocaleWizardActivity.java +++ b/src/org/torproject/android/ui/ChooseLocaleWizardActivity.java @@ -60,7 +60,7 @@ public class ChooseLocaleWizardActivity extends Activity implements TorConstants setLocalePref(arg2); finish(); - startActivity(new Intent(ChooseLocaleWizardActivity.this, LotsaText.class)); + startActivity(new Intent(ChooseLocaleWizardActivity.this, TipsAndTricks.class)); } }); @@ -70,7 +70,7 @@ public class ChooseLocaleWizardActivity extends Activity implements TorConstants public void onClick(View v) { setLocalePref(0); finish(); - startActivity(new Intent(ChooseLocaleWizardActivity.this, LotsaText.class)); + startActivity(new Intent(ChooseLocaleWizardActivity.this, TipsAndTricks.class)); } }); diff --git a/src/org/torproject/android/ui/LotsaText.java b/src/org/torproject/android/ui/LotsaText.java deleted file mode 100644 index 5fdaa57..0000000 --- a/src/org/torproject/android/ui/LotsaText.java +++ /dev/null @@ -1,137 +0,0 @@ -package org.torproject.android.ui; - -import org.torproject.android.R; -import org.torproject.android.TorConstants; -import org.torproject.android.service.TorServiceUtils; - -import android.app.Activity; -import android.content.Context; -import android.content.Intent; -import android.content.SharedPreferences; -import android.content.SharedPreferences.Editor; -import android.os.Bundle; -import android.view.KeyEvent; -import android.view.View; -import android.widget.Button; -import android.widget.TextView; - -public class LotsaText extends Activity implements TorConstants{ - - private Context context; - - protected void onCreate(Bundle savedInstanceState) - { - - - super.onCreate(savedInstanceState); - context = this; - - - } - - @Override - protected void onStart() { - - super.onStart(); - setContentView(R.layout.scrollingtext_buttons_view); - - SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); - - boolean wizardScreen1 = prefs.getBoolean("wizardscreen1",true); - if(wizardScreen1) - stepOne(); - else - stepTwo(); - - } - - @Override - protected void onResume() { - super.onResume(); - - - } - - private void stepOne() { - - SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); - - Editor pEdit = prefs.edit(); - pEdit.putBoolean("wizardscreen1",true); - pEdit.commit(); - - String title = context.getString(R.string.wizard_title); - String msg = context.getString(R.string.wizard_title_msg); - - 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)); - - btn1.setVisibility(Button.INVISIBLE); - - btn2.setOnClickListener(new View.OnClickListener() { - - public void onClick(View v) { - stepTwo(); - } - }); - - } - - private void stepTwo() { - - SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); - - Editor pEdit = prefs.edit(); - pEdit.putBoolean("wizardscreen1",false); - pEdit.commit(); - - setContentView(R.layout.scrollingtext_buttons_view); - String title = context.getString(R.string.wizard_warning_title); - String msg = context.getString(R.string.wizard_warning_msg); - - 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)); - - btn1.setVisibility(Button.VISIBLE); - - - btn1.setOnClickListener(new View.OnClickListener() { - - public void onClick(View v) { - - stepOne(); - } - }); - - btn2.setOnClickListener(new View.OnClickListener() { - - public void onClick(View v) { - finish(); - startActivity(new Intent(LotsaText.this, TipsAndTricks.class)); - } - }); - - } - - //Code to override the back button! - @Override - public boolean onKeyDown(int keyCode, KeyEvent event) { - if(keyCode == KeyEvent.KEYCODE_BACK){ - finish(); - startActivity(new Intent(getBaseContext(), ChooseLocaleWizardActivity.class)); - return true; - } - return true; - } - -} \ No newline at end of file diff --git a/src/org/torproject/android/ui/TipsAndTricks.java b/src/org/torproject/android/ui/TipsAndTricks.java index 5bf3cd6..d0e711b 100644 --- a/src/org/torproject/android/ui/TipsAndTricks.java +++ b/src/org/torproject/android/ui/TipsAndTricks.java @@ -1,6 +1,5 @@ package org.torproject.android.ui; -import org.torproject.android.OrbotMainActivity; import org.torproject.android.R; import org.torproject.android.TorConstants; @@ -8,7 +7,6 @@ import android.app.Activity; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.util.Log; import android.view.KeyEvent; import android.view.View; import android.view.View.OnClickListener; @@ -157,58 +155,29 @@ public class TipsAndTricks extends Activity implements TorConstants { public void onClick(View v) { finish(); - startActivityForResult(new Intent(TipsAndTricks.this, LotsaText.class), 1); + startActivityForResult(new Intent(TipsAndTricks.this, ChooseLocaleWizardActivity.class), 1); } }); next.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - showWizardFinal(); + //showWizardFinal(); + + finish(); } }); } - private void showWizardFinal () - { - setContentView(R.layout.scrollingtext_buttons_view); - String title = getString(R.string.wizard_final); - String msg = getString(R.string.wizard_final_msg); - - 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)); - - btn2.setText(getString(R.string.btn_finish)); - btn1.setVisibility(Button.VISIBLE); - - btn1.setOnClickListener(new View.OnClickListener() { - - public void onClick(View v) { - finish(); - startActivity(new Intent(TipsAndTricks.this, LotsaText.class)); - } - }); - - btn2.setOnClickListener(new View.OnClickListener() { - - public void onClick(View v) { - finish(); - } - }); - } + //Code to override the back button! @Override public boolean onKeyDown(int keyCode, KeyEvent event) { if(keyCode == KeyEvent.KEYCODE_BACK){ finish(); - startActivity(new Intent(getBaseContext(), LotsaText.class)); + startActivity(new Intent(getBaseContext(), ChooseLocaleWizardActivity.class)); return true; } return false; diff --git a/src/org/torproject/android/vpn/OrbotVpnService.java b/src/org/torproject/android/vpn/OrbotVpnService.java index dd5ffd9..365edab 100644 --- a/src/org/torproject/android/vpn/OrbotVpnService.java +++ b/src/org/torproject/android/vpn/OrbotVpnService.java @@ -129,6 +129,8 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { HttpProxy.setVpnService(OrbotVpnService.this); mHttpProxyServer.setDebug(5, System.out); mHttpProxyServer.start(); + + } @Override

1 0

[orbot/master] tuning boot code to work with VPN
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit dd09c6b19a3f993294453ae3101f72a9227ab4ff Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Feb 23 12:29:36 2015 -0500 tuning boot code to work with VPN --- src/org/torproject/android/service/OnBootReceiver.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/org/torproject/android/service/OnBootReceiver.java b/src/org/torproject/android/service/OnBootReceiver.java index b04a6a1..643db13 100644 --- a/src/org/torproject/android/service/OnBootReceiver.java +++ b/src/org/torproject/android/service/OnBootReceiver.java @@ -34,6 +34,7 @@ public class OnBootReceiver extends BroadcastReceiver { public void startVpnService (Context context) { Intent intent = VpnService.prepare(context); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); if (intent != null) { context.startActivity(intent); }

1 0

[orbot/master] update new colors
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 0fc3805997a4a447f8dc986791e495aaab1778ed Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Feb 23 12:28:52 2015 -0500 update new colors --- res/values/colors.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/res/values/colors.xml b/res/values/colors.xml index 8a93834..3bc14fa 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -3,5 +3,6 @@ <color name="panel_background">#55460072</color> <color name="panel_background_dark">#aa460072</color> <color name="panel_background_main">#460072</color> - + <color name="bright_green">#ccff2a</color> + <color name="dark_green">#669901</color> </resources>

1 0