- tor-commits - lists.torproject.org

[orbot/master] Data stats - ARRRRRRRR not working
by n8fr8＠torproject.org 01 Oct '12

01 Oct '12

commit f181f26d4e25c6514b66e06b119fe3ef12941575 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sun Jul 3 14:09:49 2011 +0530 Data stats - ARRRRRRRR not working --- res/layout/layout_main.xml | 49 ++++++++ res/values/strings.xml | 2 + src/org/torproject/android/Orbot.java | 124 +++++++++++++------- src/org/torproject/android/service/TorService.java | 32 +++++- .../android/service/TorServiceConstants.java | 2 + 5 files changed, 161 insertions(+), 48 deletions(-) diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml index db167e3..4fae719 100644 --- a/res/layout/layout_main.xml +++ b/res/layout/layout_main.xml @@ -57,6 +57,55 @@ android:textColor="#ffffff" /> + <RelativeLayout android:id="@+id/trafficRow" + android:gravity="bottom" + android:layout_width="fill_parent" + android:layout_alignParentBottom="true" + android:visibility="invisible" + android:layout_height="80dp" + android:background="#A0909090"> + <TextView + android:id="@+id/trafficDownLabel" + android:textColor="#FFFFFFFF" + android:layout_width="150dp" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:textSize="16sp" + android:text="@string/main_layout_download" + android:gravity="center_vertical|center_horizontal" + android:textStyle="bold" /> + <TextView + android:id="@+id/trafficUpLabel" + android:textColor="#FFFFFFFF" + android:layout_width="150dp" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:text="@string/main_layout_upload" + android:textSize="16sp" + android:gravity="center_vertical|center_horizontal" + android:textStyle="bold" /> + <TextView + android:id="@+id/trafficDown" + android:textColor="#FF00B627" + android:layout_width="150dp" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_below="@+id/trafficDownLabel" + android:textSize="24sp" + android:gravity="center_vertical|center_horizontal" + android:textStyle="bold" /> + <TextView + android:id="@+id/trafficUp" + android:textColor="#FFFF2211" + android:layout_width="150dp" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_below="@+id/trafficUpLabel" + android:textSize="24sp" + android:gravity="center_vertical|center_horizontal" + android:textStyle="bold" /> + </RelativeLayout> + </LinearLayout> </FrameLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index 8cc6207..9fa461d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -31,6 +31,8 @@ <string name="menu_about">About</string> <string name="menu_wizard">Wizard</string> +<string name="main_layout_download">Download</string> +<string name="main_layout_upload">Upload</string> <string name="button_help">Help</string> <string name="button_close">Close</string> diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 1a09ac7..fd0ace0 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -42,57 +42,64 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.View.OnLongClickListener; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; public class Orbot extends Activity implements TorConstants, OnLongClickListener { - - - /* Useful UI bits */ - // so this is probably pretty obvious, here, but also an area - // which we might see quite a bit of change+complexity was the main screen - // UI gets new features - private TextView lblStatus = null; //the main text display widget - private ImageView imgStatus = null; //the main touchable image for activating Orbot - private ProgressDialog progressDialog; //the spinning progress dialog that shows up now and then - private MenuItem mItemOnOff = null; //the menu item which we toggle based on Orbot state - - /* Some tracking bits */ - private int torStatus = TorServiceConstants.STATUS_OFF; //latest status reported from the tor service - // this is a value we get passed back from the TorService - - /* Tor Service interaction */ - /* The primary interface we will be calling on the service. */ - ITorService mService = null; //interface to remote TorService - private boolean autoStartOnBind = false; //controls whether service starts when class binds to it - SharedPreferences prefs; //what the user really wants! - - /** - * When the Orbot activity is created, we call startService - * to ensure the Tor remote service is running. However, it may - * already be running, and this should not create more than one instnace - */ + private static final int VISIBLE = 0; + /* Useful UI bits */ + private TextView lblStatus = null; //the main text display widget + private ImageView imgStatus = null; //the main touchable image for activating Orbot + private ProgressDialog progressDialog; + private MenuItem mItemOnOff = null; + private RelativeLayout trafficRow = null; // the row showing the traffic + private TextView downloadText = null; + private TextView uploadText = null; + + /* Some tracking bits */ + private int torStatus = STATUS_READY; //latest status reported from the tor service + + /* Tor Service interaction */ + /* The primary interface we will be calling on the service. */ + ITorService mService = null; + private boolean autoStartOnBind = false; + + SharedPreferences prefs; + + public static Orbot currentInstance = null; + + private static void setCurrent(Orbot current){ + Orbot.currentInstance = current; + } + + /** Called when the activity is first created. */ public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Orbot.setCurrent(this); + //if Tor binary is not running, then start the service up //might want to look at whether we need to call this every time //or whether binding to the service is enough - setLocale(); + setLocale(); + + startService(new Intent(INTENT_TOR_SERVICE)); + + prefs = PreferenceManager.getDefaultSharedPreferences(this); + + setContentView(R.layout.layout_main); + + lblStatus = (TextView)findViewById(R.id.lblStatus); + lblStatus.setOnLongClickListener(this); + imgStatus = (ImageView)findViewById(R.id.imgStatus); + imgStatus.setOnLongClickListener(this); + trafficRow = (RelativeLayout)findViewById(R.id.trafficRow); + downloadText = (TextView)findViewById(R.id.trafficDown); + uploadText = (TextView)findViewById(R.id.trafficUp); - prefs = PreferenceManager.getDefaultSharedPreferences(this); - - setContentView(R.layout.layout_main); - - //obvious? -yep got everything so far - lblStatus = (TextView)findViewById(R.id.lblStatus); - - imgStatus = (ImageView)findViewById(R.id.imgStatus); - imgStatus.setOnLongClickListener(this); - - startService(new Intent(INTENT_TOR_SERVICE)); } @@ -608,6 +615,8 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener msg.getData().putString(HANDLER_TOR_MSG, getString(R.string.status_starting_up)); mHandler.sendMessage(msg); + trafficRow.setVisibility(VISIBLE); + } //now we stop Tor! amazing! @@ -731,11 +740,22 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener break; case TorServiceConstants.DISABLE_TOR_MSG: - - updateStatus((String)msg.getData().getString(HANDLER_TOR_MSG)); - - break; - + + updateStatus((String)msg.getData().getString(HANDLER_TOR_MSG)); + + break; + + + case TorServiceConstants.MESSAGE_TRAFFIC_COUNT : + + DataCount datacount = (DataCount) msg.obj; + downloadText.setText(formatCount(datacount.Download)); + uploadText.setText(formatCount(datacount.Upload)); + downloadText.invalidate(); + uploadText.invalidate(); + + break; + default: super.handleMessage(msg); } @@ -885,5 +905,21 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener getResources().updateConfiguration(config, getResources().getDisplayMetrics()); } } - + + public class DataCount { + // data uploaded + public long Upload; + // data downloaded + public long Download; + } + + private String formatCount(long count) { + // Converts the supplied argument into a string. + // Under 2Mb, returns "xxx.xKb" + // Over 2Mb, returns "xxx.xxMb" + if (count < 1e6 * 2) + return ((float)((int)(count*10/1024))/10 + "kB"); + return ((float)((int)(count*100/1024/1024))/100 + "MB"); + } + } diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 3ffa460..4aaf2b0 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -42,6 +42,8 @@ import android.content.Intent; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.os.IBinder; +import android.os.Looper; +import android.os.Message; import android.os.RemoteCallbackList; import android.os.RemoteException; import android.preference.PreferenceManager; @@ -50,7 +52,7 @@ import android.util.Log; public class TorService extends Service implements TorServiceConstants, TorConstants, Runnable, EventHandler { - public static boolean ENABLE_DEBUG_LOG = false; + public static boolean ENABLE_DEBUG_LOG = true; private static int currentStatus = STATUS_OFF; @@ -944,7 +946,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst conn.setEventHandler(this); conn.setEvents(Arrays.asList(new String[]{ - "ORCONN", "CIRC", "NOTICE", "WARN", "ERR"})); + "ORCONN", "CIRC", "NOTICE", "WARN", "ERR","BW"})); // conn.setEvents(Arrays.asList(new String[]{ // "DEBUG", "INFO", "NOTICE", "WARN", "ERR"})); @@ -1118,10 +1120,29 @@ public class TorService extends Service implements TorServiceConstants, TorConst sb.append("kb written"); logNotice(sb.toString()); + DataCount datacount = new DataCount(); + + datacount.Download = read/1000; + datacount.Upload = written/1000; + + Message message = Message.obtain(); + message.what = MESSAGE_TRAFFIC_COUNT; + message.obj = datacount; + Orbot.currentInstance.mHandler.sendMessage(message); + + //sendCallbackStatusMessage(message); + } } + public class DataCount { + // data uploaded + public long Upload; + // data downloaded + public long Download; + } + public void circuitStatus(String status, String circID, String path) { if (ENABLE_DEBUG_LOG) @@ -1441,8 +1462,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - - boolean useBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_ENABLED, false); + + ENABLE_DEBUG_LOG = prefs.getBoolean("pref_enable_logging",true); + Log.i(TAG,"debug logging:" + ENABLE_DEBUG_LOG); + + boolean useBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_ENABLED, false); //boolean autoUpdateBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_UPDATED, false); diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 3fa3c55..3776118 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -85,4 +85,6 @@ public interface TorServiceConstants { //obfsproxy public static final String OBFSPROXY_ASSET_KEY = "obfsproxy"; + public static final int MESSAGE_TRAFFIC_COUNT = 5; + }

1 0

[orbot/master] Traffic is shown in the main UI
by n8fr8＠torproject.org 01 Oct '12

01 Oct '12

commit a2981152a73dec763db542345305427d7cef49d6 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sun Jul 3 17:11:11 2011 +0530 Traffic is shown in the main UI --- src/org/torproject/android/Orbot.java | 42 +++++++++---------- src/org/torproject/android/service/TorService.java | 16 ++++++-- 2 files changed, 32 insertions(+), 26 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index fd0ace0..93cec94 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -47,8 +47,6 @@ import android.widget.TextView; public class Orbot extends Activity implements TorConstants, OnLongClickListener { - - private static final int VISIBLE = 0; /* Useful UI bits */ private TextView lblStatus = null; //the main text display widget private ImageView imgStatus = null; //the main touchable image for activating Orbot @@ -615,23 +613,22 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener msg.getData().putString(HANDLER_TOR_MSG, getString(R.string.status_starting_up)); mHandler.sendMessage(msg); - trafficRow.setVisibility(VISIBLE); + trafficRow.setVisibility(RelativeLayout.VISIBLE); } //now we stop Tor! amazing! private void stopTor () throws RemoteException { - //if the service is bound, then turn it off, using the same "PROFILE_" technique - if (mService != null) - { - mService.setProfile(TorServiceConstants.PROFILE_OFF); - - //again this is related to the progress dialog or some other threaded UI object - Message msg = mHandler.obtainMessage(TorServiceConstants.DISABLE_TOR_MSG); - mHandler.sendMessage(msg); - } - + if (mService != null) + { + mService.setProfile(TorServiceConstants.PROFILE_OFF); + Message msg = mHandler.obtainMessage(TorServiceConstants.DISABLE_TOR_MSG); + mHandler.sendMessage(msg); + trafficRow.setVisibility(RelativeLayout.GONE); + + } + } @@ -748,11 +745,11 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener case TorServiceConstants.MESSAGE_TRAFFIC_COUNT : - DataCount datacount = (DataCount) msg.obj; + Bundle data = msg.getData(); + DataCount datacount = new DataCount(data.getLong("upload"),data.getLong("download")); downloadText.setText(formatCount(datacount.Download)); uploadText.setText(formatCount(datacount.Upload)); - downloadText.invalidate(); - uploadText.invalidate(); + break; @@ -911,15 +908,16 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener public long Upload; // data downloaded public long Download; + + DataCount(long Upload, long Download){ + this.Upload = Upload; + this.Download = Download; + } } private String formatCount(long count) { - // Converts the supplied argument into a string. - // Under 2Mb, returns "xxx.xKb" - // Over 2Mb, returns "xxx.xxMb" - if (count < 1e6 * 2) - return ((float)((int)(count*10/1024))/10 + "kB"); - return ((float)((int)(count*100/1024/1024))/100 + "MB"); + + return count+" kB"; } } diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 4aaf2b0..0115146 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -41,9 +41,11 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; +import android.os.Bundle; import android.os.IBinder; import android.os.Looper; import android.os.Message; +import android.os.Parcelable; import android.os.RemoteCallbackList; import android.os.RemoteException; import android.preference.PreferenceManager; @@ -1125,10 +1127,16 @@ public class TorService extends Service implements TorServiceConstants, TorConst datacount.Download = read/1000; datacount.Upload = written/1000; - Message message = Message.obtain(); - message.what = MESSAGE_TRAFFIC_COUNT; - message.obj = datacount; - Orbot.currentInstance.mHandler.sendMessage(message); + Message msg = Message.obtain(); + msg.what = MESSAGE_TRAFFIC_COUNT; + //msg.obj = datacount; + Bundle data = new Bundle(); + data.putLong("upload", datacount.Upload); + data.putLong("download", datacount.Download); + + msg.setData(data); + + Orbot.currentInstance.mHandler.sendMessage(msg); //sendCallbackStatusMessage(message);

1 0

[orbot/master] Improved Formatting
by n8fr8＠torproject.org 01 Oct '12

01 Oct '12

commit e114be51d005e00f470f1bb870e6bcaa0ee295f7 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sun Jul 3 17:41:43 2011 +0530 Improved Formatting Now shows the data with upto 2 decimal places. If under 2Mb, shows "xxx.xKb", else shows "xxx.xxMb" --- src/org/torproject/android/Orbot.java | 13 ++++++++++--- src/org/torproject/android/service/TorService.java | 11 +++++++---- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 93cec94..6eaa124 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -749,7 +749,8 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener DataCount datacount = new DataCount(data.getLong("upload"),data.getLong("download")); downloadText.setText(formatCount(datacount.Download)); uploadText.setText(formatCount(datacount.Upload)); - + downloadText.invalidate(); + uploadText.invalidate(); break; @@ -916,8 +917,14 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener } private String formatCount(long count) { - - return count+" kB"; + // Converts the supplied argument into a string. + // Under 2Mb, returns "xxx.xKb" + // Over 2Mb, returns "xxx.xxMb" + if (count < 1e6 * 2) + return ((float)((int)(count*10/1024))/10 + "kB"); + return ((float)((int)(count*100/1024/1024))/100 + "MB"); + + //return count+" kB"; } } diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 0115146..e9fc224 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -1122,10 +1122,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst sb.append("kb written"); logNotice(sb.toString()); - DataCount datacount = new DataCount(); - - datacount.Download = read/1000; - datacount.Upload = written/1000; + DataCount datacount = new DataCount(written,read); Message msg = Message.obtain(); msg.what = MESSAGE_TRAFFIC_COUNT; @@ -1149,6 +1146,12 @@ public class TorService extends Service implements TorServiceConstants, TorConst public long Upload; // data downloaded public long Download; + + + DataCount(long Upload, long Download){ + this.Upload = Upload; + this.Download = Download; + } } public void circuitStatus(String status, String circID, String path) {

1 0

[orbot/master] Bugfixes + improved formatting
by n8fr8＠torproject.org 01 Oct '12

01 Oct '12

commit 841d83b3b4688c19b87cff2fbc6a72ed19ad9b1a Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Wed Jul 6 21:31:36 2011 +0530 Bugfixes + improved formatting --- src/org/torproject/android/Orbot.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 6eaa124..1b9ca85 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -613,7 +613,6 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener msg.getData().putString(HANDLER_TOR_MSG, getString(R.string.status_starting_up)); mHandler.sendMessage(msg); - trafficRow.setVisibility(RelativeLayout.VISIBLE); } @@ -744,7 +743,8 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener case TorServiceConstants.MESSAGE_TRAFFIC_COUNT : - + + trafficRow.setVisibility(RelativeLayout.VISIBLE); Bundle data = msg.getData(); DataCount datacount = new DataCount(data.getLong("upload"),data.getLong("download")); downloadText.setText(formatCount(datacount.Download)); @@ -921,8 +921,8 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener // Under 2Mb, returns "xxx.xKb" // Over 2Mb, returns "xxx.xxMb" if (count < 1e6 * 2) - return ((float)((int)(count*10/1024))/10 + "kB"); - return ((float)((int)(count*100/1024/1024))/100 + "MB"); + return ((float)((int)(count*10/1024))/10 + " kbps"); + return ((float)((int)(count*100/1024/1024))/100 + " mbps"); //return count+" kB"; }

1 0

[orbot/master] update graphics
by n8fr8＠torproject.org 01 Oct '12

01 Oct '12

commit ba972402df3eb6cbc3069bcde231c4f8a8dc07eb Author: n8fr8 <nathan(a)freitas.net> Date: Tue Jul 24 12:58:40 2012 -0400 update graphics --- res/drawable-hdpi-v11/ic_stat_notify.png | Bin 0 -> 900 bytes res/drawable-hdpi-v11/ic_stat_notifyerr.png | Bin 0 -> 480 bytes res/drawable-hdpi-v9/ic_stat_notify.png | Bin 0 -> 1014 bytes res/drawable-hdpi-v9/ic_stat_notifyerr.png | Bin 0 -> 616 bytes res/drawable-hdpi/ic_action_browse.png | Bin 0 -> 1790 bytes res/drawable-hdpi/ic_action_settings.png | Bin 0 -> 553 bytes res/drawable-hdpi/ic_action_start.png | Bin 0 -> 474 bytes res/drawable-hdpi/ic_launcher.png | Bin 0 -> 8751 bytes res/drawable-hdpi/ic_stat_notify.png | Bin 0 -> 1701 bytes res/drawable-hdpi/ic_stat_notifyerr.png | Bin 0 -> 1312 bytes res/drawable-ldpi-v11/ic_stat_notify.png | Bin 0 -> 398 bytes res/drawable-ldpi-v11/ic_stat_notifyerr.png | Bin 0 -> 294 bytes res/drawable-ldpi-v9/ic_stat_notify.png | Bin 0 -> 466 bytes res/drawable-ldpi-v9/ic_stat_notifyerr.png | Bin 0 -> 342 bytes res/drawable-ldpi/ic_action_browse.png | Bin 0 -> 729 bytes res/drawable-ldpi/ic_action_settings.png | Bin 0 -> 319 bytes res/drawable-ldpi/ic_action_start.png | Bin 0 -> 255 bytes res/drawable-ldpi/ic_launcher.png | Bin 0 -> 2852 bytes res/drawable-ldpi/ic_stat_notify.png | Bin 0 -> 761 bytes res/drawable-ldpi/ic_stat_notifyerr.png | Bin 0 -> 647 bytes res/drawable-mdpi-v11/ic_stat_notify.png | Bin 0 -> 563 bytes res/drawable-mdpi-v11/ic_stat_notifyerr.png | Bin 0 -> 357 bytes res/drawable-mdpi-v9/ic_stat_notify.png | Bin 0 -> 644 bytes res/drawable-mdpi-v9/ic_stat_notifyerr.png | Bin 0 -> 458 bytes res/drawable-mdpi/ic_action_browse.png | Bin 0 -> 1072 bytes res/drawable-mdpi/ic_action_settings.png | Bin 0 -> 364 bytes res/drawable-mdpi/ic_action_start.png | Bin 0 -> 305 bytes res/drawable-mdpi/ic_launcher.png | Bin 0 -> 4389 bytes res/drawable-mdpi/ic_stat_notify.png | Bin 0 -> 1033 bytes res/drawable-mdpi/ic_stat_notifyerr.png | Bin 0 -> 883 bytes res/drawable-xhdpi-v11/ic_stat_notify.png | Bin 0 -> 1203 bytes res/drawable-xhdpi-v11/ic_stat_notifyerr.png | Bin 0 -> 618 bytes res/drawable-xhdpi-v9/ic_stat_notify.png | Bin 0 -> 1445 bytes res/drawable-xhdpi-v9/ic_stat_notifyerr.png | Bin 0 -> 747 bytes res/drawable-xhdpi/ic_action_browse.png | Bin 0 -> 2616 bytes res/drawable-xhdpi/ic_action_settings.png | Bin 0 -> 716 bytes res/drawable-xhdpi/ic_action_start.png | Bin 0 -> 585 bytes res/drawable-xhdpi/ic_launcher.png | Bin 0 -> 14446 bytes res/drawable-xhdpi/ic_stat_notify.png | Bin 0 -> 2324 bytes res/drawable-xhdpi/ic_stat_notifyerr.png | Bin 0 -> 1796 bytes res/drawable/ic_launcher.png | Bin 0 -> 8751 bytes res/drawable/tornotification.png | Bin 1080 -> 0 bytes res/drawable/tornotificationerr.png | Bin 751 -> 0 bytes res/drawable/tornotificationgimpsrc.xcf | Bin 3042 -> 0 bytes res/drawable/tornotificationon.png | Bin 1123 -> 0 bytes res/layout/layout_wizard_tips.xml | 78 +++++++++++++++++++++----- res/menu-v11/main.xml | 6 +- res/menu-v13/main.xml | 6 +- res/menu/main.xml | 6 +- res/values-v11/styles.xml | 5 ++ res/values-v14/styles.xml | 5 ++ res/values/strings.xml | 5 ++ res/values/styles.xml | 5 ++ 53 files changed, 92 insertions(+), 24 deletions(-) diff --git a/res/drawable-hdpi-v11/ic_stat_notify.png b/res/drawable-hdpi-v11/ic_stat_notify.png new file mode 100644 index 0000000..f977038 Binary files /dev/null and b/res/drawable-hdpi-v11/ic_stat_notify.png differ diff --git a/res/drawable-hdpi-v11/ic_stat_notifyerr.png b/res/drawable-hdpi-v11/ic_stat_notifyerr.png new file mode 100644 index 0000000..1f97a9e Binary files /dev/null and b/res/drawable-hdpi-v11/ic_stat_notifyerr.png differ diff --git a/res/drawable-hdpi-v9/ic_stat_notify.png b/res/drawable-hdpi-v9/ic_stat_notify.png new file mode 100644 index 0000000..45e749e Binary files /dev/null and b/res/drawable-hdpi-v9/ic_stat_notify.png differ diff --git a/res/drawable-hdpi-v9/ic_stat_notifyerr.png b/res/drawable-hdpi-v9/ic_stat_notifyerr.png new file mode 100644 index 0000000..58fc5ae Binary files /dev/null and b/res/drawable-hdpi-v9/ic_stat_notifyerr.png differ diff --git a/res/drawable-hdpi/ic_action_browse.png b/res/drawable-hdpi/ic_action_browse.png new file mode 100644 index 0000000..0972bbd Binary files /dev/null and b/res/drawable-hdpi/ic_action_browse.png differ diff --git a/res/drawable-hdpi/ic_action_settings.png b/res/drawable-hdpi/ic_action_settings.png new file mode 100644 index 0000000..d57b290 Binary files /dev/null and b/res/drawable-hdpi/ic_action_settings.png differ diff --git a/res/drawable-hdpi/ic_action_start.png b/res/drawable-hdpi/ic_action_start.png new file mode 100644 index 0000000..8b7b829 Binary files /dev/null and b/res/drawable-hdpi/ic_action_start.png differ diff --git a/res/drawable-hdpi/ic_launcher.png b/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 0000000..05980b5 Binary files /dev/null and b/res/drawable-hdpi/ic_launcher.png differ diff --git a/res/drawable-hdpi/ic_stat_notify.png b/res/drawable-hdpi/ic_stat_notify.png new file mode 100644 index 0000000..06a4259 Binary files /dev/null and b/res/drawable-hdpi/ic_stat_notify.png differ diff --git a/res/drawable-hdpi/ic_stat_notifyerr.png b/res/drawable-hdpi/ic_stat_notifyerr.png new file mode 100644 index 0000000..b65fa64 Binary files /dev/null and b/res/drawable-hdpi/ic_stat_notifyerr.png differ diff --git a/res/drawable-ldpi-v11/ic_stat_notify.png b/res/drawable-ldpi-v11/ic_stat_notify.png new file mode 100644 index 0000000..9fdf779 Binary files /dev/null and b/res/drawable-ldpi-v11/ic_stat_notify.png differ diff --git a/res/drawable-ldpi-v11/ic_stat_notifyerr.png b/res/drawable-ldpi-v11/ic_stat_notifyerr.png new file mode 100644 index 0000000..b73292d Binary files /dev/null and b/res/drawable-ldpi-v11/ic_stat_notifyerr.png differ diff --git a/res/drawable-ldpi-v9/ic_stat_notify.png b/res/drawable-ldpi-v9/ic_stat_notify.png new file mode 100644 index 0000000..2a93206 Binary files /dev/null and b/res/drawable-ldpi-v9/ic_stat_notify.png differ diff --git a/res/drawable-ldpi-v9/ic_stat_notifyerr.png b/res/drawable-ldpi-v9/ic_stat_notifyerr.png new file mode 100644 index 0000000..2787bbb Binary files /dev/null and b/res/drawable-ldpi-v9/ic_stat_notifyerr.png differ diff --git a/res/drawable-ldpi/ic_action_browse.png b/res/drawable-ldpi/ic_action_browse.png new file mode 100644 index 0000000..9cf751b Binary files /dev/null and b/res/drawable-ldpi/ic_action_browse.png differ diff --git a/res/drawable-ldpi/ic_action_settings.png b/res/drawable-ldpi/ic_action_settings.png new file mode 100644 index 0000000..c3927fd Binary files /dev/null and b/res/drawable-ldpi/ic_action_settings.png differ diff --git a/res/drawable-ldpi/ic_action_start.png b/res/drawable-ldpi/ic_action_start.png new file mode 100644 index 0000000..fc098d2 Binary files /dev/null and b/res/drawable-ldpi/ic_action_start.png differ diff --git a/res/drawable-ldpi/ic_launcher.png b/res/drawable-ldpi/ic_launcher.png new file mode 100644 index 0000000..dd665db Binary files /dev/null and b/res/drawable-ldpi/ic_launcher.png differ diff --git a/res/drawable-ldpi/ic_stat_notify.png b/res/drawable-ldpi/ic_stat_notify.png new file mode 100644 index 0000000..70ae017 Binary files /dev/null and b/res/drawable-ldpi/ic_stat_notify.png differ diff --git a/res/drawable-ldpi/ic_stat_notifyerr.png b/res/drawable-ldpi/ic_stat_notifyerr.png new file mode 100644 index 0000000..518e188 Binary files /dev/null and b/res/drawable-ldpi/ic_stat_notifyerr.png differ diff --git a/res/drawable-mdpi-v11/ic_stat_notify.png b/res/drawable-mdpi-v11/ic_stat_notify.png new file mode 100644 index 0000000..8e4f9bf Binary files /dev/null and b/res/drawable-mdpi-v11/ic_stat_notify.png differ diff --git a/res/drawable-mdpi-v11/ic_stat_notifyerr.png b/res/drawable-mdpi-v11/ic_stat_notifyerr.png new file mode 100644 index 0000000..935e209 Binary files /dev/null and b/res/drawable-mdpi-v11/ic_stat_notifyerr.png differ diff --git a/res/drawable-mdpi-v9/ic_stat_notify.png b/res/drawable-mdpi-v9/ic_stat_notify.png new file mode 100644 index 0000000..19fbc97 Binary files /dev/null and b/res/drawable-mdpi-v9/ic_stat_notify.png differ diff --git a/res/drawable-mdpi-v9/ic_stat_notifyerr.png b/res/drawable-mdpi-v9/ic_stat_notifyerr.png new file mode 100644 index 0000000..b149031 Binary files /dev/null and b/res/drawable-mdpi-v9/ic_stat_notifyerr.png differ diff --git a/res/drawable-mdpi/ic_action_browse.png b/res/drawable-mdpi/ic_action_browse.png new file mode 100644 index 0000000..cb6075f Binary files /dev/null and b/res/drawable-mdpi/ic_action_browse.png differ diff --git a/res/drawable-mdpi/ic_action_settings.png b/res/drawable-mdpi/ic_action_settings.png new file mode 100644 index 0000000..d90f125 Binary files /dev/null and b/res/drawable-mdpi/ic_action_settings.png differ diff --git a/res/drawable-mdpi/ic_action_start.png b/res/drawable-mdpi/ic_action_start.png new file mode 100644 index 0000000..7d9f391 Binary files /dev/null and b/res/drawable-mdpi/ic_action_start.png differ diff --git a/res/drawable-mdpi/ic_launcher.png b/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 0000000..ae0180b Binary files /dev/null and b/res/drawable-mdpi/ic_launcher.png differ diff --git a/res/drawable-mdpi/ic_stat_notify.png b/res/drawable-mdpi/ic_stat_notify.png new file mode 100644 index 0000000..48f1670 Binary files /dev/null and b/res/drawable-mdpi/ic_stat_notify.png differ diff --git a/res/drawable-mdpi/ic_stat_notifyerr.png b/res/drawable-mdpi/ic_stat_notifyerr.png new file mode 100644 index 0000000..c4b3178 Binary files /dev/null and b/res/drawable-mdpi/ic_stat_notifyerr.png differ diff --git a/res/drawable-xhdpi-v11/ic_stat_notify.png b/res/drawable-xhdpi-v11/ic_stat_notify.png new file mode 100644 index 0000000..75d0aef Binary files /dev/null and b/res/drawable-xhdpi-v11/ic_stat_notify.png differ diff --git a/res/drawable-xhdpi-v11/ic_stat_notifyerr.png b/res/drawable-xhdpi-v11/ic_stat_notifyerr.png new file mode 100644 index 0000000..bed9e21 Binary files /dev/null and b/res/drawable-xhdpi-v11/ic_stat_notifyerr.png differ diff --git a/res/drawable-xhdpi-v9/ic_stat_notify.png b/res/drawable-xhdpi-v9/ic_stat_notify.png new file mode 100644 index 0000000..b9ec593 Binary files /dev/null and b/res/drawable-xhdpi-v9/ic_stat_notify.png differ diff --git a/res/drawable-xhdpi-v9/ic_stat_notifyerr.png b/res/drawable-xhdpi-v9/ic_stat_notifyerr.png new file mode 100644 index 0000000..7d1139c Binary files /dev/null and b/res/drawable-xhdpi-v9/ic_stat_notifyerr.png differ diff --git a/res/drawable-xhdpi/ic_action_browse.png b/res/drawable-xhdpi/ic_action_browse.png new file mode 100644 index 0000000..d7ca5b6 Binary files /dev/null and b/res/drawable-xhdpi/ic_action_browse.png differ diff --git a/res/drawable-xhdpi/ic_action_settings.png b/res/drawable-xhdpi/ic_action_settings.png new file mode 100644 index 0000000..f2572c8 Binary files /dev/null and b/res/drawable-xhdpi/ic_action_settings.png differ diff --git a/res/drawable-xhdpi/ic_action_start.png b/res/drawable-xhdpi/ic_action_start.png new file mode 100644 index 0000000..f45cadd Binary files /dev/null and b/res/drawable-xhdpi/ic_action_start.png differ diff --git a/res/drawable-xhdpi/ic_launcher.png b/res/drawable-xhdpi/ic_launcher.png new file mode 100644 index 0000000..759a528 Binary files /dev/null and b/res/drawable-xhdpi/ic_launcher.png differ diff --git a/res/drawable-xhdpi/ic_stat_notify.png b/res/drawable-xhdpi/ic_stat_notify.png new file mode 100644 index 0000000..71be265 Binary files /dev/null and b/res/drawable-xhdpi/ic_stat_notify.png differ diff --git a/res/drawable-xhdpi/ic_stat_notifyerr.png b/res/drawable-xhdpi/ic_stat_notifyerr.png new file mode 100644 index 0000000..f48e8e8 Binary files /dev/null and b/res/drawable-xhdpi/ic_stat_notifyerr.png differ diff --git a/res/drawable/ic_launcher.png b/res/drawable/ic_launcher.png new file mode 100644 index 0000000..05980b5 Binary files /dev/null and b/res/drawable/ic_launcher.png differ diff --git a/res/drawable/tornotification.png b/res/drawable/tornotification.png deleted file mode 100644 index ff158f4..0000000 Binary files a/res/drawable/tornotification.png and /dev/null differ diff --git a/res/drawable/tornotificationerr.png b/res/drawable/tornotificationerr.png deleted file mode 100644 index 90603f8..0000000 Binary files a/res/drawable/tornotificationerr.png and /dev/null differ diff --git a/res/drawable/tornotificationgimpsrc.xcf b/res/drawable/tornotificationgimpsrc.xcf deleted file mode 100644 index e90ff6b..0000000 Binary files a/res/drawable/tornotificationgimpsrc.xcf and /dev/null differ diff --git a/res/drawable/tornotificationon.png b/res/drawable/tornotificationon.png deleted file mode 100644 index 1f39075..0000000 Binary files a/res/drawable/tornotificationon.png and /dev/null differ diff --git a/res/layout/layout_wizard_tips.xml b/res/layout/layout_wizard_tips.xml index 140f708..c2a8c02 100644 --- a/res/layout/layout_wizard_tips.xml +++ b/res/layout/layout_wizard_tips.xml @@ -49,24 +49,72 @@ android:layout_span="3"> <LinearLayout - android:background="#575757" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:paddingRight="20dip" - > - -<TextView android:text="@string/wizard_tips_msg" android:layout_width="wrap_content" android:textColor="#ffffff" android:layout_height="wrap_content" android:textSize="8pt" android:id="@+id/WizardTextBody1" android:padding="20dip"></TextView> -<Button android:text="@string/wizard_tips_orweb" android:layout_gravity="left" android:drawableLeft="@drawable/icon_orweb" android:layout_marginTop="10px" android:id="@+id/WizardRootButtonInstallOrweb" android:layout_width="wrap_content" android:layout_height="wrap_content"/> + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="#575757" + android:orientation="vertical" + android:paddingRight="20dip" > + + <TextView + android:id="@+id/WizardTextBody1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0.31" + android:padding="20dip" + android:text="@string/wizard_tips_msg" + android:textColor="#ffffff" + android:textSize="8pt" > + </TextView> -<Button android:text="@string/wizard_tips_gibberbot" android:layout_gravity="left" android:drawableLeft="@drawable/ic_launcher_gibberbot" android:layout_marginTop="10px" android:id="@+id/WizardRootButtonInstallGibberbot" android:layout_width="wrap_content" android:layout_height="wrap_content"/> + <Button + android:id="@+id/WizardRootButtonInstallOrweb" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginTop="10px" + android:drawableLeft="@drawable/icon_orweb" + android:text="@string/wizard_tips_orweb" /> - - </LinearLayout> </ScrollView> </TableRow> diff --git a/res/menu-v11/main.xml b/res/menu-v11/main.xml index 89b4d9e..7870c32 100755 --- a/res/menu-v11/main.xml +++ b/res/menu-v11/main.xml @@ -21,20 +21,20 @@ <item android:id="@+id/menu_start" android:title="@string/menu_start" - android:icon="@drawable/menu_start" + android:icon="@drawable/ic_action_start" android:showAsAction="ifRoom" /> <item android:id="@+id/menu_settings" android:title="@string/menu_settings" - android:icon="@drawable/menu_settings" + android:icon="@drawable/ic_action_settings" android:showAsAction="always" /> <item android:id="@+id/menu_verify" android:title="@string/menu_verify" - android:icon="@drawable/ic_menu_check" + android:icon="@drawable/ic_action_browse" android:showAsAction="always" /> diff --git a/res/menu-v13/main.xml b/res/menu-v13/main.xml index 89b4d9e..7870c32 100755 --- a/res/menu-v13/main.xml +++ b/res/menu-v13/main.xml @@ -21,20 +21,20 @@ <item android:id="@+id/menu_start" android:title="@string/menu_start" - android:icon="@drawable/menu_start" + android:icon="@drawable/ic_action_start" android:showAsAction="ifRoom" /> <item android:id="@+id/menu_settings" android:title="@string/menu_settings" - android:icon="@drawable/menu_settings" + android:icon="@drawable/ic_action_settings" android:showAsAction="always" /> <item android:id="@+id/menu_verify" android:title="@string/menu_verify" - android:icon="@drawable/ic_menu_check" + android:icon="@drawable/ic_action_browse" android:showAsAction="always" /> diff --git a/res/menu/main.xml b/res/menu/main.xml index 7a1b332..9dbf9a2 100755 --- a/res/menu/main.xml +++ b/res/menu/main.xml @@ -21,17 +21,17 @@ <item android:id="@+id/menu_start" android:title="@string/menu_start" - android:icon="@drawable/menu_start" + android:icon="@drawable/ic_action_start" /> <item android:id="@+id/menu_settings" android:title="@string/menu_settings" - android:icon="@drawable/menu_settings" + android:icon="@drawable/ic_action_settings" /> <item android:id="@+id/menu_verify" android:title="@string/menu_verify" - android:icon="@drawable/ic_menu_check" + android:icon="@drawable/ic_action_browse" /> <item android:id="@+id/menu_about" diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml new file mode 100644 index 0000000..d408cbc --- /dev/null +++ b/res/values-v11/styles.xml @@ -0,0 +1,5 @@ +<resources> + + <style name="AppTheme" parent="android:Theme.Holo.Light" /> + +</resources> \ No newline at end of file diff --git a/res/values-v14/styles.xml b/res/values-v14/styles.xml new file mode 100644 index 0000000..1c089a7 --- /dev/null +++ b/res/values-v14/styles.xml @@ -0,0 +1,5 @@ +<resources> + + <style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar" /> + +</resources> \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 10e51eb..8cc6207 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -99,6 +99,11 @@ <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string> + <string name="wizard_tips_duckgo">Duckduckgo Search Engine app</string> + + <string name="wizard_tips_firefox">Firefox with Proxy Mobile add-on (extra install after)</string> + <string name="wizard_tips_twitter">Twitter supports http proxy "localhost:8118"</string> + <string name="wizard_proxy_help_info">Proxy Settings</string> <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n The host settings is 127.0.0.1 or "localhost". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible. diff --git a/res/values/styles.xml b/res/values/styles.xml new file mode 100644 index 0000000..bc024be --- /dev/null +++ b/res/values/styles.xml @@ -0,0 +1,5 @@ +<resources> + + <style name="AppTheme" parent="android:Theme.Black.NoTitleBar" /> + +</resources> \ No newline at end of file

1 0

[orbot/master] updated notification resources
by n8fr8＠torproject.org 01 Oct '12

01 Oct '12

commit 747fd8c46aaca93fce2c69ee1bb06440f52ecdfd Author: n8fr8 <nathan(a)freitas.net> Date: Tue Jul 24 13:08:18 2012 -0400 updated notification resources --- src/org/torproject/android/service/TorService.java | 46 ++++++++++---------- .../android/service/TorServiceUtils.java | 3 +- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 1cbb93c..3ffa460 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -232,7 +232,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (Exception e) { logNotice("unable to find tor binaries: " + e.getMessage()); - showToolbarNotification(getString(R.string.error_installing_binares), ERROR_NOTIFY_ID, R.drawable.tornotificationerr, -1); + showToolbarNotification(getString(R.string.error_installing_binares), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr, -1); Log.e(TAG, "error checking tor binaries", e); } @@ -272,7 +272,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst catch (Exception e) { currentStatus = STATUS_OFF; - this.showToolbarNotification(getString(R.string.status_disabled), ERROR_NOTIFY_ID, R.drawable.tornotificationerr, -1); + this.showToolbarNotification(getString(R.string.status_disabled), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr, -1); Log.d(TAG,"Unable to start Tor: " + e.getMessage(),e); } } @@ -365,7 +365,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { try { String onionHostname = Utils.readString(new FileInputStream(file)); - showToolbarNotification(getString(R.string.hidden_service_on) + ' ' + onionHostname, HS_NOTIFY_ID, R.drawable.tornotification, Notification.FLAG_ONGOING_EVENT); + showToolbarNotification(getString(R.string.hidden_service_on) + ' ' + onionHostname, HS_NOTIFY_ID, R.drawable.ic_stat_notify, Notification.FLAG_ONGOING_EVENT); Editor pEdit = prefs.edit(); pEdit.putString("pref_hs_hostname",onionHostname); pEdit.commit(); @@ -373,13 +373,13 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (FileNotFoundException e) { logException("unable to read onion hostname file",e); - showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), ERROR_NOTIFY_ID, R.drawable.tornotificationerr, -1); + showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr, -1); return; } } else { - showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), HS_NOTIFY_ID, R.drawable.tornotificationerr, -1); + showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), HS_NOTIFY_ID, R.drawable.ic_stat_notifyerr, -1); } @@ -533,7 +533,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst logNotice(getString(R.string.status_install_success)); - //showToolbarNotification(getString(R.string.status_install_success), NOTIFY_ID, R.drawable.tornotification); + //showToolbarNotification(getString(R.string.status_install_success), NOTIFY_ID, R.drawable.ic_stat_notify); } else @@ -628,7 +628,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst if(transProxyPortFallback) { - showToolbarNotification(getString(R.string.setting_up_port_based_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.tornotification, -1); + showToolbarNotification(getString(R.string.setting_up_port_based_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_notify, -1); StringTokenizer st = new StringTokenizer(portProxyList, ","); int status = code; while (st.hasMoreTokens()) @@ -642,13 +642,13 @@ public class TorService extends Service implements TorServiceConstants, TorConst { if(transProxyAll) { - showToolbarNotification(getString(R.string.setting_up_full_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.tornotification, -1); + showToolbarNotification(getString(R.string.setting_up_full_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_notify, -1); code = ttProxy.setTransparentProxyingAll(this); } else { - showToolbarNotification(getString(R.string.setting_up_app_based_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.tornotification, -1); + showToolbarNotification(getString(R.string.setting_up_app_based_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_notify, -1); code = ttProxy.setTransparentProxyingByApp(this,AppManager.getApps(this)); } @@ -659,11 +659,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (code == 0) { - showToolbarNotification(getString(R.string.transparent_proxying_enabled), TRANSPROXY_NOTIFY_ID, R.drawable.tornotification, -1); + showToolbarNotification(getString(R.string.transparent_proxying_enabled), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_notify, -1); if (transProxyTethering) { - showToolbarNotification(getString(R.string.transproxy_enabled_for_tethering_), TRANSPROXY_NOTIFY_ID, R.drawable.tornotification, -1); + showToolbarNotification(getString(R.string.transproxy_enabled_for_tethering_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_notify, -1); ttProxy.enableTetheringRules(this); @@ -671,7 +671,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } else { - showToolbarNotification(getString(R.string.warning_error_starting_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.tornotification, -1); + showToolbarNotification(getString(R.string.warning_error_starting_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_notify, -1); } @@ -702,7 +702,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst new TorTransProxy().flushIptables(this); - showToolbarNotification(getString(R.string.transproxy_rules_cleared), TRANSPROXY_NOTIFY_ID, R.drawable.tornotification, -1); + showToolbarNotification(getString(R.string.transproxy_rules_cleared), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_notify, -1); return true; @@ -777,7 +777,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst logNotice("Tor process id=" + procId); - //showToolbarNotification(getString(R.string.status_starting_up), NOTIFY_ID, R.drawable.tornotification); + //showToolbarNotification(getString(R.string.status_starting_up), NOTIFY_ID, R.drawable.ic_stat_notify); initControlConnection (); @@ -1004,7 +1004,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst private void startNotification () { - Notification notice = new Notification(R.drawable.tornotificationon, getString(R.string.status_activated), System.currentTimeMillis()); + Notification notice = new Notification(R.drawable.ic_stat_notify, getString(R.string.status_activated), System.currentTimeMillis()); //This constructor is deprecated. Use Notification.Builder instead //Notification notice = new Notification(R.drawable.iocipher, "Active: " + mIpAddress, System.currentTimeMillis()); @@ -1040,7 +1040,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } else { - showToolbarNotification (getString(R.string.status_activated),NOTIFY_ID,R.drawable.tornotificationon, Notification.FLAG_ONGOING_EVENT); + showToolbarNotification (getString(R.string.status_activated),NOTIFY_ID,R.drawable.ic_stat_notify, Notification.FLAG_ONGOING_EVENT); } @@ -1054,7 +1054,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - //showToolbarNotification(msg, TRANSPROXY_NOTIFY_ID, R.drawable.tornotification); + //showToolbarNotification(msg, TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_notify); public void newDescriptors(List<String> orList) { @@ -1159,7 +1159,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (Exception e) { logNotice("unable to find tor binaries: " + e.getMessage()); - showToolbarNotification(getString(R.string.error_installing_binares), ERROR_NOTIFY_ID, R.drawable.tornotificationerr, -1); + showToolbarNotification(getString(R.string.error_installing_binares), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr, -1); Log.e(TAG, "error checking tor binaries", e); } @@ -1484,7 +1484,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (IOException e) { - showToolbarNotification (getString(R.string.error_installing_binares),ERROR_NOTIFY_ID,R.drawable.tornotificationon, Notification.FLAG_ONGOING_EVENT); + showToolbarNotification (getString(R.string.error_installing_binares),ERROR_NOTIFY_ID,R.drawable.ic_stat_notify, Notification.FLAG_ONGOING_EVENT); return false; } @@ -1503,7 +1503,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { String msgBridge = getString(R.string.bridge_requires_ip) + getString(R.string.send_email_for_bridges); - showToolbarNotification(msgBridge, ERROR_NOTIFY_ID, R.drawable.tornotification, -1); + showToolbarNotification(msgBridge, ERROR_NOTIFY_ID, R.drawable.ic_stat_notify, -1); return false; @@ -1518,7 +1518,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst bridgeDelim = ","; } - showToolbarNotification(getString(R.string.notification_using_bridges) + ": " + bridgeList, TRANSPROXY_NOTIFY_ID, R.drawable.tornotification, -1); + showToolbarNotification(getString(R.string.notification_using_bridges) + ": " + bridgeList, TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_notify, -1); boolean obfsBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_OBFUSCATED, false); String bridgeCfgKey = "bridge"; @@ -1566,7 +1566,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (Exception e) { - showToolbarNotification (getString(R.string.your_reachableaddresses_settings_caused_an_exception_),ERROR_NOTIFY_ID,R.drawable.tornotificationon, Notification.FLAG_ONGOING_EVENT); + showToolbarNotification (getString(R.string.your_reachableaddresses_settings_caused_an_exception_),ERROR_NOTIFY_ID,R.drawable.ic_stat_notify, Notification.FLAG_ONGOING_EVENT); return false; } @@ -1595,7 +1595,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (Exception e) { - showToolbarNotification (getString(R.string.your_relay_settings_caused_an_exception_),ERROR_NOTIFY_ID,R.drawable.tornotificationon, Notification.FLAG_ONGOING_EVENT); + showToolbarNotification (getString(R.string.your_relay_settings_caused_an_exception_),ERROR_NOTIFY_ID,R.drawable.ic_stat_notify, Notification.FLAG_ONGOING_EVENT); return false; diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java index a226861..9a4d9ff 100644 --- a/src/org/torproject/android/service/TorServiceUtils.java +++ b/src/org/torproject/android/service/TorServiceUtils.java @@ -180,8 +180,7 @@ public class TorServiceUtils implements TorServiceConstants { 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++)

1 0

[orbot/master] Adding neccessary prep code for Total BW
by n8fr8＠torproject.org 01 Oct '12

01 Oct '12

commit 92fbd45f4e17d12e609a54a9c016622d0496408f Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Mon Jul 25 17:49:03 2011 -0400 Adding neccessary prep code for Total BW --- src/org/torproject/android/service/TorService.java | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index a4b0171..01c693c 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -1109,7 +1109,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } } - + public void bandwidthUsed(long read, long written) { if (ENABLE_DEBUG_LOG) @@ -1120,7 +1120,14 @@ public class TorService extends Service implements TorServiceConstants, TorConst sb.append("kb read / "); sb.append(written/1000); sb.append("kb written"); - + /* try { + sb.append("Total upload :"+conn.getInfo("traffic/written")); + sb.append("Total Download "+conn.getInfo("traffic/read")); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + */ logNotice(sb.toString()); }

1 0

[orbot/master] ENABLE_DEBUG_TOGGLE update, proper AIDL implementation
by n8fr8＠torproject.org 01 Oct '12

01 Oct '12

commit d54e72e0942307cc0c3172f574e41db4e592afca Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Thu Jul 7 19:34:22 2011 +0530 ENABLE_DEBUG_TOGGLE update, proper AIDL implementation Data stats are now shown irrespective of whether ENABLE_DEBUG_TOGGLE is toggled or not. ITorServiceCallback.aidl has been updated to include a new method updateBandwidth(long ,long) to hook the data passed from the service into the GUI. --- src/org/torproject/android/Orbot.java | 33 ++++++++--- .../android/service/ITorServiceCallback.aidl | 5 ++ src/org/torproject/android/service/TorService.java | 61 +++++++++++--------- 3 files changed, 64 insertions(+), 35 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 1b9ca85..68e4aaf 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -694,14 +694,31 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener mHandler.sendMessage(msg); } - - public void logMessage(String value) throws RemoteException { - - Message msg = mHandler.obtainMessage(TorServiceConstants.LOG_MSG); - msg.getData().putString(HANDLER_TOR_MSG, value); - mHandler.sendMessage(msg); - - } + @Override + public void logMessage(String value) throws RemoteException { + + Message msg = mHandler.obtainMessage(TorServiceConstants.LOG_MSG); + msg.getData().putString(HANDLER_TOR_MSG, value); + mHandler.sendMessage(msg); + + } + + @Override + public void updateBandwidth(long upload, long download) + throws RemoteException { + + Message msg = Message.obtain(); + msg.what = TorServiceConstants.MESSAGE_TRAFFIC_COUNT; + + + Bundle data = new Bundle(); + data.putLong("upload", upload); + data.putLong("download", download); + + msg.setData(data); + mHandler.sendMessage(msg); + + } }; diff --git a/src/org/torproject/android/service/ITorServiceCallback.aidl b/src/org/torproject/android/service/ITorServiceCallback.aidl index 86fe28f..2492206 100644 --- a/src/org/torproject/android/service/ITorServiceCallback.aidl +++ b/src/org/torproject/android/service/ITorServiceCallback.aidl @@ -12,6 +12,11 @@ oneway interface ITorServiceCallback { void statusChanged(String value); /** + * Called when the service returns the bandwidth user to display to the user + */ + void updateBandwidth(long value, long value2); + + /** * Called when the service has something to add to the log */ void logMessage(String value); diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index e9fc224..a4b0171 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -1122,37 +1122,14 @@ public class TorService extends Service implements TorServiceConstants, TorConst sb.append("kb written"); logNotice(sb.toString()); - DataCount datacount = new DataCount(written,read); - - Message msg = Message.obtain(); - msg.what = MESSAGE_TRAFFIC_COUNT; - //msg.obj = datacount; - Bundle data = new Bundle(); - data.putLong("upload", datacount.Upload); - data.putLong("download", datacount.Download); - - msg.setData(data); - - Orbot.currentInstance.mHandler.sendMessage(msg); - - //sendCallbackStatusMessage(message); - } + + sendCallbackStatusMessage(written, read); + + } - public class DataCount { - // data uploaded - public long Upload; - // data downloaded - public long Download; - - - DataCount(long Upload, long Download){ - this.Upload = Upload; - this.Download = Download; - } - } public void circuitStatus(String status, String circID, String path) { @@ -1422,6 +1399,36 @@ public class TorService extends Service implements TorServiceConstants, TorConst mCallbacks.finishBroadcast(); inCallback = false; } + + private synchronized void sendCallbackStatusMessage (long upload, long download) + { + + if (mCallbacks == null) + return; + + // Broadcast to all clients the new value. + final int N = mCallbacks.beginBroadcast(); + + inCallback = true; + + if (N > 0) + { + for (int i=0; i<N; i++) { + try { + mCallbacks.getBroadcastItem(i).updateBandwidth(upload, download); + + + } catch (RemoteException e) { + // The RemoteCallbackList will take care of removing + // the dead object for us. + } + } + } + + mCallbacks.finishBroadcast(); + inCallback = false; + } + private synchronized void sendCallbackLogMessage (String logMessage) {

1 0

[orbot/master] small updates for datastats merge
by n8fr8＠torproject.org 01 Oct '12

01 Oct '12

commit bfcebdaba28e142e521e962c1c6aab0cef175074 Author: n8fr8 <nathan(a)freitas.net> Date: Sun Sep 30 18:14:25 2012 +0530 small updates for datastats merge --- res/layout/layout_main.xml | 4 +--- src/org/torproject/android/Orbot.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml index 1a25feb..a9444e1 100644 --- a/res/layout/layout_main.xml +++ b/res/layout/layout_main.xml @@ -104,9 +104,7 @@ android:textSize="24sp" android:gravity="center_vertical|center_horizontal" android:textStyle="bold" /> - </RelativeLayout> -</RelativeLayout> - + </RelativeLayout> </LinearLayout> </FrameLayout> diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index f9c949d..c51b104 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -57,7 +57,7 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener private TextView uploadText = null; /* Some tracking bits */ - private int torStatus = STATUS_READY; //latest status reported from the tor service + private int torStatus = TorServiceConstants.STATUS_OFF; //latest status reported from the tor service /* Tor Service interaction */ /* The primary interface we will be calling on the service. */

1 0

[orbot/master] Total Bandwidth prep code
by n8fr8＠torproject.org 01 Oct '12

01 Oct '12

commit 5b6e83c6f6373147712dd49c404785c1839f7e65 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Tue Jul 26 13:16:30 2011 -0400 Total Bandwidth prep code --- res/layout/layout_main.xml | 3 +- src/org/torproject/android/Orbot.java | 13 +++++++- .../torproject/android/service/ITorService.aidl | 5 +++ src/org/torproject/android/service/TorService.java | 33 +++++++++++++------ 4 files changed, 41 insertions(+), 13 deletions(-) diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml index 4fae719..1a25feb 100644 --- a/res/layout/layout_main.xml +++ b/res/layout/layout_main.xml @@ -105,7 +105,8 @@ android:gravity="center_vertical|center_horizontal" android:textStyle="bold" /> </RelativeLayout> - +</RelativeLayout> + </LinearLayout> </FrameLayout> diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 68e4aaf..f9c949d 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -768,7 +768,18 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener uploadText.setText(formatCount(datacount.Upload)); downloadText.invalidate(); uploadText.invalidate(); - + + try { + String TotalUpload = mService.getInfo("traffic/written"); + String TotalDownload = mService.getInfo("traffic/read"); + StringBuilder sb = new StringBuilder(); + sb.append("Total Upload " + TotalUpload); + sb.append("Total Download" + TotalDownload); + Log.d(TAG,sb.toString()); + } catch (RemoteException e) { + Log.d(TAG,"Total bandwidth error"+e.getMessage()); + } + break; default: diff --git a/src/org/torproject/android/service/ITorService.aidl b/src/org/torproject/android/service/ITorService.aidl index e643b4d..07fa808 100644 --- a/src/org/torproject/android/service/ITorService.aidl +++ b/src/org/torproject/android/service/ITorService.aidl @@ -48,4 +48,9 @@ interface ITorService { */ String getConfiguration (String name); + /** + * Get information + */ + String getInfo (String args); + } diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 01c693c..23921a9 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.StringTokenizer; import net.freehaven.tor.control.ConfigEntry; @@ -1120,14 +1121,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst sb.append("kb read / "); sb.append(written/1000); sb.append("kb written"); - /* try { - sb.append("Total upload :"+conn.getInfo("traffic/written")); - sb.append("Total Download "+conn.getInfo("traffic/read")); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - */ + logNotice(sb.toString()); } @@ -1136,7 +1130,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - + public void circuitStatus(String status, String circID, String path) { @@ -1274,8 +1268,25 @@ public class TorService extends Service implements TorServiceConstants, TorConst } } - - + + + public String getInfo (String key) { + try + { + if(conn !=null) + { + String m = conn.getInfo(key); + return m; + + } + } + catch(IOException ioe) + { + Log.e(TAG,"Unable to get Tor information",ioe); + logNotice("Unable to get Tor information"+ioe.getMessage()); + } + return null; + } public String getConfiguration (String name) {

1 0