From 0cb312d66165f222ad2b7597eebe8a9473651770 Mon Sep 17 00:00:00 2001
From: Lily Tsai <tslilyai@gmail.com>
Date: Fri, 6 Jul 2018 11:21:48 +0200
Subject: [PATCH] create topics with eid instead of ss

---
 .../testapp/simulator/SimulationServerBT.java      | 14 +++++++++-----
 .../simulator/SimulatorScannerProcessor.java       |  3 ++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/testapp/src/main/java/org/mpisws/testapp/simulator/SimulationServerBT.java b/testapp/src/main/java/org/mpisws/testapp/simulator/SimulationServerBT.java
index 2a6ef155..8489dbc4 100644
--- a/testapp/src/main/java/org/mpisws/testapp/simulator/SimulationServerBT.java
+++ b/testapp/src/main/java/org/mpisws/testapp/simulator/SimulationServerBT.java
@@ -13,6 +13,7 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import org.mpisws.embeddedsocial.ESClient;
 import org.mpisws.embeddedsocial.ESMessage;
+import org.mpisws.helpers.Coder;
 import org.mpisws.helpers.Identifier;
 import org.mpisws.messaging.EpochLinkMessage;
 
@@ -93,22 +94,25 @@ public class SimulationServerBT {
         }).start();
     }
     private void processData() {
+        Looper.prepare();
+        Handler handler = new Handler();
         // Create all topics you'll ever have to create
         List<Pair<Identifier, Identifier>> topicsToCreate = new ArrayList<>();
         for (int i=0; i < nonces.size(); i++) {
             topicsToCreate.add(new ImmutablePair<>(nonces.get(i), pubKeys.get(i)));
         }
         for (Identifier ss : sharedSecrets) {
-            topicsToCreate.add(new ImmutablePair<>(ss, ss));
+            topicsToCreate.add(new ImmutablePair<>(Coder.convertSharedSecretToID(ss), Coder.convertSharedSecretToID(ss)));
         }
-        Log.d(TAG, "creating nonce and shared secret topics: " + topicsToCreate.size());
+        Log.d(TAG, "Creating nonce and shared secret topics: " + topicsToCreate.size());
         ESClient.getInstance().createTopics(topicsToCreate);
 
         // Every "epoch" or so try to post link messages to the prior "epoch" ss for each "device"
         // Let's try and post to the prior 3 epochs
-        Looper.prepare();
         for (int loop = 1; loop <= NUM_SIMULATED_EPOCHS; loop++) {
-            new Handler().postDelayed(() -> {
+            Log.d(TAG, "Handler loop " + loop);
+            handler.postDelayed(() -> {
+                Log.d(TAG, "Handler loop!");
                 int lowEpoch = currentEpoch > 3 ? currentEpoch - 3 : 0;
                 List<Identifier> sses = sharedSecrets.subList(lowEpoch * NUM_SIMULATED_DEVICES, currentEpoch * NUM_SIMULATED_DEVICES);
                 List<String> topicHandles = ESClient.getInstance().getTopicHandles(sses);
@@ -126,7 +130,7 @@ public class SimulationServerBT {
                                 .addNewNonce(nonces.get((lowEpoch * NUM_SIMULATED_DEVICES) + newIndex).toString())
                                 .build();
                         msgsToSend.add(new ESMessage(epochLinkMessage.toSendMessageText(sses.get(oldIndex).getBytes()),
-                                new Identifier(SHA1(sharedSecrets.get(i).getBytes())).toString(),
+                                Coder.convertSharedSecretToID(sharedSecrets.get(i)).toString(),
                                 topicHandles.get(oldIndex),
                                 true, null, true, -1));
                     }
diff --git a/testapp/src/main/java/org/mpisws/testapp/simulator/SimulatorScannerProcessor.java b/testapp/src/main/java/org/mpisws/testapp/simulator/SimulatorScannerProcessor.java
index 9d46bf1e..e1f2a5f0 100644
--- a/testapp/src/main/java/org/mpisws/testapp/simulator/SimulatorScannerProcessor.java
+++ b/testapp/src/main/java/org/mpisws/testapp/simulator/SimulatorScannerProcessor.java
@@ -115,6 +115,7 @@ public class SimulatorScannerProcessor {
      */
     private class SDDRScanCallback extends ScanCallback {
         private void simulateReceivingResults() {
+            Log.d(TAG, "CURRENT EPOCH: " + CURRENT_EPOCH);
             // get all "new" nonces you should've "received"
             for (int i = 0; i < NUM_SIMULATED_DEVICES; i++) {
                 // for each new nonce, call processScanResult
@@ -138,7 +139,7 @@ public class SimulatorScannerProcessor {
         @Override
         public void onScanResult(int callbackType, ScanResult result) {
             super.onScanResult(callbackType, result);
-            Log.v(TAG, "some scan result");
+            Log.v(TAG, "Some scan result");
             SDDR_Native.c_preDiscovery();
             simulateReceivingResults();
             SDDR_Native.c_postDiscovery();
-- 
GitLab