caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Cleanup.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-08-27 12:36:15 +02:00
parent fdab7daf2c
commit c2ae0b7289
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
View file

@ -44,9 +44,6 @@ public class RuffyScripter {
private boolean started = false; private boolean started = false;
private final Object keylock = new Object();
private int keynotwait = 0;
private final Object screenlock = new Object(); private final Object screenlock = new Object();
public void start(IRuffyService newService) { public void start(IRuffyService newService) {
@ -79,7 +76,6 @@ public class RuffyScripter {
return started; return started;
} }
private boolean canDisconnect = false;
private volatile boolean connected = false; private volatile boolean connected = false;
private volatile long lastDisconnected = 0; private volatile long lastDisconnected = 0;
@ -96,13 +92,10 @@ public class RuffyScripter {
&& now > lastDisconnected + 15 * 1000) { && now > lastDisconnected + 15 * 1000) {
log.debug("Disconnecting after " + (connectionTimeOutMs / 1000) + "s inactivity timeout"); log.debug("Disconnecting after " + (connectionTimeOutMs / 1000) + "s inactivity timeout");
lastDisconnected = now; lastDisconnected = now;
canDisconnect = true;
ruffyService.doRTDisconnect(); ruffyService.doRTDisconnect();
connected = false; connected = false;
// don't attempt anything fancy in the next 10s, let the pump settle // don't attempt anything fancy in the next 10s, let the pump settle
SystemClock.sleep(10 * 1000); SystemClock.sleep(10 * 1000);
} else {
canDisconnect = false;
} }
} catch (Exception e) { } catch (Exception e) {
// TODO do we need to catch this exception somewhere else too? right now it's // TODO do we need to catch this exception somewhere else too? right now it's
@ -359,7 +352,6 @@ public class RuffyScripter {
SystemClock.sleep(10 * 1000); SystemClock.sleep(10 * 1000);
} }
canDisconnect = false;
boolean connectInitSuccessful = ruffyService.doRTConnect() == 0; boolean connectInitSuccessful = ruffyService.doRTConnect() == 0;
log.debug("Connect init successful: " + connectInitSuccessful); log.debug("Connect init successful: " + connectInitSuccessful);
log.debug("Waiting for first menu update to be sent"); log.debug("Waiting for first menu update to be sent");
@ -606,17 +598,17 @@ public class RuffyScripter {
private void pressKey(final byte key, long timeout) { private void pressKey(final byte key, long timeout) {
try { try {
ruffyService.rtSendKey(key, true); ruffyService.rtSendKey(key, true);
//SystemClock.sleep(200); SystemClock.sleep(200);
ruffyService.rtSendKey(Key.NO_KEY, true); ruffyService.rtSendKey(Key.NO_KEY, true);
if (timeout > 0) { // if (timeout > 0) {
synchronized (keylock) { // synchronized (keylock) {
keylock.wait(timeout); // keylock.wait(timeout);
} // }
} else { // } else {
synchronized (keylock) { // synchronized (keylock) {
keynotwait++; // keynotwait++;
} // }
} // }
} catch (Exception e) { } catch (Exception e) {
throw new CommandException().exception(e).message("Error while pressing buttons"); throw new CommandException().exception(e).message("Error while pressing buttons");
} }