From 2cf1213535b316bdf78e376f4d3345a72a9f32c2 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Thu, 13 Aug 2015 11:58:59 +1200
Subject: [PATCH] Create sync version of request

---
 .../org/traccar/client/RequestManager.java    | 48 ++++++++++---------
 .../traccar/client/TrackingController.java    |  2 +-
 .../traccar/client/RequestManagerTest.java    | 15 +-----
 3 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/app/src/main/java/org/traccar/client/RequestManager.java b/app/src/main/java/org/traccar/client/RequestManager.java
index fa41f59..3842b0f 100644
--- a/app/src/main/java/org/traccar/client/RequestManager.java
+++ b/app/src/main/java/org/traccar/client/RequestManager.java
@@ -41,27 +41,7 @@ public class RequestManager {
 
         @Override
         protected Boolean doInBackground(String... request) {
-            InputStream inputStream = null;
-            try {
-                URL url = new URL(request[0]);
-                HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-                connection.setReadTimeout(TIMEOUT);
-                connection.setConnectTimeout(TIMEOUT);
-                connection.connect();
-                inputStream = connection.getInputStream();
-                while (inputStream.read() != -1);
-                return true;
-            } catch (IOException error) {
-                return false;
-            } finally {
-                try {
-                    if (inputStream != null) {
-                        inputStream.close();
-                    }
-                } catch (IOException secondError) {
-                    return false;
-                }
-            }
+            return sendRequest(request[0]);
         }
 
         @Override
@@ -74,7 +54,31 @@ public class RequestManager {
         }
     }
 
-    public static void sendRequest(String request, RequestHandler handler) {
+    public static boolean sendRequest(String request) {
+        InputStream inputStream = null;
+        try {
+            URL url = new URL(request);
+            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+            connection.setReadTimeout(TIMEOUT);
+            connection.setConnectTimeout(TIMEOUT);
+            connection.connect();
+            inputStream = connection.getInputStream();
+            while (inputStream.read() != -1);
+            return true;
+        } catch (IOException error) {
+            return false;
+        } finally {
+            try {
+                if (inputStream != null) {
+                    inputStream.close();
+                }
+            } catch (IOException secondError) {
+                return false;
+            }
+        }
+    }
+
+    public static void sendRequestAsync(String request, RequestHandler handler) {
         RequestAsyncTask task = new RequestAsyncTask(handler);
         task.execute(request);
     }
diff --git a/app/src/main/java/org/traccar/client/TrackingController.java b/app/src/main/java/org/traccar/client/TrackingController.java
index 3f235bf..d514e0d 100644
--- a/app/src/main/java/org/traccar/client/TrackingController.java
+++ b/app/src/main/java/org/traccar/client/TrackingController.java
@@ -53,7 +53,7 @@ public class TrackingController implements PositionProvider.PositionListener {
                     Integer.parseInt(preferences.getString(MainActivity.KEY_PORT, null)),
                     position);
 
-            RequestManager.sendRequest(request, new RequestManager.RequestHandler() {
+            RequestManager.sendRequestAsync(request, new RequestManager.RequestHandler() {
                 @Override
                 public void onSuccess() {
                 }
diff --git a/app/src/test/java/org/traccar/client/RequestManagerTest.java b/app/src/test/java/org/traccar/client/RequestManagerTest.java
index 6ddbff6..bdaa2c8 100644
--- a/app/src/test/java/org/traccar/client/RequestManagerTest.java
+++ b/app/src/test/java/org/traccar/client/RequestManagerTest.java
@@ -1,14 +1,12 @@
 
 package org.traccar.client;
 
-import junit.framework.Assert;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
-import java.lang.Override;
+import static org.junit.Assert.assertTrue;
 
 @RunWith(RobolectricGradleTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = 21)
@@ -17,16 +15,7 @@ public class RequestManagerTest {
     @Test
     public void testSendRequest() throws Exception {
 
-        RequestManager.sendRequest("http://www.google.com", new RequestManager.RequestHandler() {
-            @Override
-            public void onSuccess() {
-                Assert.assertTrue(true);
-            }
-            @Override
-            public void onFailure() {
-                Assert.assertTrue(false);
-            }
-        });
+        assertTrue(RequestManager.sendRequest("http://www.google.com"));
 
     }