1
0
mirror of http://galexander.org/git/simplesshd.git synced 2024-11-14 02:59:05 +00:00

don't include "IP: " in notification string

This commit is contained in:
Greg Alexander 2016-10-17 09:53:45 -04:00
parent 4134decdc3
commit bf8c204a8c
2 changed files with 12 additions and 7 deletions

View File

@ -49,7 +49,7 @@ public class SimpleSSHD extends Activity
update_startstop_prime();
updater = new UpdaterThread();
updater.start();
ip_view.setText(get_ip());
ip_view.setText(get_ip(true));
if (Prefs.get_onopen() && !SimpleSSHDService.is_started()) {
startService(new Intent(this, SimpleSSHDService.class));
@ -195,7 +195,7 @@ public class SimpleSSHD extends Activity
}
}
public static String get_ip() {
public static String get_ip(boolean pretty) {
String ret = "";
try {
List<NetworkInterface> interfaces = Collections.list(NetworkInterface.getNetworkInterfaces());
@ -209,10 +209,14 @@ public class SimpleSSHD extends Activity
if (i != -1) {
ip = ip.substring(0,i);
}
if (!ret.equals("")) {
ret += "\n";
if (pretty) {
if (!ret.equals("")) {
ret += "\n";
}
ret += "IP: "+ ip;
} else {
return ip;
}
ret += "IP: "+ ip;
}
}
}

View File

@ -74,8 +74,9 @@ public class SimpleSSHDService extends Service {
n.contentView.setImageViewResource(R.id.n_icon,
R.drawable.icon);
n.contentView.setTextViewText(R.id.n_text,
"SimpleSSHD listening on "+SimpleSSHD.get_ip()+
":"+Prefs.get_port());
"SimpleSSHD listening on " +
SimpleSSHD.get_ip(false) +
":" + Prefs.get_port());
startForeground(1, n);
}