diff options
Diffstat (limited to 'app/src/fil/libre/repwifiapp/activities')
5 files changed, 15 insertions, 21 deletions
diff --git a/app/src/fil/libre/repwifiapp/activities/InputPasswordActivity.java b/app/src/fil/libre/repwifiapp/activities/InputPasswordActivity.java index e46d7d9..239c082 100644 --- a/app/src/fil/libre/repwifiapp/activities/InputPasswordActivity.java +++ b/app/src/fil/libre/repwifiapp/activities/InputPasswordActivity.java @@ -63,8 +63,7 @@ public class InputPasswordActivity extends Activity implements OnCheckedChangeLi @Override public boolean onCreateOptionsMenu(Menu menu) { - //super.onCreateOptionsMenu(menu); - //getMenuInflater().inflate(R.menu.activity_input_password, menu); + //disable menu return true; } @@ -74,12 +73,14 @@ public class InputPasswordActivity extends Activity implements OnCheckedChangeLi if(buttonView == findViewById(R.id.chk_show_pass)){ chkShowPassChanged(); } + } public void onBtnNextClick(View v){ EditText txpass = (EditText)findViewById(R.id.txt_password); String pass = txpass.getText().toString(); + if (pass.length()>0){ this.apinfo.setPassword(pass); @@ -87,11 +88,11 @@ public class InputPasswordActivity extends Activity implements OnCheckedChangeLi Intent intent = new Intent(); intent.putExtra(Commons.EXTRA_APINFO, this.apinfo); setResult(RESULT_OK, intent); + finish(); } - - + } public void chkShowPassChanged(){ @@ -102,9 +103,11 @@ public class InputPasswordActivity extends Activity implements OnCheckedChangeLi if (c.isChecked()){ txtPass.setInputType(InputType.TYPE_TEXT_VARIATION_PASSWORD); txtPass.setSelection(txtPass.getText().length()); + }else{ txtPass.setInputType(129); txtPass.setSelection(txtPass.getText().length()); + } } diff --git a/app/src/fil/libre/repwifiapp/activities/LongTaskActivity.java b/app/src/fil/libre/repwifiapp/activities/LongTaskActivity.java index f9e7685..63063d8 100644 --- a/app/src/fil/libre/repwifiapp/activities/LongTaskActivity.java +++ b/app/src/fil/libre/repwifiapp/activities/LongTaskActivity.java @@ -96,7 +96,8 @@ public class LongTaskActivity extends Activity { case Commons.RequestCode.CONNECT: setTitle("Connecting..."); - setMessage("Connecting..."); + setMessage("Connecting..."); + //Extract AccessPointInfo input = intent.getExtras().getSerializable(Commons.EXTRA_APINFO); currentNetwork = (AccessPointInfo)input; @@ -167,7 +168,7 @@ public class LongTaskActivity extends Activity { @Override public void onBackPressed() { - //suppress + //suppress back button } diff --git a/app/src/fil/libre/repwifiapp/activities/MainActivity.java b/app/src/fil/libre/repwifiapp/activities/MainActivity.java index abe7dc2..aa179fb 100644 --- a/app/src/fil/libre/repwifiapp/activities/MainActivity.java +++ b/app/src/fil/libre/repwifiapp/activities/MainActivity.java @@ -20,12 +20,7 @@ package fil.libre.repwifiapp.activities; - - - - import java.io.IOException; - import fil.libre.repwifiapp.Commons; import fil.libre.repwifiapp.R; import fil.libre.repwifiapp.Commons.RequestCode; @@ -34,9 +29,7 @@ import fil.libre.repwifiapp.helpers.ConnectionStatus; import fil.libre.repwifiapp.helpers.NetworkManager; import fil.libre.repwifiapp.helpers.RootCommand; import fil.libre.repwifiapp.helpers.Utils; - import android.os.Bundle; -import android.R.integer; import android.app.Activity; import android.app.AlertDialog; import android.content.DialogInterface; diff --git a/app/src/fil/libre/repwifiapp/activities/NetworkDetailsActivity.java b/app/src/fil/libre/repwifiapp/activities/NetworkDetailsActivity.java index f0aa26d..6d7ed56 100644 --- a/app/src/fil/libre/repwifiapp/activities/NetworkDetailsActivity.java +++ b/app/src/fil/libre/repwifiapp/activities/NetworkDetailsActivity.java @@ -86,6 +86,7 @@ public class NetworkDetailsActivity extends Activity implements OnCheckedChangeL v.append("\nBSSID: " + this.currentNetwor.getBSSID()); long lastused = this.currentNetwor.getLastTimeUsed(); + if (lastused > 0){ Date ts = new Date(lastused); String formstring = "dd-MMM-yyyy kk:mm:ss"; @@ -94,7 +95,8 @@ public class NetworkDetailsActivity extends Activity implements OnCheckedChangeL if (showPassword){ v.append("\n\nPassword:\n" + this.currentNetwor.getPassword()); - }else{ + } + else{ v.append("\n\n\n"); } @@ -117,7 +119,7 @@ public class NetworkDetailsActivity extends Activity implements OnCheckedChangeL dlgAlert.setNegativeButton(no,new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int whichButton) { - //nothing + return; } }); diff --git a/app/src/fil/libre/repwifiapp/activities/SelectNetworkActivity.java b/app/src/fil/libre/repwifiapp/activities/SelectNetworkActivity.java index 6731846..9b07246 100644 --- a/app/src/fil/libre/repwifiapp/activities/SelectNetworkActivity.java +++ b/app/src/fil/libre/repwifiapp/activities/SelectNetworkActivity.java @@ -20,15 +20,11 @@ package fil.libre.repwifiapp.activities; - - - import fil.libre.repwifiapp.Commons; import fil.libre.repwifiapp.R; import fil.libre.repwifiapp.helpers.AccessPointInfo; import fil.libre.repwifiapp.helpers.NetworkButton; import fil.libre.repwifiapp.helpers.Utils; - import android.os.Bundle; import android.app.Activity; import android.content.Intent; @@ -60,8 +56,7 @@ public class SelectNetworkActivity extends Activity implements OnClickListener { @Override public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - //getMenuInflater().inflate(R.menu.activity_select_network, menu); + //Suppress menu button return true; } |