Changing encryption in the phone app of the fourth benchmark from AES-ECB to AES...

[iot2.git] / benchmarks / other / PhoneInterface / Control / app / src / main / java / com / example / ali / control / MainActivity.java

diff --git a/benchmarks/other/PhoneInterface/Control/app/src/main/java/com/example/ali/control/MainActivity.java b/benchmarks/other/PhoneInterface/Control/app/src/main/java/com/example/ali/control/MainActivity.java
index 1133cc4f4d9eee8619635dd381797741b9341d47..a2b0c6a179c213cb47357f82b9a7ec7172e9b905 100644 (file)
--- a/benchmarks/other/PhoneInterface/Control/app/src/main/java/com/example/ali/control/MainActivity.java
+++ b/benchmarks/other/PhoneInterface/Control/app/src/main/java/com/example/ali/control/MainActivity.java
@@ -61,6 +61,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
 
                 if (intStatus == 0) {
                     alarmStatus.setText("OFF");
+                    alarmButton.setText("ON");
                     alarmStatus.setTextColor(Color.BLUE);
                     //alarmSwitch.setChecked(false);
                     alarmOn = false;
@@ -68,6 +69,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
                 }
                 else {// value 1
                     alarmStatus.setText("ON");
+                    alarmButton.setText("OFF");
                     alarmStatus.setTextColor(Color.RED);
                     //alarmSwitch.setChecked(true);
                     alarmOn = true;
@@ -100,19 +102,20 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-            try {
-                Log.e("Ali::::", "Here1");
-                t1 = new Table(CLOUD_SERVER, PASSWORD, LOCAL_MACHINE_ID, LISTENING_PORT, MainActivity.this);
-                Log.e("Ali::::", "Here2");
-                t1.rebuild(); // update
-                Log.e("Ali::::", "Here3");
+        try {
+            Log.e("Ali::::", "Here1");
+            t1 = new Table(CLOUD_SERVER, PASSWORD, LOCAL_MACHINE_ID, LISTENING_PORT, MainActivity.this);
+            Log.e("Ali::::", "Here2");
+            //t1.initTable();
+            t1.rebuild(); // update
+            Log.e("Ali::::", "Here3");
 
-            } catch (Exception e) {
+        } catch (Exception e) {
 
-                StringWriter sw = new StringWriter();
-                PrintWriter pw = new PrintWriter(sw);
-                e.printStackTrace(pw);
-                Log.e("ALI::::", sw.toString());
+            StringWriter sw = new StringWriter();
+            PrintWriter pw = new PrintWriter(sw);
+            e.printStackTrace(pw);
+            Log.e("ALI::::", sw.toString());
 
         }
         // TextViews