From 857c30224764ab2a443e8b7b6af8f1b4a37723f6 Mon Sep 17 00:00:00 2001 From: Nathan Freitas Date: Wed, 25 Jan 2012 20:06:25 -0500 Subject: [PATCH] cleaned up override settings --- .../android/wizard/ConfigureTransProxy.java | 6 ------ src/org/torproject/android/wizard/LotsaText.java | 3 --- src/org/torproject/android/wizard/Permissions.java | 6 ------ src/org/torproject/android/wizard/TipsAndTricks.java | 6 ------ src/org/torproject/android/wizard/WizardHelper.java | 12 ------------ 5 files changed, 33 deletions(-) diff --git a/src/org/torproject/android/wizard/ConfigureTransProxy.java b/src/org/torproject/android/wizard/ConfigureTransProxy.java index 54336d47..79cb4771 100644 --- a/src/org/torproject/android/wizard/ConfigureTransProxy.java +++ b/src/org/torproject/android/wizard/ConfigureTransProxy.java @@ -117,7 +117,6 @@ public class ConfigureTransProxy extends Activity implements TorConstants { back.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); @@ -126,8 +125,6 @@ public class ConfigureTransProxy extends Activity implements TorConstants { next.setOnClickListener(new View.OnClickListener() { - //Dirty flag variable - improve logic - @Override public void onClick(View v) { showWizardFinal(); @@ -142,7 +139,6 @@ public class ConfigureTransProxy extends Activity implements TorConstants { rb1.setOnClickListener(new OnClickListener() { - @Override public void onClick(View v) { context.startActivity(new Intent(context, AppManager.class)); @@ -157,7 +153,6 @@ public class ConfigureTransProxy extends Activity implements TorConstants { mRadioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener (){ - @Override public void onCheckedChanged(RadioGroup group, int checkedId){ Button next = ((Button)findViewById(R.id.btnWizard2)); next.setEnabled(true); @@ -212,7 +207,6 @@ public class ConfigureTransProxy extends Activity implements TorConstants { DialogInterface.OnClickListener ocListener = new DialogInterface.OnClickListener() { - @Override public void onClick(DialogInterface dialog, int which) { startActivityForResult(new Intent(getBaseContext(), Orbot.class), 1); diff --git a/src/org/torproject/android/wizard/LotsaText.java b/src/org/torproject/android/wizard/LotsaText.java index 5af1e39c..3393157e 100644 --- a/src/org/torproject/android/wizard/LotsaText.java +++ b/src/org/torproject/android/wizard/LotsaText.java @@ -95,7 +95,6 @@ public class LotsaText extends Activity implements TorConstants{ btn2.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { stepTwo(); } @@ -130,7 +129,6 @@ public class LotsaText extends Activity implements TorConstants{ btn1.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { stepOne(); @@ -139,7 +137,6 @@ public class LotsaText extends Activity implements TorConstants{ btn2.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); } diff --git a/src/org/torproject/android/wizard/Permissions.java b/src/org/torproject/android/wizard/Permissions.java index 5e17b674..760d71f7 100644 --- a/src/org/torproject/android/wizard/Permissions.java +++ b/src/org/torproject/android/wizard/Permissions.java @@ -111,7 +111,6 @@ public class Permissions extends Activity implements TorConstants { consent.setOnCheckedChangeListener(new OnCheckedChangeListener (){ - @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { @@ -142,7 +141,6 @@ public class Permissions extends Activity implements TorConstants { grantPermissions.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { //Check and Install iptables - TorTransProxy.testOwnerModule(this) @@ -190,7 +188,6 @@ public class Permissions extends Activity implements TorConstants { back.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1); @@ -201,7 +198,6 @@ public class Permissions extends Activity implements TorConstants { next.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1); } @@ -239,7 +235,6 @@ public class Permissions extends Activity implements TorConstants { btn1.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1); @@ -248,7 +243,6 @@ public class Permissions extends Activity implements TorConstants { btn2.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1); } diff --git a/src/org/torproject/android/wizard/TipsAndTricks.java b/src/org/torproject/android/wizard/TipsAndTricks.java index ca8e4169..4aff6094 100644 --- a/src/org/torproject/android/wizard/TipsAndTricks.java +++ b/src/org/torproject/android/wizard/TipsAndTricks.java @@ -74,7 +74,6 @@ public class TipsAndTricks extends Activity implements TorConstants { btn1.setOnClickListener(new OnClickListener() { - @Override public void onClick(View view) { String url = getString(R.string.gibberbot_apk_url); @@ -87,7 +86,6 @@ public class TipsAndTricks extends Activity implements TorConstants { btn2.setOnClickListener(new OnClickListener() { - @Override public void onClick(View view) { String url = getString(R.string.orweb_apk_url); @@ -102,7 +100,6 @@ public class TipsAndTricks extends Activity implements TorConstants { back.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); @@ -111,7 +108,6 @@ public class TipsAndTricks extends Activity implements TorConstants { next.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { showWizardFinal(); } @@ -141,7 +137,6 @@ public class TipsAndTricks extends Activity implements TorConstants { btn1.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); @@ -150,7 +145,6 @@ public class TipsAndTricks extends Activity implements TorConstants { btn2.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { startActivityForResult(new Intent(getBaseContext(), Orbot.class), 1); diff --git a/src/org/torproject/android/wizard/WizardHelper.java b/src/org/torproject/android/wizard/WizardHelper.java index 881d38db..8180094f 100644 --- a/src/org/torproject/android/wizard/WizardHelper.java +++ b/src/org/torproject/android/wizard/WizardHelper.java @@ -58,7 +58,6 @@ public class WizardHelper implements TorConstants { showCustomDialog(title, view,context.getString(R.string.btn_next),null,new DialogInterface.OnClickListener() { - @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); @@ -90,7 +89,6 @@ public class WizardHelper implements TorConstants { btn1.setOnClickListener(new OnClickListener() { - @Override public void onClick(View view) { boolean iCanHazRoot = TorServiceUtils.isRootPossible(); @@ -132,7 +130,6 @@ public class WizardHelper implements TorConstants { cb1.setOnCheckedChangeListener(new OnCheckedChangeListener (){ - @Override public void onCheckedChanged(CompoundButton buttonView, 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() { - @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); @@ -183,11 +179,8 @@ public class WizardHelper implements TorConstants { title = context.getString(R.string.wizard_permissions_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() { - @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); @@ -218,7 +211,6 @@ public class WizardHelper implements TorConstants { btn1.setOnClickListener(new OnClickListener() { - @Override public void onClick(View view) { String url = context.getString(R.string.otrchat_apk_url); @@ -231,7 +223,6 @@ public class WizardHelper implements TorConstants { btn2.setOnClickListener(new OnClickListener() { - @Override public void onClick(View view) { 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() { - - - @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss();