Reverting local HTTP gateway back from HTTPS to HTTP; there was a change regarding...

[iot2.git] / benchmarks / other / PhoneInterface / Irrigation / app / src / main / java / com / example / xubin / irrigation / MainActivity.java

diff --git a/benchmarks/other/PhoneInterface/Irrigation/app/src/main/java/com/example/xubin/irrigation/MainActivity.java b/benchmarks/other/PhoneInterface/Irrigation/app/src/main/java/com/example/xubin/irrigation/MainActivity.java
index 65c7c34dc70db66646248c4a717fbeb68d629d54..ba573ecda8ba88b2dd1712bce2d33c50d1530424 100644 (file)
--- a/benchmarks/other/PhoneInterface/Irrigation/app/src/main/java/com/example/xubin/irrigation/MainActivity.java
+++ b/benchmarks/other/PhoneInterface/Irrigation/app/src/main/java/com/example/xubin/irrigation/MainActivity.java
@@ -11,20 +11,17 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Button;
 import android.widget.EditText;
-import android.content.Context;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class MainActivity extends AppCompatActivity {
 
-    private EditText gatewayIP;
     private EditText inchesPerWeek;
     private EditText weatherZipCode;
     private EditText daysToWaterOn;
     private EditText inchesPerMinute;
     private Button submit_button;
-    protected static Context context;
     private Helper helper = new Helper();
 
     @Override
@@ -33,8 +30,6 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
-        context = getApplicationContext();
-        gatewayIP = (EditText) findViewById(R.id.gatewayip);
         inchesPerWeek = (EditText) findViewById(R.id.week);
         weatherZipCode = (EditText) findViewById(R.id.zip);
         daysToWaterOn = (EditText) findViewById(R.id.water);
@@ -50,7 +45,7 @@ public class MainActivity extends AppCompatActivity {
                 params.add(Integer.parseInt(daysToWaterOn.getText().toString()));
                 params.add(Double.parseDouble(inchesPerMinute.getText().toString()));
 
-                String ip = gatewayIP.getText().toString();
+                String ip = getApplicationContext().getResources().getString(R.string.destination_ip);
                 new MakeRequestTask(params).execute(ip, "getIrrigationInfo");
 
             }
@@ -65,7 +60,6 @@ public class MainActivity extends AppCompatActivity {
         });
     }
 
-
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.
@@ -95,11 +89,9 @@ public class MainActivity extends AppCompatActivity {
         @Override
         protected Void doInBackground(String... argus) {
             if (helper.httpclient == null) {
-                helper.setConnection(argus[0]);
+                helper.setConnection();
             }
-
             helper.makeRequest(argus[0],params, argus[1]);
-
             return null;
         }
     }