fix self-pinging (#24)

README.md

@@ -21,7 +21,7 @@ repositories {
     jcenter()
 }
 dependencies {
-    compile 'com.danikula:videocache:2.3.1'
+    compile 'com.danikula:videocache:2.3.2'
 }
 ```
 

library/build.gradle

@@ -26,7 +26,7 @@ publish {
     userOrg = 'alexeydanilov'
     groupId = 'com.danikula'
     artifactId = 'videocache'
-    publishVersion = '2.3.1'
+    publishVersion = '2.3.2'
     description = 'Cache support for android VideoView'
     website = 'https://github.com/danikula/AndroidVideoCache'
 }

library/src/main/java/com/danikula/videocache/HttpProxyCacheServer.java

@@ -26,12 +26,12 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import static com.danikula.videocache.Preconditions.checkAllNotNull;
 import static com.danikula.videocache.Preconditions.checkNotNull;
 import static com.danikula.videocache.ProxyCacheUtils.LOG_TAG;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 /**
  * Simple lightweight proxy server with file caching support that handles HTTP requests.
@@ -96,18 +96,17 @@ private void makeSureServerWorks() {
         while (pingAttempts < maxPingAttempts) {
             try {
                 Future<Boolean> pingFuture = socketProcessor.submit(new PingCallable());
-                pinged = pingFuture.get(delay, TimeUnit.MILLISECONDS);
-                if (pinged) {
+                this.pinged = pingFuture.get(delay, MILLISECONDS);
+                if (this.pinged) {
                     return;
                 }
-                pingAttempts++;
                 SystemClock.sleep(delay);
-                delay *= 2;
             } catch (InterruptedException | ExecutionException | TimeoutException e) {
                 Log.e(LOG_TAG, "Error pinging server [attempt: " + pingAttempts + ", timeout: " + delay + "]. ", e);
             }
+            pingAttempts++;
+            delay *= 2;
         }
-
         Log.e(LOG_TAG, "Shutdown server… Error pinging server [attempt: " + pingAttempts + ", timeout: " + delay + "]. " +
                 "If you see this message, please, email me [email protected]");
         shutdown();

sample/build.gradle

@@ -38,7 +38,7 @@ dependencies {
 //    compile project(':library')
     compile 'com.android.support:support-v4:23.1.0'
     compile 'org.androidannotations:androidannotations-api:3.3.2'
-    compile 'com.danikula:videocache:2.3.1'
+    compile 'com.danikula:videocache:2.3.2'
     compile 'com.viewpagerindicator:library:2.4.2-SNAPSHOT@aar'
     apt 'org.androidannotations:androidannotations:3.3.2'
 }