rename EventStream.close() to more appropriate cancel()

Author: mythz

src/AndroidClient/android/src/main/java/net/servicestack/android/AndroidServerEventsClient.java

@@ -26,6 +26,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import okhttp3.Call;
 import okhttp3.Callback;
@@ -47,7 +48,8 @@ public AndroidServerEventsClient(String baseUri, String... channels) {
         this.serviceClient = new AndroidServiceClient(this.baseUri);
 
         client = new OkHttpClient.Builder()
-            .cookieJar(new JavaNetCookieJar(CookieHandler.getDefault()))
+            .cookieJar(new JavaNetCookieJar(CookieHandler.getDefault())) //sync cookies with Android HTTP
+            .readTimeout(0, TimeUnit.MILLISECONDS) //disable Read Timeout on long poll /event-stream
             .build();
     }
 
@@ -99,9 +101,10 @@ protected InputStream getInputStream(URL streamUri) throws IOException {
         }
 
         @Override
-        public void close() {
-            if (call == null) return;
-            call.cancel();
+        public void cancel() {
+            if (call != null){
+                call.cancel();
+            }
         }
 
         @Override
@@ -129,7 +132,7 @@ protected int readFromStream(InputStream inputStream, byte[] buffer) throws IOEx
     @Override
     protected synchronized void stopBackgroundThread() {
         if (bgThread != null){
-            bgEventStream.close();
+            bgEventStream.cancel();
             try {
                 bgThread.join(100);
             } catch (InterruptedException ignore) {}

src/AndroidClient/android/src/main/java/net/servicestack/client/sse/EventStream.java

@@ -28,18 +28,19 @@ protected InputStream getInputStream(URL streamUri) throws IOException {
         return new BufferedInputStream(req.getInputStream());
     }
 
-    public void close(){
+    public void cancel(){
     }
 
     @Override
     public void run() {
+        InputStream is = null;
         try {
             if (client.running.get())
                 return;
             client.running.set(true);
 
             URL streamUri = new URL(client.getEventStreamUri());
-            InputStream is = getInputStream(streamUri);
+            is = getInputStream(streamUri);
             client.errorsCount.set(0);
             readStream(is);
         } catch (InterruptedException ie){
@@ -50,6 +51,7 @@ public void run() {
             Log.e("Error reading from event-stream, continuous errors: " + client.errorsCount.incrementAndGet(), e);
             Log.e(Utils.getStackTrace(e));
         } finally {
+            Utils.closeQuietly(is);
             client.running.set(false);
         }
 

src/AndroidClient/android/src/main/java/net/servicestack/client/sse/ServerEventsClient.java

@@ -274,7 +274,7 @@ public String getConnectionDisplayName() {
 
     protected synchronized void stopBackgroundThread() {
         if (bgThread != null){
-            bgEventStream.close();
+            bgEventStream.cancel();
             bgThread.interrupt(); //notify the bgThread to exit
             try {
                 bgThread.join();

src/AndroidClient/client/src/main/java/net/servicestack/client/sse/EventStream.java

@@ -28,18 +28,19 @@ protected InputStream getInputStream(URL streamUri) throws IOException {
         return new BufferedInputStream(req.getInputStream());
     }
 
-    public void close(){
+    public void cancel(){
     }
 
     @Override
     public void run() {
+        InputStream is = null;
         try {
             if (client.running.get())
                 return;
             client.running.set(true);
 
             URL streamUri = new URL(client.getEventStreamUri());
-            InputStream is = getInputStream(streamUri);
+            is = getInputStream(streamUri);
             client.errorsCount.set(0);
             readStream(is);
         } catch (InterruptedException ie){
@@ -50,6 +51,7 @@ public void run() {
             Log.e("Error reading from event-stream, continuous errors: " + client.errorsCount.incrementAndGet(), e);
             Log.e(Utils.getStackTrace(e));
         } finally {
+            Utils.closeQuietly(is);
             client.running.set(false);
         }
 

src/AndroidClient/client/src/main/java/net/servicestack/client/sse/ServerEventsClient.java

@@ -274,7 +274,7 @@ public String getConnectionDisplayName() {
 
     protected synchronized void stopBackgroundThread() {
         if (bgThread != null){
-            bgEventStream.close();
+            bgEventStream.cancel();
             bgThread.interrupt(); //notify the bgThread to exit
             try {
                 bgThread.join();