October 2011 - tor-commits - lists.torproject.org

[orbot/master] Wizard UI/UX Refresh
by n8fr8＠torproject.org 28 Oct '11

28 Oct '11

commit d937ee3ca96af9d383f1f1f8ab100ac59a9abd9d Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Mon Jun 13 01:11:46 2011 +0530 Wizard UI/UX Refresh Added theme.xml, updated all the views. Changed radiobutton logic --- res/layout/layout_apps_item.xml | 1 + res/layout/layout_wizard_permissions.xml | 24 ++++++------ res/layout/layout_wizard_root.xml | 20 +++++----- res/layout/layout_wizard_tips.xml | 21 ++++++----- res/layout/scrollingtext_buttons_view.xml | 21 ++++++----- res/values/theme.xml | 9 +++++ .../torproject/android/ConfigureTransProxy.java | 36 +++++++++++-------- src/org/torproject/android/Permissions.java | 2 - src/org/torproject/android/TipsAndTricks.java | 35 ++++++++++++++++++- 9 files changed, 110 insertions(+), 59 deletions(-) diff --git a/res/layout/layout_apps_item.xml b/res/layout/layout_apps_item.xml index 8b4fc34..9d16efd 100644 --- a/res/layout/layout_apps_item.xml +++ b/res/layout/layout_apps_item.xml @@ -12,5 +12,6 @@ <CheckBox android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/itemcheck" ></CheckBox> </TableRow> + </TableLayout> diff --git a/res/layout/layout_wizard_permissions.xml b/res/layout/layout_wizard_permissions.xml index 7926750..151bb3e 100644 --- a/res/layout/layout_wizard_permissions.xml +++ b/res/layout/layout_wizard_permissions.xml @@ -3,49 +3,49 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:background="@drawable/background"> + android:layout_height="fill_parent"> <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/relativeLayout1" - android:layout_gravity="center_horizontal"> + 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:textColor="#00ff00" 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:id="@+id/TableRow01" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="fill_parent"> +<TableRow android:layout_margin="10dip" android:id="@+id/TableRow01" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="fill_parent"> <ScrollView android:id="@+id/helpscrollview" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:layout_span="3"> - <LinearLayout android:layout_width="wrap_content" android:id="@+id/linearLayout1" android:layout_height="wrap_content" android:orientation="vertical"> - <TextView android:layout_width="wrap_content" android:textColor="#ffffff" android:layout_height="wrap_content" android:background="#222222" android:textSize="8pt" android:id="@+id/WizardTextBody1" android:text="this is sample text this is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample text" android:padding="20dip"></TextView> + android:layout_span="3" + > + <LinearLayout android:background="#575757" android:layout_width="wrap_content" android:id="@+id/linearLayout1" android:layout_height="wrap_content" android:orientation="vertical"> + <TextView android:layout_width="wrap_content" android:textColor="#ffffff" android:layout_height="wrap_content" android:textSize="8pt" android:id="@+id/WizardTextBody1" android:text="this is sample text this is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample text" android:padding="20dip"></TextView> <Button android:layout_width="wrap_content" android:visibility="gone" android:layout_height="wrap_content" android:gravity="center" android:text="Grant Permission" android:id="@+id/grantPermissions" android:layout_gravity="center"></Button> - <TextView android:layout_width="wrap_content" android:visibility="gone" android:textColor="#ffffff" android:layout_height="wrap_content" android:background="#222222" android:textSize="8pt" android:id="@+id/WizardTextBody2" android:text="this is sample text this is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample text" android:padding="20dip"></TextView> - <CheckBox android:id="@+id/checkBox" android:visibility="gone" android:layout_gravity="center" android:text="@string/wizard_permissions_consent" android:layout_height="wrap_content" android:layout_width="wrap_content"></CheckBox> + <TextView android:layout_width="wrap_content" android:visibility="gone" android:textColor="#ffffff" android:layout_height="wrap_content" android:textSize="8pt" android:id="@+id/WizardTextBody2" android:text="this is sample text this is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample text" android:padding="20dip"></TextView> + <CheckBox android:id="@+id/checkBox" android:layout_gravity="center" android:text="@string/wizard_permissions_consent" android:layout_height="wrap_content" android:layout_width="wrap_content" android:gravity="center" android:visibility="visible"></CheckBox> </LinearLayout> </ScrollView> </TableRow> -<TableRow android:id="@+id/TableRow01" android:textColor="#00ff00" android:layout_width="fill_parent" android:layout_height="30px"> +<TableRow android:background="#000000" android:layout_marginTop="10dip" android:paddingTop="10dip" android:id="@+id/TableRow01" android:textColor="#00ff00" android:layout_width="fill_parent" android:layout_height="30px"> <Button android:text="Back" android:id="@+id/btnWizard1" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button> <Button android:text="Next" android:id="@+id/btnWizard2" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button> </TableRow> diff --git a/res/layout/layout_wizard_root.xml b/res/layout/layout_wizard_root.xml index d038a96..4c64035 100644 --- a/res/layout/layout_wizard_root.xml +++ b/res/layout/layout_wizard_root.xml @@ -3,30 +3,29 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:background="@drawable/background"> + android:layout_height="fill_parent"> <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/relativeLayout1" - android:layout_gravity="center_horizontal"> + 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:textColor="#00ff00" 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:id="@+id/TableRow01" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="fill_parent"> +<TableRow android:layout_margin="10dip" android:id="@+id/TableRow01" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="fill_parent"> <ScrollView android:id="@+id/helpscrollview" @@ -36,18 +35,19 @@ android:layout_span="3"> <LinearLayout + android:background="#575757" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent" android:padding="3px"> -<TextView android:text="@string/wizard_transproxy_msg" android:layout_width="wrap_content" android:textColor="#ffffff" android:layout_height="wrap_content" android:background="#222222" android:textSize="8pt" android:id="@+id/WizardTextBody1" android:padding="20dip"></TextView> -<RadioGroup android:id="@+id/radioGroup" android:layout_height="wrap_content" android:layout_width="wrap_content"> +<TextView android:text="@string/wizard_transproxy_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> +<RadioGroup android:id="@+id/radioGroup" android:layout_height="wrap_content" android:layout_width="wrap_content" android:paddingLeft="15dip"> <RadioButton android:checked="true" android:text="@string/wizard_configure_all" android:id="@+id/radio0" android:layout_height="wrap_content" android:layout_width="wrap_content"></RadioButton> <TextView android:layout_height="wrap_content" android:text="@string/wizard_transproxy_hint" android:layout_width="wrap_content" android:textSize="15sp" - android:paddingBottom="10dip"> + android:paddingBottom="10dip" android:paddingRight="20dip"> </TextView> <RadioButton android:text="@string/wizard_configure_select_apps" android:id="@+id/radio1" android:layout_height="wrap_content" android:layout_width="wrap_content"></RadioButton> <RadioButton android:text="@string/wizard_transproxy_none" android:id="@+id/radio2" android:layout_height="wrap_content" android:layout_width="wrap_content"></RadioButton> @@ -58,7 +58,7 @@ </ScrollView> </TableRow> -<TableRow android:id="@+id/TableRow01" android:textColor="#00ff00" android:layout_width="fill_parent" android:layout_height="30px"> +<TableRow android:background="#000000" android:layout_marginTop="10dip" android:paddingTop="10dip" android:id="@+id/TableRow01" android:textColor="#00ff00" android:layout_width="fill_parent" android:layout_height="30px"> <Button android:text="Back" android:id="@+id/btnWizard1" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button> <Button android:text="Next" android:id="@+id/btnWizard2" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button> </TableRow> diff --git a/res/layout/layout_wizard_tips.xml b/res/layout/layout_wizard_tips.xml index a9c4d0b..1b7b50b 100644 --- a/res/layout/layout_wizard_tips.xml +++ b/res/layout/layout_wizard_tips.xml @@ -3,30 +3,29 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:background="@drawable/background"> + android:layout_height="fill_parent"> <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/relativeLayout1" - android:layout_gravity="center_horizontal"> + 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:textColor="#00ff00" 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"> +<TableLayout android:id="@+id/TableLayout01" android:stretchColumns="*" android:layout_height="fill_parent" android:layout_width="wrap_content"> -<TableRow android:id="@+id/TableRow01" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="fill_parent"> +<TableRow android:layout_margin="10dip" android:id="@+id/TableRow01" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="fill_parent"> <ScrollView android:id="@+id/helpscrollview" @@ -36,12 +35,14 @@ android:layout_span="3"> <LinearLayout + android:background="#575757" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:padding="3px"> + android:paddingRight="20dip" + > -<TextView android:text="@string/wizard_tips_msg" android:layout_width="wrap_content" android:textColor="#ffffff" android:layout_height="wrap_content" android:background="#222222" android:textSize="8pt" android:id="@+id/WizardTextBody1" android:padding="20dip"></TextView> +<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_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:text="@string/wizard_tips_firefox" android:layout_gravity="left" android:drawableLeft="@drawable/icon_firefox" android:layout_marginTop="10px" android:id="@+id/WizardRootButtonInstallFirefox" android:layout_width="wrap_content" android:layout_height="wrap_content"/> @@ -52,7 +53,7 @@ </ScrollView> </TableRow> -<TableRow android:id="@+id/TableRow01" android:textColor="#00ff00" android:layout_width="fill_parent" android:layout_height="30px"> +<TableRow android:background="#000000" android:layout_marginTop="10dip" android:paddingTop="10dip" android:id="@+id/TableRow01" android:textColor="#00ff00" android:layout_width="fill_parent" android:layout_height="30px"> <Button android:text="Back" android:id="@+id/btnWizard1" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button> <Button android:text="Next" android:id="@+id/btnWizard2" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button> </TableRow> diff --git a/res/layout/scrollingtext_buttons_view.xml b/res/layout/scrollingtext_buttons_view.xml index 04023ff..930bf72 100644 --- a/res/layout/scrollingtext_buttons_view.xml +++ b/res/layout/scrollingtext_buttons_view.xml @@ -4,13 +4,15 @@ android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:background="@drawable/background"> + > <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/relativeLayout1" - android:layout_gravity="center_horizontal"> + android:layout_gravity="center_horizontal" + android:background="#000000" + > <ImageView android:src="@drawable/tor" android:id="@+id/orbot_image" @@ -19,7 +21,9 @@ android:layout_alignParentLeft="true" android:paddingLeft="20px" android:paddingRight="20px" > </ImageView> - <TextView android:textSize="10pt" + <TextView + android:textColor="#FFFFFF" + android:textSize="10pt" android:layout_toRightOf="@id/orbot_image" android:layout_alignParentTop="true" android:gravity="center_vertical" @@ -27,8 +31,7 @@ android:id="@+id/WizardTextTitle" android:layout_width="wrap_content" android:fadingEdge="vertical" - android:text="TITLE" - android:textColor="#00ff00" + android:text="TITLE" android:singleLine="true" @@ -37,9 +40,9 @@ android:padding="20px"> </TextView> </RelativeLayout> -<TableLayout android:id="@+id/TableLayout01" android:stretchColumns="*" android:layout_height="fill_parent" android:layout_width="wrap_content"> +<TableLayout android:id="@+id/TableLayout01" android:stretchColumns="*" android:layout_height="fill_parent" android:layout_width="wrap_content" > -<TableRow android:id="@+id/TableRow01" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="fill_parent"> +<TableRow android:id="@+id/TableRow01" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_margin="10dip"> <ScrollView android:id="@+id/helpscrollview" @@ -48,12 +51,12 @@ android:layout_height="fill_parent" android:layout_span="3"> - <TextView android:text="this is sample text this is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample text" android:background="#222222" android:textColor="#ffffff" android:id="@+id/WizardTextBody" android:textSize="8pt" android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="20dip"></TextView> + <TextView android:background="#575757" android:text="this is sample text this is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample text" android:textColor="#ffffff" android:id="@+id/WizardTextBody" android:textSize="8pt" android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="20dip"></TextView> </ScrollView> </TableRow> -<TableRow android:id="@+id/TableRow01" android:textColor="#00ff00" android:layout_width="fill_parent" android:layout_height="30px"> +<TableRow android:background="#000000" android:id="@+id/TableRow01" android:textColor="#00ff00" android:layout_width="fill_parent" android:layout_height="30px" android:layout_marginTop="10dip" android:paddingTop="10dip"> <Button android:text="Back" android:id="@+id/btnWizard1" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button> <Button android:text="Next" android:id="@+id/btnWizard2" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button> </TableRow> diff --git a/res/values/theme.xml b/res/values/theme.xml new file mode 100644 index 0000000..efc15c4 --- /dev/null +++ b/res/values/theme.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> + +<resources> + <color name="custom_theme_color">#333</color> + <style name="DefaultTheme" parent="@android:style/Theme.Black.NoTitleBar"> + <item name="android:windowBackground">@drawable/bgtitanium</item> + <item name="android:windowNoTitle">true</item> + </style> +</resources> diff --git a/src/org/torproject/android/ConfigureTransProxy.java b/src/org/torproject/android/ConfigureTransProxy.java index 3f0f31c..4e9405b 100644 --- a/src/org/torproject/android/ConfigureTransProxy.java +++ b/src/org/torproject/android/ConfigureTransProxy.java @@ -81,22 +81,24 @@ public class ConfigureTransProxy extends Activity implements TorConstants { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); Editor pEdit = prefs.edit(); - pEdit.putBoolean(PREF_TRANSPARENT, rb0.isChecked()); pEdit.putBoolean(PREF_TRANSPARENT_ALL, rb0.isChecked()); - pEdit.commit(); + + if(rb0.isChecked()) + { + pEdit.putString("radiobutton","rb0"); + pEdit.commit(); + } - - if(rb1.isChecked()) + else if(rb1.isChecked()) { flag = 1; - SharedPreferences prefs1 = PreferenceManager.getDefaultSharedPreferences(context); - - Editor pEdit1 = prefs1.edit(); - pEdit1.putBoolean(PREF_TRANSPARENT, true); - pEdit1.putBoolean(PREF_TRANSPARENT_ALL, false); - pEdit1.commit(); + + pEdit.putBoolean(PREF_TRANSPARENT, true); + pEdit.putBoolean(PREF_TRANSPARENT_ALL, false); + pEdit.putString("radiobutton","rb1"); + pEdit.commit(); next.setOnClickListener(new View.OnClickListener() { @@ -109,7 +111,11 @@ public class ConfigureTransProxy extends Activity implements TorConstants { } }); } - + else if(rb2.isChecked()) + { + pEdit.putString("radiobutton", "rb2"); + pEdit.commit(); + } } }); @@ -127,7 +133,8 @@ public class ConfigureTransProxy extends Activity implements TorConstants { }); next.setOnClickListener(new View.OnClickListener() { - + + //Dirty flag variable - improve logic @Override public void onClick(View v) { if( flag == 1 ) @@ -152,8 +159,8 @@ public class ConfigureTransProxy extends Activity implements TorConstants { @Override public void onClick(DialogInterface dialog, int which) { - //close wizard - return to orbot - + context.startActivity(new Intent(context, Orbot.class)); + } }; @@ -164,7 +171,6 @@ public class ConfigureTransProxy extends Activity implements TorConstants { .setPositiveButton(R.string.button_close, ocListener) .setMessage(msg) .show(); - diff --git a/src/org/torproject/android/Permissions.java b/src/org/torproject/android/Permissions.java index 4b74c55..1c5b10c 100644 --- a/src/org/torproject/android/Permissions.java +++ b/src/org/torproject/android/Permissions.java @@ -80,12 +80,10 @@ public class Permissions extends Activity implements TorConstants { if (hasRoot) { - Toast.makeText(context, "Has Root", Toast.LENGTH_SHORT).show(); stepFourRoot(); } else { - Toast.makeText(context, "Unable to get root access", Toast.LENGTH_LONG).show(); stepFour(); } diff --git a/src/org/torproject/android/TipsAndTricks.java b/src/org/torproject/android/TipsAndTricks.java index a3aa1ef..ebb5ad3 100644 --- a/src/org/torproject/android/TipsAndTricks.java +++ b/src/org/torproject/android/TipsAndTricks.java @@ -1,7 +1,9 @@ package org.torproject.android; import android.app.Activity; +import android.app.AlertDialog; import android.content.Context; +import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; import android.os.Bundle; @@ -98,9 +100,40 @@ public class TipsAndTricks extends Activity implements TorConstants { @Override public void onClick(View v) { - //Finsh Screen + showWizardFinal(); } }); } + + private void showWizardFinal () + { + String title = null; + String msg = null; + + + title = context.getString(R.string.wizard_final); + msg = context.getString(R.string.wizard_final_msg); + + DialogInterface.OnClickListener ocListener = new DialogInterface.OnClickListener() { + + @Override + public void onClick(DialogInterface dialog, int which) { + context.startActivity(new Intent(context, Orbot.class)); + + } + }; + + + new AlertDialog.Builder(context) + .setIcon(R.drawable.icon) + .setTitle(title) + .setPositiveButton(R.string.button_close, ocListener) + .setMessage(msg) + .show(); + + + + + } } \ No newline at end of file

1 0

[orbot/master] Added the AndroidManifest
by n8fr8＠torproject.org 28 Oct '11

28 Oct '11

commit eb3a09ae06cd7b822d1105815663a0ad254b59a6 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Mon Jun 13 01:15:44 2011 +0530 Added the AndroidManifest --- AndroidManifest.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 030bbff..a27e2c1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -5,7 +5,7 @@ <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> - <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="false"> + <application android:theme="@style/DefaultTheme" android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="false"> <activity android:name=".Orbot" android:theme="@android:style/Theme.NoTitleBar">

1 0

[orbot/master] Updated RadioButtons in ConfigureTransProxy
by n8fr8＠torproject.org 28 Oct '11

28 Oct '11

commit fbdeb71974a4ea3567b5f6cb7b6962ab9c5a19cf Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Mon Jun 13 15:40:34 2011 +0530 Updated RadioButtons in ConfigureTransProxy All the RadioButtons are unchecked by default. The next button is disabled until a RadioButton is checked. --- res/layout/layout_wizard_root.xml | 2 +- .../torproject/android/ConfigureTransProxy.java | 52 +++++++++++--------- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/res/layout/layout_wizard_root.xml b/res/layout/layout_wizard_root.xml index 4c64035..443106e 100644 --- a/res/layout/layout_wizard_root.xml +++ b/res/layout/layout_wizard_root.xml @@ -42,7 +42,7 @@ android:padding="3px"> <TextView android:text="@string/wizard_transproxy_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> <RadioGroup android:id="@+id/radioGroup" android:layout_height="wrap_content" android:layout_width="wrap_content" android:paddingLeft="15dip"> - <RadioButton android:checked="true" android:text="@string/wizard_configure_all" android:id="@+id/radio0" android:layout_height="wrap_content" android:layout_width="wrap_content"></RadioButton> + <RadioButton android:text="@string/wizard_configure_all" android:id="@+id/radio0" android:layout_height="wrap_content" android:layout_width="wrap_content"></RadioButton> <TextView android:layout_height="wrap_content" android:text="@string/wizard_transproxy_hint" android:layout_width="wrap_content" diff --git a/src/org/torproject/android/ConfigureTransProxy.java b/src/org/torproject/android/ConfigureTransProxy.java index 4e9405b..d515aae 100644 --- a/src/org/torproject/android/ConfigureTransProxy.java +++ b/src/org/torproject/android/ConfigureTransProxy.java @@ -57,6 +57,32 @@ public class ConfigureTransProxy extends Activity implements TorConstants { String title = context.getString(R.string.wizard_transproxy_title); TextView txtTitle = ((TextView)findViewById(R.id.WizardTextTitle)); txtTitle.setText(title); + + Button back = ((Button)findViewById(R.id.btnWizard1)); + Button next = ((Button)findViewById(R.id.btnWizard2)); + next.setEnabled(false); + + back.setOnClickListener(new View.OnClickListener() { + + @Override + public void onClick(View v) { + + startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); + } + }); + + next.setOnClickListener(new View.OnClickListener() { + + //Dirty flag variable - improve logic + @Override + public void onClick(View v) { + if( flag == 1 ) + context.startActivity(new Intent(context, AppManager.class)); + + else + showWizardFinal(); + } + }); RadioGroup mRadioGroup = (RadioGroup)findViewById(R.id.radioGroup); mRadioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener (){ @@ -65,6 +91,7 @@ public class ConfigureTransProxy extends Activity implements TorConstants { @Override public void onCheckedChanged(RadioGroup group, int checkedId){ Button next = ((Button)findViewById(R.id.btnWizard2)); + next.setEnabled(true); next.setOnClickListener(new View.OnClickListener() { @Override @@ -120,30 +147,7 @@ public class ConfigureTransProxy extends Activity implements TorConstants { } }); - Button back = ((Button)findViewById(R.id.btnWizard1)); - Button next = ((Button)findViewById(R.id.btnWizard2)); - - back.setOnClickListener(new View.OnClickListener() { - - @Override - public void onClick(View v) { - - startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); - } - }); - - next.setOnClickListener(new View.OnClickListener() { - - //Dirty flag variable - improve logic - @Override - public void onClick(View v) { - if( flag == 1 ) - context.startActivity(new Intent(context, AppManager.class)); - - else - showWizardFinal(); - } - }); + } private void showWizardFinal ()

1 0

[orbot/master] Updated TorServiceUtils.checkRootAccess()
by n8fr8＠torproject.org 28 Oct '11

28 Oct '11

commit e63c745808ac9020983e872c5deac190d4f884de Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Tue Jun 28 09:12:52 2011 +0530 Updated TorServiceUtils.checkRootAccess() checkRootAccess() now checks if 'su' binary and Superuser.apk exist to check if the phone has root access --- .../android/service/TorServiceUtils.java | 37 +++++++++++++++++++- 1 files changed, 36 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java index 2aa58e6..657d525 100644 --- a/src/org/torproject/android/service/TorServiceUtils.java +++ b/src/org/torproject/android/service/TorServiceUtils.java @@ -17,7 +17,9 @@ public class TorServiceUtils implements TorServiceConstants { * Check if we have root access * @return boolean true if we have root */ - public static boolean checkRootAccess() { + /* + public static boolean checkRootAccess() { + StringBuilder log = new StringBuilder(); @@ -45,7 +47,40 @@ public class TorServiceUtils implements TorServiceConstants { TorService.logMessage("Could not acquire root permissions"); return false; } + */ + public static boolean checkRootAccess(){ + + StringBuilder log = new StringBuilder(); + + try { + + // Check if Superuser.apk exists + File file = new File("/system/app/Superuser.apk"); + + //Check for 'su' binary + String[] cmd = {"which su"}; + int exitCode = TorServiceUtils.doShellCommand(cmd, log, false, true); + + if (file.exists() && exitCode == 0) { + TorService.logMessage("Can acquire root permissions"); + return true; + + } + + } catch (IOException e) { + //this means that there is no root to be had (normally) so we won't log anything + TorService.logException("Error checking for root access",e); + + } + catch (Exception e) { + TorService.logException("Error checking for root access",e); + //this means that there is no root to be had (normally) + } + + TorService.logMessage("Could not acquire root permissions"); + return false; + } public static int findProcessId(String command)

1 0

[orbot/master] updated to manifest
by n8fr8＠torproject.org 28 Oct '11

28 Oct '11

commit 9b3419ec3f58d423ac749e3636ff662d4ad16f6f Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Jul 24 15:38:41 2011 -0400 updated to manifest --- AndroidManifest.xml | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 23c2805..4876f40 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -28,8 +28,12 @@ <action android:name="org.torproject.android.START_TOR" /> </intent-filter> </activity> - - <activity android:name=".SettingsPreferences" android:label="@string/app_name"/> + + <activity android:name=".LotsaText"/> + <activity android:name=".Permissions"/> + <activity android:name=".TipsAndTricks"/> + <activity android:name=".ConfigureTransProxy"/> + <activity android:name=".SettingsPreferences" android:label="@string/app_name"/> <activity android:name=".AppManager" android:label="@string/app_name"/> <activity android:name=".WizardActivity" android:label="@string/app_name"/>

1 0

[orbot/master] Updated Permissions
by n8fr8＠torproject.org 28 Oct '11

28 Oct '11

commit d9e0ede79743ee65ab10f1036c3ee003fa023078 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Tue Jun 28 09:14:43 2011 +0530 Updated Permissions Asks for superuser privileges after user clicks "Grant Permissions" and checks for iptables OWNER module --- src/org/torproject/android/Permissions.java | 62 +++++++++++++++++---------- 1 files changed, 39 insertions(+), 23 deletions(-) diff --git a/src/org/torproject/android/Permissions.java b/src/org/torproject/android/Permissions.java index 1c5b10c..2ee4f7e 100644 --- a/src/org/torproject/android/Permissions.java +++ b/src/org/torproject/android/Permissions.java @@ -51,27 +51,6 @@ public class Permissions extends Activity implements TorConstants { private void stepThree(){ boolean hasRoot = TorServiceUtils.checkRootAccess(); - - if (hasRoot) - { - try { - int resp = TorTransProxy.testOwnerModule(context); - - if (resp < 0) - { - hasRoot = false; - Toast.makeText(context, "ERROR: IPTables OWNER module not available", Toast.LENGTH_LONG).show(); - - Log.i(TorService.TAG,"ERROR: IPTables OWNER module not available"); - } - - } catch (Exception e) { - - hasRoot = false; - Log.d(TorService.TAG,"ERROR: IPTables OWNER module not available",e); - } - } - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); Editor pEdit = prefs.edit(); @@ -149,6 +128,31 @@ public class Permissions extends Activity implements TorConstants { @Override public void onClick(View v) { //Check and Install iptables - TorTransProxy.testOwnerModule(this) + + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + boolean hasRoot = prefs.getBoolean("has_root",false); + + if (hasRoot) + { + try { + int resp = TorTransProxy.testOwnerModule(context); + + if (resp < 0) + { + hasRoot = false; + Toast.makeText(context, "ERROR: IPTables OWNER module not available", Toast.LENGTH_LONG).show(); + + Log.i(TorService.TAG,"ERROR: IPTables OWNER module not available"); + stepFour(); + } + + } catch (Exception e) { + + hasRoot = false; + Log.d(TorService.TAG,"ERROR: IPTables OWNER module not available",e); + } + } + startActivityForResult(new Intent(getBaseContext(), ConfigureTransProxy.class), 1); @@ -185,12 +189,24 @@ public class Permissions extends Activity implements TorConstants { TextView txtTitle = ((TextView)findViewById(R.id.WizardTextTitle)); txtTitle.setText(title); - TextView txtBody = ((TextView)findViewById(R.id.WizardTextBody)); + TextView txtBody = ((TextView)findViewById(R.id.WizardTextBody1)); txtBody.setText(msg); Button btn1 = ((Button)findViewById(R.id.btnWizard1)); Button btn2 = ((Button)findViewById(R.id.btnWizard2)); - + btn2.setEnabled(true); + + + TextView txtBody2 = ((TextView)findViewById(R.id.WizardTextBody2)); + txtBody2.setVisibility(TextView.GONE); + + Button grantPermissions = ((Button)findViewById(R.id.grantPermissions)); + grantPermissions.setVisibility(Button.GONE); + + + CheckBox consent = (CheckBox)findViewById(R.id.checkBox); + consent.setVisibility(CheckBox.GONE); + btn1.setOnClickListener(new View.OnClickListener() { @Override

1 0

[orbot/master] removed large tor, added split up binary
by n8fr8＠torproject.org 28 Oct '11

28 Oct '11

commit 9c31399663ed0b32a043dd3afe7aa566bfe1ff3a Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jul 25 10:49:46 2011 -0400 removed large tor, added split up binary --- res/raw/tor | Bin 3188430 -> 0 bytes res/raw/toraa | Bin 0 -> 1048576 bytes res/raw/torab | Bin 0 -> 1048576 bytes res/raw/torac | Bin 0 -> 1048576 bytes res/raw/torad | Bin 0 -> 108367 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/raw/tor b/res/raw/tor deleted file mode 100755 index 46aa1fa..0000000 Binary files a/res/raw/tor and /dev/null differ diff --git a/res/raw/toraa b/res/raw/toraa new file mode 100644 index 0000000..a522212 Binary files /dev/null and b/res/raw/toraa differ diff --git a/res/raw/torab b/res/raw/torab new file mode 100644 index 0000000..3631f9e Binary files /dev/null and b/res/raw/torab differ diff --git a/res/raw/torac b/res/raw/torac new file mode 100644 index 0000000..bb24253 Binary files /dev/null and b/res/raw/torac differ diff --git a/res/raw/torad b/res/raw/torad new file mode 100644 index 0000000..9a88db0 Binary files /dev/null and b/res/raw/torad differ

1 0

[orbot/master] updated version for tethering
by n8fr8＠torproject.org 28 Oct '11

28 Oct '11

commit 8dffdba34fb0b540eebe59f9e06a89bbfea0e154 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Jul 24 14:29:42 2011 -0400 updated version for tethering --- AndroidManifest.xml | 2 +- CHANGELOG | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d01b58e..23c2805 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.torproject.android" android:versionName="0.2.2.25-orbot-alpha-1.0.5.2" android:versionCode="14"> + package="org.torproject.android" android:versionName="0.2.2.25-orbot-alpha-1.0.5.3" android:versionCode="15"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> diff --git a/CHANGELOG b/CHANGELOG index 449b037..0721fda 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,8 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +1.0.5.3 +- added auto-tor of wireless and usb tethering + 1.0.5.1/.2 - small updates to layout of main screen to fit smaller screens - fixed preference setting of EntryNode torrc value

1 0

[orbot/master] Minor changes to LotsaText.java
by n8fr8＠torproject.org 28 Oct '11

28 Oct '11

commit d7c15dd81bead96956cd5164c287c2729b60f409 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Tue Jun 28 09:20:01 2011 +0530 Minor changes to LotsaText.java Now shows "Introduction" screen when the app is installed for the first time. --- src/org/torproject/android/LotsaText.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/android/LotsaText.java b/src/org/torproject/android/LotsaText.java index 9f845db..1b0656b 100644 --- a/src/org/torproject/android/LotsaText.java +++ b/src/org/torproject/android/LotsaText.java @@ -34,7 +34,7 @@ public class LotsaText extends Activity implements TorConstants{ SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); - boolean wizardScreen1 = prefs.getBoolean("wizardscreen1",false); + boolean wizardScreen1 = prefs.getBoolean("wizardscreen1",true); if(wizardScreen1) stepOne(); else

1 0

[orbot/master] Merge branch 'wizard'
by n8fr8＠torproject.org 28 Oct '11

28 Oct '11

commit cd6c533a7189a126384377f0d4e8bc2f700f776f Merge: 9b3419e d7c15dd Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Jul 24 17:09:30 2011 -0400 Merge branch 'wizard' Conflicts: res/values/strings.xml src/org/torproject/android/Orbot.java AUTHORS | 2 +- AndroidManifest.xml | 2 +- res/drawable/icon_firefox.png | Bin 0 -> 9233 bytes res/drawable/icon_orweb.png | Bin 8783 -> 0 bytes res/drawable/icon_otrchat.png | Bin 4610 -> 0 bytes res/drawable/proxymob.png | Bin 0 -> 11265 bytes res/drawable/warning.png | Bin 0 -> 2922 bytes res/layout/layout_apps_item.xml | 3 +- res/layout/layout_wizard_permissions.xml | 55 +++ res/layout/layout_wizard_root.xml | 64 +++- res/layout/layout_wizard_tips.xml | 56 ++- res/layout/scrollingtext_buttons_view.xml | 68 +++ res/values/strings.xml | 31 ++- res/values/theme.xml | 9 + .../torproject/android/ConfigureTransProxy.java | 183 ++++++++ src/org/torproject/android/LotsaText.java | 133 ++++++ src/org/torproject/android/Orbot.java | 438 +++++++++----------- src/org/torproject/android/Permissions.java | 229 ++++++++++ src/org/torproject/android/TipsAndTricks.java | 139 +++++++ src/org/torproject/android/WizardActivity.java | 71 ---- src/org/torproject/android/WizardHelper.java | 10 +- .../android/service/TorServiceUtils.java | 37 ++- 22 files changed, 1190 insertions(+), 340 deletions(-) diff --cc res/layout/layout_wizard_permissions.xml index 0000000,151bb3e..1ba5fec mode 000000,100644..100644 --- a/res/layout/layout_wizard_permissions.xml +++ b/res/layout/layout_wizard_permissions.xml @@@ -1,0 -1,55 +1,55 @@@ + <?xml version="1.0" encoding="utf-8"?> + + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent"> + + <RelativeLayout - android:layout_width="match_parent" ++ 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"> + + + <ScrollView android:id="@+id/helpscrollview" + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_span="3" + > + <LinearLayout android:background="#575757" android:layout_width="wrap_content" android:id="@+id/linearLayout1" android:layout_height="wrap_content" android:orientation="vertical"> + <TextView android:layout_width="wrap_content" android:textColor="#ffffff" android:layout_height="wrap_content" android:textSize="8pt" android:id="@+id/WizardTextBody1" android:text="this is sample text this is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample text" android:padding="20dip"></TextView> + <Button android:layout_width="wrap_content" android:visibility="gone" android:layout_height="wrap_content" android:gravity="center" android:text="Grant Permission" android:id="@+id/grantPermissions" android:layout_gravity="center"></Button> + <TextView android:layout_width="wrap_content" android:visibility="gone" android:textColor="#ffffff" android:layout_height="wrap_content" android:textSize="8pt" android:id="@+id/WizardTextBody2" android:text="this is sample text this is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample text" android:padding="20dip"></TextView> + <CheckBox android:id="@+id/checkBox" android:layout_gravity="center" android:text="@string/wizard_permissions_consent" android:layout_height="wrap_content" android:layout_width="wrap_content" android:gravity="center" android:visibility="visible"></CheckBox> + </LinearLayout> + + </ScrollView> + + </TableRow> + <TableRow android:background="#000000" android:layout_marginTop="10dip" android:paddingTop="10dip" android:id="@+id/TableRow01" android:textColor="#00ff00" android:layout_width="fill_parent" android:layout_height="30px"> + <Button android:text="Back" android:id="@+id/btnWizard1" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button> + <Button android:text="Next" android:id="@+id/btnWizard2" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button> + </TableRow> + </TableLayout> + </LinearLayout> + + diff --cc res/layout/layout_wizard_root.xml index f71c284,443106e..530d917 --- a/res/layout/layout_wizard_root.xml +++ b/res/layout/layout_wizard_root.xml @@@ -3,8 -3,31 +3,31 @@@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="fill_parent" - android:layout_height="wrap_content"> + android:layout_height="fill_parent"> + + <RelativeLayout - android:layout_width="match_parent" ++ 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"> + + <ScrollView android:id="@+id/helpscrollview" android:orientation="vertical" android:layout_width="fill_parent" diff --cc res/layout/layout_wizard_tips.xml index 19aaef0,1b7b50b..17ddb88 --- a/res/layout/layout_wizard_tips.xml +++ b/res/layout/layout_wizard_tips.xml @@@ -3,8 -3,31 +3,31 @@@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="fill_parent" - android:layout_height="wrap_content"> + android:layout_height="fill_parent"> + + <RelativeLayout - android:layout_width="match_parent" ++ 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"> + + <ScrollView android:id="@+id/helpscrollview" android:orientation="vertical" android:layout_width="fill_parent" diff --cc res/layout/scrollingtext_buttons_view.xml index 0000000,ebecfad..df59922 mode 000000,100644..100644 --- a/res/layout/scrollingtext_buttons_view.xml +++ b/res/layout/scrollingtext_buttons_view.xml @@@ -1,0 -1,68 +1,68 @@@ + <?xml version="1.0" encoding="utf-8"?> + + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + > + + <RelativeLayout - android:layout_width="match_parent" ++ android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:id="@+id/relativeLayout1" + android:layout_gravity="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="20px" android:layout_marginLeft="10dip" android:layout_marginTop="8dip"> + </ImageView> + <TextView + android:textColor="#FFFFFF" + android:textSize="10pt" + android:layout_toRightOf="@id/orbot_image" + android:layout_alignParentTop="true" + android:gravity="center_vertical" + android:layout_height="wrap_content" + android:id="@+id/WizardTextTitle" + android:layout_width="wrap_content" + android:fadingEdge="vertical" + android:text="TITLE" + android:singleLine="true" + + + + android:layout_centerInParent="true" + android:paddingLeft="5px" + android:padding="20px" + > + </TextView> + </RelativeLayout> + <TableLayout android:id="@+id/TableLayout01" android:stretchColumns="*" android:layout_height="fill_parent" android:layout_width="wrap_content" > + + <TableRow android:id="@+id/TableRow01" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_margin="10dip"> + + + <ScrollView android:id="@+id/helpscrollview" + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_span="3"> + + <TextView android:background="#575757" android:text="this is sample text this is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample text" android:textColor="#ffffff" android:id="@+id/WizardTextBody" android:textSize="8pt" android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="20dip"></TextView> + + </ScrollView> + + </TableRow> + <TableRow android:background="#000000" android:id="@+id/TableRow01" android:textColor="#00ff00" android:layout_width="fill_parent" android:layout_height="30px" android:layout_marginTop="10dip" android:paddingTop="10dip"> + <Button android:text="Back" android:id="@+id/btnWizard1" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button> + <Button android:text="Next" android:id="@+id/btnWizard2" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button> + </TableRow> + </TableLayout> + </LinearLayout> + + diff --cc res/values/strings.xml index 1a5daf3,720c03c..6a82430 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@@ -130,9 -124,30 +130,32 @@@ <string name="pref_general_group">General</string> <string name="pref_start_boot_title">Start Orbot on Boot</string> <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string> - - <string name="pref_transparent_tethering_title">Tor Tethering</string> +  +  - <string name="wizard_title">Orbot</string> + <string name="wizard_title_msg">Orbot brings Tor to Android \n\nTor helps you defend against a form of network surveillance that threatens privacy, confidential business activity and relationships, and state security known as traffic analysis</string> +  + <string name="wizard_warning_title">Warning</string> + <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nPlease follow the following steps to get started</string> +  + <string name="wizard_permissions_title">Permissions</string> + <string name="wizard_permissions_root_msg1">Orbot has detected that you have root permissions enabled. To enable \'Transparent Proxying\', please grant superuser privileges to Orbot</string> + <string name="wizard_permissions_root_msg2">If you choose to continue without providing superuser privileges, make sure to use apps made to work with orbot</string> + <string name="wizard_permissions_msg">Orbot has detected that you do not have root permissions.\nTransparent Proxying is not possible without superuser privileges.\nMake sure to use apps that have been configured to work with Orbot</string> - <string name="wizard_permissions_consent">I understand and would like to continue without root</string> +  + <string name="wizard_tips_title">Orbot configured Apps</string> + <string name="wizard_tips_gibberbot">Gibberbot - Secure instant messaging client for Android</string> + <string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> + <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string> + <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> + <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string> + <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/a…</string> +  + <string name="wizard_transproxy_title">Transparent Proxy</string> + <string name="wizard_transproxy_msg">Transparent Proxying allows you to redirect client requests without any special configuration or knowledge at the client.</string> + <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string> + <string name="wizard_transproxy_none">None</string> ++ ++ <string name="pref_transparent_tethering_title">Tor Tethering</string> + <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices</string> - - ++ </resources> diff --cc src/org/torproject/android/Orbot.java index 690ce10,f5f5f03..7374822 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@@ -147,353 -137,305 +150,317 @@@ public class Orbot extends Activity imp /* When a menu item is selected launch the appropriate view or activity * (non-Javadoc) - * @see android.app.Activity#onMenuItemSelected(int, android.view.MenuItem) - */ - public boolean onMenuItemSelected(int featureId, MenuItem item) { - - super.onMenuItemSelected(featureId, item); - - if (item.getItemId() == 1) - { - - try - { - - if (mService == null) - { - - } - else if (mService.getStatus() == STATUS_READY) - { - if (mItemOnOff != null) - mItemOnOff.setTitle(R.string.menu_stop); - startTor(); - - } - else - { - if (mItemOnOff != null) - mItemOnOff.setTitle(R.string.menu_start); - stopTor(); - - } - - } - catch (RemoteException re) - { - Log.w(TAG, "Unable to start/top Tor from menu UI", re); - } - } - else if (item.getItemId() == 4) - { - showSettings(); - } - else if (item.getItemId() == 3) - { - showHelp(); - } - else if (item.getItemId() == 7) - { - doTorCheck(); - } - else if (item.getItemId() == 8) - { - //exit app - doExit(); - - - } - else if (item.getItemId() == 6) - { - showAbout(); - - - } - + * @see android.app.Activity#onMenuItemSelected(int, android.view.MenuItem) + */ + public boolean onMenuItemSelected(int featureId, MenuItem item) { + + super.onMenuItemSelected(featureId, item); + + if (item.getItemId() == 1) + { + + try + { + + if (mService == null) + { + + } + else if (mService.getStatus() == STATUS_READY) + { + if (mItemOnOff != null) + mItemOnOff.setTitle(R.string.menu_stop); + startTor(); + + } + else + { + if (mItemOnOff != null) + mItemOnOff.setTitle(R.string.menu_start); + stopTor(); + + } + + } + catch (RemoteException re) + { + Log.w(TAG, "Unable to start/top Tor from menu UI", re); + } + } + else if (item.getItemId() == 4) + { + showSettings(); + } + else if (item.getItemId() == 3) + { + showHelp(); + } + else if (item.getItemId() == 7) + { + doTorCheck(); + } + else if (item.getItemId() == 8) + { + //exit app + doExit(); + + + } + else if (item.getItemId() == 6) + { + showAbout(); + + + } + return true; - } - - private void doExit () - { - try { - - stopTor(); - - stopService(new Intent(ITorService.class.getName())); - - NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); - mNotificationManager.cancelAll(); - - - } catch (RemoteException e) { - Log.w(TAG, e); - } - - finish(); - - } - - /* Return to the main view when the back key is pressed - * (non-Javadoc) - * @see android.app.Activity#onKeyDown(int, android.view.KeyEvent) - */ - /* - public boolean onKeyDown(int keyCode, KeyEvent event){ - - if(keyCode==KeyEvent.KEYCODE_BACK){ - - if(currentView != R.layout.layout_main){ - - showMain (); - return true; - } - else{ - return super.onKeyDown(keyCode, event); - } - } - - return super.onKeyDown(keyCode, event); - - }*/ + } + + /** + * This is our attempt to REALLY exit Orbot, and stop the background service + * However, Android doesn't like people "quitting" apps, and/or our code may not + * be quite right b/c no matter what we do, it seems like the TorService still exists + **/ + private void doExit () + { + try { + + //one of the confusing things about all of this code is the multiple + //places where things like "stopTor" are called, both in the Activity and the Service + //not something to tackle in your first iteration, but i thin we can talk about fixing + //terminology but also making sure there are clear distinctions in control + stopTor(); + + //perhaps this should be referenced as INTENT_TOR_SERVICE as in startService + stopService(new Intent(ITorService.class.getName())); + + //clears all notifications from the status bar + NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); + mNotificationManager.cancelAll(); + + + } catch (RemoteException e) { + Log.w(TAG, e); + } + + finish(); + + } + + /* Return to the main view when the back key is pressed + * (non-Javadoc) + * @see android.app.Activity#onKeyDown(int, android.view.KeyEvent) + */ + /* + public boolean onKeyDown(int keyCode, KeyEvent event){ + + //yeah this should probably go away now :) - or not + if(keyCode==KeyEvent.KEYCODE_BACK){ + + if(currentView != R.layout.layout_main){ + + showMain (); + return true; + } + else{ + return super.onKeyDown(keyCode, event); + } + } + + return super.onKeyDown(keyCode, event); + + }*/ /* (non-Javadoc) - * @see android.app.Activity#onPause() - */ - protected void onPause() { - super.onPause(); - - hideProgressDialog(); + * @see android.app.Activity#onPause() + */ + protected void onPause() { + super.onPause(); + + hideProgressDialog(); - if (aDialog != null) - aDialog.dismiss(); - } + if (aDialog != null) + aDialog.dismiss(); + } - /** - * i think we need to suport this onSave/Restore code more b/c i think - * when someone rotates the screen, and the state is lost during setup - * etc it causes problems. this might be the place to solve that in the wizard - hmm this prob coz android restarts the activity when the screen is rotated. this will prob be fixed(?) when - we redesign the wizard into a view not just a dialogbox - cool - **/ - public void onSaveInstanceState(Bundle savedInstanceState) { - // Save UI state changes to the savedInstanceState. - // This bundle will be passed to onCreate if the process is - // killed and restarted. - // etc. - super.onSaveInstanceState(savedInstanceState); - } - - public void onRestoreInstanceState(Bundle savedInstanceState) { - super.onRestoreInstanceState(savedInstanceState); - // Restore UI state from the savedInstanceState. - // This bundle has also been passed to onCreate. - - //we do nothing here - } - - /** - * confirm with the user that they want to open a browser to connect to https://check.torproject.org - and then launch the URL. - this may be where the TorCheck API code/UI is added, though always offering the web-based confirm - should be an option, since users know it - - **/ - private void doTorCheck () - { - - DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() { - - @Override - public void onClick(DialogInterface dialog, int which) { - switch (which){ - case DialogInterface.BUTTON_POSITIVE: - - openBrowser(URL_TOR_CHECK); + public void onSaveInstanceState(Bundle savedInstanceState) { + // Save UI state changes to the savedInstanceState. + // This bundle will be passed to onCreate if the process is + // killed and restarted. + // etc. + super.onSaveInstanceState(savedInstanceState); + } + + public void onRestoreInstanceState(Bundle savedInstanceState) { + super.onRestoreInstanceState(savedInstanceState); + // Restore UI state from the savedInstanceState. + // This bundle has also been passed to onCreate. + + } + + private void doTorCheck () + { + + DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() { + + @Override + public void onClick(DialogInterface dialog, int which) { + switch (which){ + case DialogInterface.BUTTON_POSITIVE: + + openBrowser(URL_TOR_CHECK); - - - break; + + + break; - case DialogInterface.BUTTON_NEGATIVE: - - //do nothing - break; - } - } - }; + case DialogInterface.BUTTON_NEGATIVE: + + //do nothing + break; + } + } + }; - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setMessage(R.string.tor_check).setPositiveButton(R.string.btn_okay, dialogClickListener) - .setNegativeButton(R.string.btn_cancel, dialogClickListener).show(); + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setMessage(R.string.tor_check).setPositiveButton(R.string.btn_okay, dialogClickListener) + .setNegativeButton(R.string.btn_cancel, dialogClickListener).show(); - } - - /** - * this adds a port to the list of hidden service ports - * we might want to add remove/disable port too - * this is used by external apps that launch an intent - * to request a hidden service on a specific port - * currently, we haven't promoted this intent API or capability - * that much, but we hope to - **/ - private void enableHiddenServicePort (int hsPort) - { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - Editor pEdit = prefs.edit(); - - String hsPortString = prefs.getString("pref_hs_ports", ""); - - if (hsPortString.length() > 0 && hsPortString.indexOf(hsPort+"")==-1) - hsPortString += ',' + hsPort; - else - hsPortString = hsPort + ""; - - pEdit.putString("pref_hs_ports", hsPortString); - pEdit.putBoolean("pref_hs_enable", true); - - pEdit.commit(); - - String onionHostname = prefs.getString("pref_hs_hostname",""); + } + + private void enableHiddenServicePort (int hsPort) + { + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + Editor pEdit = prefs.edit(); + + String hsPortString = prefs.getString("pref_hs_ports", ""); + + if (hsPortString.length() > 0 && hsPortString.indexOf(hsPort+"")==-1) + hsPortString += ',' + hsPort; + else + hsPortString = hsPort + ""; + + pEdit.putString("pref_hs_ports", hsPortString); + pEdit.putBoolean("pref_hs_enable", true); + + pEdit.commit(); + + String onionHostname = prefs.getString("pref_hs_hostname",""); - Intent nResult = new Intent(); - nResult.putExtra("hs_host", onionHostname); - setResult(RESULT_OK, nResult); - - } - - /* (non-Javadoc) - * @see android.app.Activity#onResume() - */ - protected void onResume() { - super.onResume(); - - //this is where we make sure we have a handle to ITorService - bindService(); - - //this is a hack which basically pings the ITorService to update our status for the UI - // - the dialogbox/progressbar ? - // right, this was for when the label displayed the status, and not the progress, so it may - // not make as much sense now; there is a bunch of loose ends like this that should be - // cleaned up with the transition to the progressdialog - ok - updateStatus(""); - - //this checks if we were launched via an Intent call from another app or activity - //- how does this matter? if Orbot has been launched via an Intent or not ? - //we want to know if this is a launch by the user from the home screen, or via back, or some - // standard interaction, or if it is another app launching Orbot for a programmatic/API request - // this is how we can add more functionality into ORlib, for instance via Intent launching - hmm ok - if (getIntent() == null) - return; - - String action = getIntent().getAction(); - - if (action == null) - return; - - //this relates to the previously discussed hidden port capability - if (action.equals("org.torproject.android.REQUEST_HS_PORT")) - { - - //tell the user an app is trying to open a hidden port and ask for permission - DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - switch (which){ - case DialogInterface.BUTTON_POSITIVE: - - int hsPort = getIntent().getIntExtra("hs_port", -1); - - enableHiddenServicePort (hsPort); - - finish(); - - - break; + Intent nResult = new Intent(); + nResult.putExtra("hs_host", onionHostname); + setResult(RESULT_OK, nResult); + + } + + /* (non-Javadoc) + * @see android.app.Activity#onResume() + */ + protected void onResume() { + super.onResume(); + + bindService(); + + updateStatus(""); + + if (getIntent() == null) + return; + + String action = getIntent().getAction(); + + if (action == null) + return; + + if (action.equals("org.torproject.android.REQUEST_HS_PORT")) + { + + DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + switch (which){ + case DialogInterface.BUTTON_POSITIVE: + + int hsPort = getIntent().getIntExtra("hs_port", -1); + + enableHiddenServicePort (hsPort); + + finish(); + + + break; - case DialogInterface.BUTTON_NEGATIVE: - //No button clicked - finish(); - break; - } - } - }; + case DialogInterface.BUTTON_NEGATIVE: + //No button clicked + finish(); + break; + } + } + }; - int hsPort = getIntent().getIntExtra("hs_port", -1); + int hsPort = getIntent().getIntExtra("hs_port", -1); - String requestMsg = "An app wants to open a server port (" + hsPort + ") to the Tor network. This is safe if you trust the app."; - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setMessage(requestMsg).setPositiveButton("Allow", dialogClickListener) - .setNegativeButton("Deny", dialogClickListener).show(); - - - } - else if (action.equals("org.torproject.android.START_TOR")) //this is the intent used to start Tor from another app, again meant for ORlib functionality - { - autoStartOnBind = true; - - if (mService == null) - bindService(); - - } - else - { - //hmm not sure when this is ever reached honestly ;P - //but it looks like a general UI reset - - NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); - mNotificationManager.cancelAll(); - - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - - boolean showWizard = prefs.getBoolean("show_wizard",true); - - if (showWizard) - { - - Editor pEdit = prefs.edit(); - - pEdit.putBoolean("show_wizard",false); - - pEdit.commit(); - - new WizardHelper(this).showWizard(); + String requestMsg = "An app wants to open a server port (" + hsPort + ") to the Tor network. This is safe if you trust the app."; + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setMessage(requestMsg).setPositiveButton("Allow", dialogClickListener) + .setNegativeButton("Deny", dialogClickListener).show(); + + + } + else if (action.equals("org.torproject.android.START_TOR")) + { + autoStartOnBind = true; + + if (mService == null) + bindService(); + + } + else + { + + //setTitle(getString(R.string.app_name) + ' ' + getString(R.string.app_version)); + + NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); + mNotificationManager.cancelAll(); + + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + + boolean showWizard = prefs.getBoolean("show_wizard",true); + + if (showWizard) + { + + Editor pEdit = prefs.edit(); + + pEdit.putBoolean("show_wizard",false); + + pEdit.commit(); + + startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1); - } - - } - } + } + + } + } - /* (non-Javadoc) - * @see android.app.Activity#onStart() - */ - protected void onStart() { - super.onStart(); - - - updateStatus (""); - - } + /* (non-Javadoc) + * @see android.app.Activity#onStart() + */ + protected void onStart() { + super.onStart(); + + + updateStatus (""); + + } - /* (non-Javadoc) - * @see android.app.Activity#onStop() - */ - protected void onStop() { - super.onStop(); - - //unbindService(); - } + /* (non-Javadoc) + * @see android.app.Activity#onStop() + */ + protected void onStop() { + super.onStop(); + + //unbindService(); + }

1 0