From 42462e1c95cfb4389070b6f970f69dbf1e8e77fd Mon Sep 17 00:00:00 2001
From: Roberta De Viti <rdeviti@mpi-sws.org>
Date: Tue, 11 Dec 2018 21:16:02 +0100
Subject: [PATCH] print exception

---
 .../main/java/org/mpisws/testapp/simulator/Alarm.java  |  4 ++++
 .../org/mpisws/testapp/simulator/NullWakelock.java     |  4 ++++
 .../mpisws/testapp/simulator/SimulationClientBT.java   | 10 ++++++++--
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 testapp/src/main/java/org/mpisws/testapp/simulator/Alarm.java
 create mode 100644 testapp/src/main/java/org/mpisws/testapp/simulator/NullWakelock.java

diff --git a/testapp/src/main/java/org/mpisws/testapp/simulator/Alarm.java b/testapp/src/main/java/org/mpisws/testapp/simulator/Alarm.java
new file mode 100644
index 00000000..55d50631
--- /dev/null
+++ b/testapp/src/main/java/org/mpisws/testapp/simulator/Alarm.java
@@ -0,0 +1,4 @@
+package org.mpisws.testapp.simulator;
+
+public class Alarm {
+}
diff --git a/testapp/src/main/java/org/mpisws/testapp/simulator/NullWakelock.java b/testapp/src/main/java/org/mpisws/testapp/simulator/NullWakelock.java
new file mode 100644
index 00000000..257ba6fb
--- /dev/null
+++ b/testapp/src/main/java/org/mpisws/testapp/simulator/NullWakelock.java
@@ -0,0 +1,4 @@
+package org.mpisws.testapp.simulator;
+
+public class NullWakelock {
+}
diff --git a/testapp/src/main/java/org/mpisws/testapp/simulator/SimulationClientBT.java b/testapp/src/main/java/org/mpisws/testapp/simulator/SimulationClientBT.java
index edd76cee..5f27e13b 100644
--- a/testapp/src/main/java/org/mpisws/testapp/simulator/SimulationClientBT.java
+++ b/testapp/src/main/java/org/mpisws/testapp/simulator/SimulationClientBT.java
@@ -29,7 +29,7 @@ import java.util.UUID;
  */
 public class SimulationClientBT {
     Context context;
-    protected static final int NUM_SIMULATED_DEVICES = 100;
+    protected static final int NUM_SIMULATED_DEVICES = 10;
     protected static final int NUM_SIMULATED_EPOCHS = 10;
 
     private static final String TAG = SimulationClientBT.class.getSimpleName();
@@ -115,10 +115,13 @@ public class SimulationClientBT {
     }
 
     private void sendDHKeysOverSocket(BluetoothSocket sock) {
+
         try {
+
             if (sock == null) return;
             OutputStream os = sock.getOutputStream();
             ObjectOutputStream out = new ObjectOutputStream(os);
+
             out.writeObject(mSharedSecrets);
             out.writeObject(otherDHNonces);
             out.writeObject(otherDHPubKeys);
@@ -130,12 +133,15 @@ public class SimulationClientBT {
             Log.d(TAG, "Got response: " + line);
 
             in.close();
-            os.close();
             out.close();
+            os.close();
             sock.close();
+
         } catch (IOException e) {
+            System.out.println("SimulationClient: General I/O exception: " + e.getMessage());
             e.printStackTrace();
         }
+
         // run the simulator core
         Log.d(TAG, "Running simulator core!");
         new Thread(core).start();
-- 
GitLab