JP | Global httpResponse is removed. Async httpRequest method with return response is done. Code refactoring is done.

Author: last-stand

app/src/main/java/net/simplifiedcoding/sqlitedbcode/ApiCall.java

@@ -9,7 +9,7 @@
 import okhttp3.Response;
 
 public class ApiCall {
-    //GET network request
+
     public static String GET(OkHttpClient client, HttpUrl url) throws IOException {
         Request request = new Request.Builder()
                 .url(url)
@@ -18,7 +18,6 @@ public static String GET(OkHttpClient client, HttpUrl url) throws IOException {
         return response.body().string();
     }
 
-    //POST network request
     public static String POST(OkHttpClient client, HttpUrl url, RequestBody body) throws IOException {
         Request request = new Request.Builder()
                 .url(url)

app/src/main/java/net/simplifiedcoding/sqlitedbcode/ServerCustomAdapter.java

@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.concurrent.TimeUnit;
 
 import android.app.Activity;
 import android.content.Context;
@@ -24,8 +25,10 @@ public class ServerCustomAdapter extends ArrayAdapter<Server> {
     int layoutResourceId;
 
     private SQLiteDatabase db;
-    private String httpResponse = null;
-    private OkHttpClient client = new OkHttpClient();
+    private OkHttpClient client = new OkHttpClient()
+                                 .newBuilder()
+                                 .connectTimeout(500, TimeUnit.MILLISECONDS)
+                                 .build();
 
     ArrayList<Server> data = new ArrayList<Server>();
 
@@ -68,31 +71,10 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 openDatabase();
                 String ip = server.getIp();
                 int port = Integer.parseInt(server.getPort());
-                if (isChecked) {
-                    loadContent("http", ip, port, "on");
-                    if(httpResponse != null && !httpResponse.isEmpty()) {
-                        String sql = "UPDATE servers SET status=" + 1 + " WHERE ip='" +
-                                server.getIp() + "' AND port='" + server.getPort() + "';";
-                        db.execSQL(sql);
-                        showMessage("Power is ON at " + ip+":"+port);
-                    }
-                    else{
-                        showMessage("Server is not responding or you are offline.");
-                    }
-                }
-                else {
-                    loadContent("http", ip, port, "off");
-                    if(httpResponse != null && !httpResponse.isEmpty()) {
-                        String sql = "UPDATE servers SET status=" + 0 + " WHERE ip='" +
-                                server.getIp() + "' AND port='" + server.getPort() + "';";
-                        db.execSQL(sql);
-                        showMessage("Power is OFF at " +  ip+":"+port);
-                    }
-                    else{
-                        showMessage("Server is not responding or you are offline.");
-                    }
-                }
-                httpResponse = null;
+                if (isChecked)
+                    updateSwitchStatus(ip, port, "on");
+                else
+                    updateSwitchStatus(ip, port, "off");
                 db.close();
             }
         });
@@ -111,35 +93,60 @@ static class ServerHolder {
         Switch powerSwitch;
     }
 
+    private void updateSwitchStatus(String ip, int port,String status){
+        String httpResponse = loadContent("http", ip, port, status);
+        if(httpResponse != null && !httpResponse.isEmpty()) {
+            int newStatus = status.equals("on") ? 1 : 0;
+            String sql = "UPDATE servers SET status=" + newStatus + " WHERE ip='" +
+                    ip + "' AND port='" + port + "';";
+            db.execSQL(sql);
+            showMessage("Power is ON at " + ip+":"+port);
+        }
+        else{
+            showMessage("Server is not responding or you are offline.");
+        }
+    }
+
     private String getSwitchStatus(String ip, int port){
-        loadContent("http", ip, port, "status");
-        try { Thread.sleep(3000); }
-        catch (InterruptedException e) { e.printStackTrace(); }
+        String httpResponse = loadContent("http", ip, port, "status");
+        String status = "";
         if(httpResponse != null && !httpResponse.isEmpty()) {
-            int startPosition = httpResponse.indexOf("<html>") + "<html>".length();
-            int endPosition = httpResponse.indexOf("</html>", startPosition);
-            String status = httpResponse.substring(startPosition, endPosition);
-            return status.substring(status.length() -1);
+            status = getStatusFromResponse(httpResponse);
         }
-        return "";
+        return status;
+    }
+
+    private String getStatusFromResponse(String httpResponse){
+        int startPosition = httpResponse.indexOf("<html>") + "<html>".length();
+        int endPosition = httpResponse.indexOf("</html>", startPosition);
+        String status = httpResponse.substring(startPosition, endPosition);
+        return status.substring(status.length() -1);
     }
 
     private void showMessage(String message){
         Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
     }
 
-    private void loadContent(final String requestType, final String ip, final int port, final String path) {
-        new AsyncTask<Void, Void, Void>() {
-            @Override
-            protected Void doInBackground(Void... params) {
-                try {
-                    HttpUrl httpUrl = RequestBuilder.buildURL(requestType, ip, port, path);
-                    httpResponse = ApiCall.GET(client, httpUrl);
-                } catch (IOException e) {
-                    e.printStackTrace();
+    private String loadContent(final String requestType, final String ip, final int port, final String path) {
+        String response = "";
+        try {
+            response = new AsyncTask<String, Integer, String>() {
+
+                @Override
+                protected String doInBackground(String... params) {
+                    String httpResponse = "";
+                    try {
+                        HttpUrl httpUrl = RequestBuilder.buildURL(requestType, ip, port, path);
+                        httpResponse = ApiCall.GET(client, httpUrl);
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                    return httpResponse;
                 }
-                return null;
-            }
-        }.execute();
+            }.execute().get();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return response;
     }
 }

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }