Commit d0647cf8 authored by Lily Tsai's avatar Lily Tsai

debugging...

parent 5ef04e05
...@@ -107,7 +107,7 @@ public class SimulationServerBT { ...@@ -107,7 +107,7 @@ public class SimulationServerBT {
// Every "epoch" or so try to post link messages to the prior "epoch" ss for each "device" // 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 // Let's try and post to the prior 3 epochs
Looper.prepare(); Looper.prepare();
for (int loop = 0; loop < NUM_SIMULATED_EPOCHS; loop++) { for (int loop = 1; loop <= NUM_SIMULATED_EPOCHS; loop++) {
new Handler().postDelayed(() -> { new Handler().postDelayed(() -> {
int lowEpoch = currentEpoch > 3 ? currentEpoch - 3 : 0; int lowEpoch = currentEpoch > 3 ? currentEpoch - 3 : 0;
List<Identifier> sses = sharedSecrets.subList(lowEpoch * NUM_SIMULATED_DEVICES, currentEpoch * NUM_SIMULATED_DEVICES); List<Identifier> sses = sharedSecrets.subList(lowEpoch * NUM_SIMULATED_DEVICES, currentEpoch * NUM_SIMULATED_DEVICES);
...@@ -135,7 +135,7 @@ public class SimulationServerBT { ...@@ -135,7 +135,7 @@ public class SimulationServerBT {
currentEpoch++; currentEpoch++;
// heh hack // heh hack
if (currentEpoch == NUM_SIMULATED_EPOCHS) currentEpoch--; if (currentEpoch == NUM_SIMULATED_EPOCHS) currentEpoch--;
}, CHANGE_EPOCH_TIME); }, loop*CHANGE_EPOCH_TIME);
} }
} }
} }
...@@ -22,32 +22,32 @@ ...@@ -22,32 +22,32 @@
android:id="@+id/getGoogleToken" android:id="@+id/getGoogleToken"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Get Google Token"/> android:text="UserAccount: Get Google Token"/>
<Button <Button
android:id="@+id/signIn" android:id="@+id/signIn"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="EbC Sign In"/> android:text="UserAccount: EbC Sign In"/>
<Button <Button
android:id="@+id/signOut" android:id="@+id/signOut"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="ES Sign Out" /> android:text="UserAccount: EbC Sign Out" />
<Button <Button
android:id="@+id/deleteAccount" android:id="@+id/deleteAccount"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="ES deleteAccount"/> android:text="UserAccount: deleteAccount"/>
<Button <Button
android:id="@+id/testSendMessages" android:id="@+id/testSendMessages"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Send message with all constraint" /> android:text="Messaging: Send message to all encounters" />
<Button <Button
android:id="@+id/testReceiveMessages" android:id="@+id/testReceiveMessages"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Get unread messages" /> android:text="Messaging: Get unread messages" />
<Button <Button
android:id="@+id/simulateEncounterFormationAndConfirmationClient" android:id="@+id/simulateEncounterFormationAndConfirmationClient"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -63,17 +63,17 @@ ...@@ -63,17 +63,17 @@
android:id="@+id/testWithoutConfirmation" android:id="@+id/testWithoutConfirmation"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="testBLEWithoutConfirmation" /> android:text="EndToEnd: BLE without Confirmation" />
<Button <Button
android:id="@+id/testEndToEndES" android:id="@+id/testEndToEndES"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="testEndToEndES" /> android:text="EndToEnd: Confirmation using ES" />
<Button <Button
android:id="@+id/testEndToEndBLE" android:id="@+id/testEndToEndBLE"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="testEndToEndBLE" /> android:text="EndToEnd: Confirmation using BLE" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
</LinearLayout> </LinearLayout>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment