aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/fil/libre/repwifiapp/activities/NetworkDetailsActivity.java
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/fil/libre/repwifiapp/activities/NetworkDetailsActivity.java')
-rw-r--r--app/src/fil/libre/repwifiapp/activities/NetworkDetailsActivity.java20
1 files changed, 18 insertions, 2 deletions
diff --git a/app/src/fil/libre/repwifiapp/activities/NetworkDetailsActivity.java b/app/src/fil/libre/repwifiapp/activities/NetworkDetailsActivity.java
index 325d546..f2a8944 100644
--- a/app/src/fil/libre/repwifiapp/activities/NetworkDetailsActivity.java
+++ b/app/src/fil/libre/repwifiapp/activities/NetworkDetailsActivity.java
@@ -22,6 +22,7 @@ package fil.libre.repwifiapp.activities;
import java.util.Date;
import fil.libre.repwifiapp.ActivityLauncher;
+import fil.libre.repwifiapp.Commons;
import fil.libre.repwifiapp.R;
import fil.libre.repwifiapp.helpers.AccessPointInfo;
import android.os.Bundle;
@@ -69,6 +70,12 @@ public class NetworkDetailsActivity extends Activity implements OnCheckedChangeL
}
@Override
+ protected void onStart() {
+ super.onStart();
+ currentNetwork = Commons.storage.getSavedNetwork(currentNetwork);
+ };
+
+ @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_manage_networks, menu);
@@ -88,17 +95,26 @@ public class NetworkDetailsActivity extends Activity implements OnCheckedChangeL
if (lastused > 0) {
Date ts = new Date(lastused);
String formstring = "dd-MMM-yyyy kk:mm:ss";
- v.append("\nLast Used: " + DateFormat.format(formstring, ts));
+ v.append("\n" + getString(R.string.text_netinfo_last_used) + ": "
+ + DateFormat.format(formstring, ts));
}
if (showPassword) {
- v.append("\n\nPassword:\n" + this.currentNetwork.getPassword());
+ v.append("\n\n" + getString(R.string.text_password) + ":\n" + this.currentNetwork.getPassword());
} else {
v.append("\n\n\n");
}
}
+ public void btnIpSettingsClick(View v){
+ new ActivityLauncher(this).launchIpSettingsActivity(currentNetwork);
+ }
+
+ public void btnVpnSettingsClick(View v){
+ new ActivityLauncher(this).launchVpnSettingsActivity(currentNetwork);
+ }
+
public void btnDeleteClick(View v) {
String msg = getResources().getString(R.string.msg_confirm_delete_network);