dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleaned up override settings

This commit is contained in:
Nathan Freitas 2012-01-25 20:06:25 -05:00
parent e6d65dbae9
commit 857c302247
5 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/torproject/android/wizard/ConfigureTransProxy.java
View File

@ -117,7 +117,6 @@ public class ConfigureTransProxy extends Activity implements TorConstants {
back.setOnClickListener(new View.OnClickListener() { back.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) { public void onClick(View v) {
startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1);
@ -126,8 +125,6 @@ public class ConfigureTransProxy extends Activity implements TorConstants {
next.setOnClickListener(new View.OnClickListener() { next.setOnClickListener(new View.OnClickListener() {
//Dirty flag variable - improve logic
@Override
public void onClick(View v) { public void onClick(View v) {
showWizardFinal(); showWizardFinal();
@ -142,7 +139,6 @@ public class ConfigureTransProxy extends Activity implements TorConstants {
rb1.setOnClickListener(new OnClickListener() rb1.setOnClickListener(new OnClickListener()
{ {
@Override
public void onClick(View v) { public void onClick(View v) {
context.startActivity(new Intent(context, AppManager.class)); context.startActivity(new Intent(context, AppManager.class));
@ -157,7 +153,6 @@ public class ConfigureTransProxy extends Activity implements TorConstants {
mRadioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener (){ mRadioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener (){
@Override
public void onCheckedChanged(RadioGroup group, int checkedId){ public void onCheckedChanged(RadioGroup group, int checkedId){
Button next = ((Button)findViewById(R.id.btnWizard2)); Button next = ((Button)findViewById(R.id.btnWizard2));
next.setEnabled(true); next.setEnabled(true);
@ -212,7 +207,6 @@ public class ConfigureTransProxy extends Activity implements TorConstants {
DialogInterface.OnClickListener ocListener = new DialogInterface.OnClickListener() { DialogInterface.OnClickListener ocListener = new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
startActivityForResult(new Intent(getBaseContext(), Orbot.class), 1); startActivityForResult(new Intent(getBaseContext(), Orbot.class), 1);

3
src/org/torproject/android/wizard/LotsaText.java
View File

@ -95,7 +95,6 @@ public class LotsaText extends Activity implements TorConstants{
btn2.setOnClickListener(new View.OnClickListener() { btn2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) { public void onClick(View v) {
stepTwo(); stepTwo();
} }
@ -130,7 +129,6 @@ public class LotsaText extends Activity implements TorConstants{
btn1.setOnClickListener(new View.OnClickListener() { btn1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) { public void onClick(View v) {
stepOne(); stepOne();
@ -139,7 +137,6 @@ public class LotsaText extends Activity implements TorConstants{
btn2.setOnClickListener(new View.OnClickListener() { btn2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) { public void onClick(View v) {
startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1);
} }

6
src/org/torproject/android/wizard/Permissions.java
View File

@ -111,7 +111,6 @@ public class Permissions extends Activity implements TorConstants {
consent.setOnCheckedChangeListener(new OnCheckedChangeListener (){ consent.setOnCheckedChangeListener(new OnCheckedChangeListener (){
@Override
public void onCheckedChanged(CompoundButton buttonView, public void onCheckedChanged(CompoundButton buttonView,
boolean isChecked) { boolean isChecked) {
@ -142,7 +141,6 @@ public class Permissions extends Activity implements TorConstants {
grantPermissions.setOnClickListener(new View.OnClickListener() { grantPermissions.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) { public void onClick(View v) {
//Check and Install iptables - TorTransProxy.testOwnerModule(this) //Check and Install iptables - TorTransProxy.testOwnerModule(this)
@ -190,7 +188,6 @@ public class Permissions extends Activity implements TorConstants {
back.setOnClickListener(new View.OnClickListener() { back.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) { public void onClick(View v) {
startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1); startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1);
@ -201,7 +198,6 @@ public class Permissions extends Activity implements TorConstants {
next.setOnClickListener(new View.OnClickListener() { next.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) { public void onClick(View v) {
startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1); startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1);
} }
@ -239,7 +235,6 @@ public class Permissions extends Activity implements TorConstants {
btn1.setOnClickListener(new View.OnClickListener() { btn1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) { public void onClick(View v) {
startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1); startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1);
@ -248,7 +243,6 @@ public class Permissions extends Activity implements TorConstants {
btn2.setOnClickListener(new View.OnClickListener() { btn2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) { public void onClick(View v) {
startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1); startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1);
} }

6
src/org/torproject/android/wizard/TipsAndTricks.java
View File

@ -74,7 +74,6 @@ public class TipsAndTricks extends Activity implements TorConstants {
btn1.setOnClickListener(new OnClickListener() { btn1.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) { public void onClick(View view) {
String url = getString(R.string.gibberbot_apk_url); String url = getString(R.string.gibberbot_apk_url);
@ -87,7 +86,6 @@ public class TipsAndTricks extends Activity implements TorConstants {
btn2.setOnClickListener(new OnClickListener() { btn2.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) { public void onClick(View view) {
String url = getString(R.string.orweb_apk_url); String url = getString(R.string.orweb_apk_url);
@ -102,7 +100,6 @@ public class TipsAndTricks extends Activity implements TorConstants {
back.setOnClickListener(new View.OnClickListener() { back.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) { public void onClick(View v) {
startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1);
@ -111,7 +108,6 @@ public class TipsAndTricks extends Activity implements TorConstants {
next.setOnClickListener(new View.OnClickListener() { next.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) { public void onClick(View v) {
showWizardFinal(); showWizardFinal();
} }
@ -141,7 +137,6 @@ public class TipsAndTricks extends Activity implements TorConstants {
btn1.setOnClickListener(new View.OnClickListener() { btn1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) { public void onClick(View v) {
startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1);
@ -150,7 +145,6 @@ public class TipsAndTricks extends Activity implements TorConstants {
btn2.setOnClickListener(new View.OnClickListener() { btn2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) { public void onClick(View v) {
startActivityForResult(new Intent(getBaseContext(), Orbot.class), 1); startActivityForResult(new Intent(getBaseContext(), Orbot.class), 1);

12
src/org/torproject/android/wizard/WizardHelper.java
View File

@ -58,7 +58,6 @@ public class WizardHelper implements TorConstants {
showCustomDialog(title, view,context.getString(R.string.btn_next),null,new DialogInterface.OnClickListener() { showCustomDialog(title, view,context.getString(R.string.btn_next),null,new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
dialog.dismiss(); dialog.dismiss();
@ -90,7 +89,6 @@ public class WizardHelper implements TorConstants {
btn1.setOnClickListener(new OnClickListener() { btn1.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) { public void onClick(View view) {
boolean iCanHazRoot = TorServiceUtils.isRootPossible(); boolean iCanHazRoot = TorServiceUtils.isRootPossible();
@ -132,7 +130,6 @@ public class WizardHelper implements TorConstants {
cb1.setOnCheckedChangeListener(new OnCheckedChangeListener (){ cb1.setOnCheckedChangeListener(new OnCheckedChangeListener (){
@Override
public void onCheckedChanged(CompoundButton buttonView, public void onCheckedChanged(CompoundButton buttonView,
boolean isChecked) { boolean isChecked) {
@ -151,7 +148,6 @@ public class WizardHelper implements TorConstants {
showCustomDialog(title, view,context.getString(R.string.btn_next),context.getString(R.string.btn_back),new DialogInterface.OnClickListener() { showCustomDialog(title, view,context.getString(R.string.btn_next),context.getString(R.string.btn_back),new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
dialog.dismiss(); dialog.dismiss();
@ -183,11 +179,8 @@ public class WizardHelper implements TorConstants {
title = context.getString(R.string.wizard_permissions_root); title = context.getString(R.string.wizard_permissions_root);
msg = context.getString(R.string.wizard_premissions_msg_root); msg = context.getString(R.string.wizard_premissions_msg_root);
showDialog(title, msg,context.getString(R.string.btn_next),context.getString(R.string.btn_back),new DialogInterface.OnClickListener() { showDialog(title, msg,context.getString(R.string.btn_next),context.getString(R.string.btn_back),new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
dialog.dismiss(); dialog.dismiss();
@ -218,7 +211,6 @@ public class WizardHelper implements TorConstants {
btn1.setOnClickListener(new OnClickListener() { btn1.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) { public void onClick(View view) {
String url = context.getString(R.string.otrchat_apk_url); String url = context.getString(R.string.otrchat_apk_url);
@ -231,7 +223,6 @@ public class WizardHelper implements TorConstants {
btn2.setOnClickListener(new OnClickListener() { btn2.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) { public void onClick(View view) {
String url = context.getString(R.string.orweb_apk_url); String url = context.getString(R.string.orweb_apk_url);
@ -255,9 +246,6 @@ public class WizardHelper implements TorConstants {
*/ */
showCustomDialog(title, view,context.getString(R.string.btn_next),context.getString(R.string.btn_back),new DialogInterface.OnClickListener() { showCustomDialog(title, view,context.getString(R.string.btn_next),context.getString(R.string.btn_back),new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
dialog.dismiss(); dialog.dismiss();