status-im
/
syng-client
mirror of https://github.com/status-im/syng-client.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix ui thread freeze by adding 1 second timer.

This commit is contained in:
Adrian Tiberius 2015-06-25 05:23:28 +02:00
parent 316799f876
commit b24f4c4717
2 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/io/blockchainsociety/syng/EthereumService.java
View File

@ -17,7 +17,7 @@ public class EthereumService extends EthereumAidlService {
@Override @Override
protected void broadcastMessage(String message) { protected void broadcastMessage(String message) {
updateLog(message); //updateLog(message);
for (IListener listener: clientListeners) { for (IListener listener: clientListeners) {
try { try {
listener.trace(message); listener.trace(message);
@ -32,8 +32,8 @@ public class EthereumService extends EthereumAidlService {
EthereumService.log += message; EthereumService.log += message;
int logLength = EthereumService.log.length(); int logLength = EthereumService.log.length();
if (logLength > 100000) { if (logLength > 5000) {
EthereumService.log = EthereumService.log.substring(50000); EthereumService.log = EthereumService.log.substring(2000);
} }
} }

38
app/src/main/java/io/blockchainsociety/syng/MainActivity.java
View File

@ -17,12 +17,14 @@ import android.view.WindowManager;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import org.ethereum.android.EthereumAidlService;
import org.ethereum.android.interop.IAsyncCallback; import org.ethereum.android.interop.IAsyncCallback;
import org.ethereum.android.interop.IEthereumService; import org.ethereum.android.interop.IEthereumService;
import org.ethereum.android.interop.IListener; import org.ethereum.android.interop.IListener;
import org.ethereum.config.SystemProperties; import org.ethereum.config.SystemProperties;
import java.util.Timer;
import java.util.TimerTask;
public class MainActivity extends BaseActivity { public class MainActivity extends BaseActivity {
@ -38,6 +40,12 @@ public class MainActivity extends BaseActivity {
boolean isPaused = false; boolean isPaused = false;
private Timer timer;
private TimerTask timerTask;
private static int CONSOLE_LENGTH = 10000;
private static int CONSOLE_REFRESH = 1000;
TextViewUpdater consoleUpdater = new TextViewUpdater(); TextViewUpdater consoleUpdater = new TextViewUpdater();
private class TextViewUpdater implements Runnable { private class TextViewUpdater implements Runnable {
@ -105,7 +113,7 @@ public class MainActivity extends BaseActivity {
public void trace(String message) throws RemoteException { public void trace(String message) throws RemoteException {
logMessage(message); MainActivity.consoleLog += message + "\n" + "\n";
} }
}; };
@ -113,8 +121,8 @@ public class MainActivity extends BaseActivity {
MainActivity.consoleLog += message + "\n"; MainActivity.consoleLog += message + "\n";
int consoleLength = MainActivity.consoleLog.length(); int consoleLength = MainActivity.consoleLog.length();
if (consoleLength > 15000) { if (consoleLength > 5000) {
MainActivity.consoleLog = MainActivity.consoleLog.substring(consoleLength - 15000); MainActivity.consoleLog = MainActivity.consoleLog.substring(2000);
} }
consoleUpdater.setText(MainActivity.consoleLog); consoleUpdater.setText(MainActivity.consoleLog);
@ -176,6 +184,7 @@ public class MainActivity extends BaseActivity {
super.onPause(); super.onPause();
isPaused = true; isPaused = true;
timer.cancel();
} }
@Override @Override
@ -183,6 +192,27 @@ public class MainActivity extends BaseActivity {
super.onResume(); super.onResume();
isPaused = false; isPaused = false;
try {
timer = new Timer();
timerTask = new TimerTask() {
@Override
public void run() {
MainActivity.this.runOnUiThread(new Runnable() {
public void run() {
int length = MainActivity.consoleLog.length();
if (length > CONSOLE_LENGTH) {
MainActivity.consoleLog = MainActivity.consoleLog.substring(CONSOLE_LENGTH * ((length/CONSOLE_LENGTH)-1) + length%CONSOLE_LENGTH);
}
consoleUpdater.setText(MainActivity.consoleLog);
MainActivity.this.consoleText.post(consoleUpdater);
}
});
}
};
timer.schedule(timerTask, 1000, CONSOLE_REFRESH);
} catch (IllegalStateException e){
android.util.Log.i("Damn", "resume error");
}
} }
@Override @Override