- tor-commits - lists.torproject.org

[orbot/master] Added warning icon to Warning screen
by n8fr8＠torproject.org 28 Oct '11

28 Oct '11

commit 322284ef9b3b6af758ddab115685a7d688769c50 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Tue Jun 14 22:38:14 2011 +0530 Added warning icon to Warning screen --- res/drawable/warning.png | Bin 0 -> 2922 bytes res/layout/scrollingtext_buttons_view.xml | 8 +++++--- src/org/torproject/android/LotsaText.java | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/res/drawable/warning.png b/res/drawable/warning.png new file mode 100644 index 0000000..42dc6d6 Binary files /dev/null and b/res/drawable/warning.png differ diff --git a/res/layout/scrollingtext_buttons_view.xml b/res/layout/scrollingtext_buttons_view.xml index 930bf72..ebecfad 100644 --- a/res/layout/scrollingtext_buttons_view.xml +++ b/res/layout/scrollingtext_buttons_view.xml @@ -14,12 +14,12 @@ android:background="#000000" > <ImageView - android:src="@drawable/tor" + 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:paddingRight="20px" > + android:paddingLeft="20px" android:layout_marginLeft="10dip" android:layout_marginTop="8dip"> </ImageView> <TextView android:textColor="#FFFFFF" @@ -37,7 +37,9 @@ android:layout_centerInParent="true" - android:padding="20px"> + 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" > diff --git a/src/org/torproject/android/LotsaText.java b/src/org/torproject/android/LotsaText.java index 43e6d16..9f845db 100644 --- a/src/org/torproject/android/LotsaText.java +++ b/src/org/torproject/android/LotsaText.java @@ -73,8 +73,8 @@ public class LotsaText extends Activity implements TorConstants{ ImageView img = (ImageView) findViewById(R.id.orbot_image); btn1.setVisibility(Button.INVISIBLE); - img.setVisibility(ImageView.VISIBLE); - + img.setImageResource(R.drawable.tor); + btn2.setOnClickListener(new View.OnClickListener() { @Override @@ -108,7 +108,7 @@ public class LotsaText extends Activity implements TorConstants{ ImageView img = (ImageView) findViewById(R.id.orbot_image); btn1.setVisibility(Button.VISIBLE); - img.setVisibility(ImageView.INVISIBLE); + img.setImageResource(R.drawable.warning); btn1.setOnClickListener(new View.OnClickListener() {

1 0

[orbot/master] Calls new wizard onResume
by n8fr8＠torproject.org 28 Oct '11

28 Oct '11

commit 457bd78a46e52fbeae804b67b6f55501414f2f0b Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sat Jun 11 03:45:32 2011 +0530 Calls new wizard onResume --- src/org/torproject/android/Orbot.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 7f8af3b..f5f5f03 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -410,7 +410,7 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants pEdit.commit(); - new WizardHelper(this).showWizard(); + startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1); }

1 0

[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