mirror of
http://galexander.org/git/simplesshd.git
synced 2024-12-29 09:28:07 +00:00
add display of the dropbear.err log (it doesn't update yet)
This commit is contained in:
parent
932bfa3242
commit
b44b9295d5
@ -3,6 +3,14 @@
|
|||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="fill_parent">
|
android:layout_height="fill_parent">
|
||||||
|
<TextView android:id="@+id/log"
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:ellipsize="start"
|
||||||
|
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||||
|
android:typeface="monospace"
|
||||||
|
android:singleLine="false" />
|
||||||
<Button android:id="@+id/startstop"
|
<Button android:id="@+id/startstop"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
@ -7,14 +7,19 @@ import android.content.SharedPreferences;
|
|||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.widget.CheckBox;
|
import android.widget.CheckBox;
|
||||||
import android.widget.EditText;
|
import android.widget.EditText;
|
||||||
|
import android.widget.TextView;
|
||||||
import android.widget.Button;
|
import android.widget.Button;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileReader;
|
||||||
|
import java.io.BufferedReader;
|
||||||
|
|
||||||
public class SimpleSSHD extends Activity
|
public class SimpleSSHD extends Activity
|
||||||
{
|
{
|
||||||
|
private TextView log_view;
|
||||||
private Button startstop_view;
|
private Button startstop_view;
|
||||||
public static SimpleSSHD curr = null;
|
public static SimpleSSHD curr = null;
|
||||||
|
|
||||||
@ -22,12 +27,14 @@ public class SimpleSSHD extends Activity
|
|||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
Prefs.init(this);
|
Prefs.init(this);
|
||||||
setContentView(R.layout.main);
|
setContentView(R.layout.main);
|
||||||
|
log_view = (TextView)findViewById(R.id.log);
|
||||||
startstop_view = (Button)findViewById(R.id.startstop);
|
startstop_view = (Button)findViewById(R.id.startstop);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onResume() {
|
public void onResume() {
|
||||||
super.onResume();
|
super.onResume();
|
||||||
update_startstop();
|
update_startstop();
|
||||||
|
update_log();
|
||||||
curr = this;
|
curr = this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -73,4 +80,38 @@ public class SimpleSSHD extends Activity
|
|||||||
}
|
}
|
||||||
startService(i);
|
startService(i);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void update_log() {
|
||||||
|
String[] lines = new String[50];
|
||||||
|
int curr_line = 0;
|
||||||
|
boolean wrapped = false;
|
||||||
|
try {
|
||||||
|
File f = new File(Prefs.get_path(), "dropbear.err");
|
||||||
|
if (f.exists()) {
|
||||||
|
BufferedReader r = new BufferedReader(
|
||||||
|
new FileReader(f));
|
||||||
|
try {
|
||||||
|
String l;
|
||||||
|
while ((l = r.readLine()) != null) {
|
||||||
|
lines[curr_line++] = l;
|
||||||
|
if (curr_line >= lines.length) {
|
||||||
|
curr_line = 0;
|
||||||
|
wrapped = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
r.close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (Exception e) { }
|
||||||
|
int i;
|
||||||
|
i = (wrapped ? curr_line : 0);
|
||||||
|
String output = "";
|
||||||
|
do {
|
||||||
|
output = output + lines[i] + "\n";
|
||||||
|
i++;
|
||||||
|
i %= lines.length;
|
||||||
|
} while (i != curr_line);
|
||||||
|
log_view.setText(output);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user