Cleaned up networking code and made it more robust

Author: shai-almog

CodenameOne/src/com/codename1/io/NetworkManager.java

@@ -430,31 +430,38 @@ public void actionPerformed(NetworkEvent e) {
     public void addToQueueAndWait(final ConnectionRequest request) {
         class WaitingClass implements Runnable, ActionListener<NetworkEvent> {
             private final boolean edt = CN.isEdt();
-            private boolean finishedWaiting;
+
+            private boolean isInQueueOrProcessing() {
+                synchronized (LOCK) {
+                    if(pending == null || networkThreads == null) {
+                        return false;
+                    }
+                    if(pending.contains(request)) {
+                        return true;
+                    }
+                    for(NetworkThread t : networkThreads) {
+                        if(t.currentRequest == request) {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            }
 
             public void run() {
                 if (edt) {
-                    while (!finishedWaiting) {
-                        try {
-                            Thread.sleep(30);
-                        } catch (InterruptedException ex) {
-                            ex.printStackTrace();
-                        }
+                    while (isInQueueOrProcessing()) {
+                        Util.sleep(30);
                     }
                 } else {
-                    while (!request.complete) {
-                        try {
-                            Thread.sleep(30);
-                        } catch (InterruptedException ex) {
-                            ex.printStackTrace();
-                        }
+                    while (isInQueueOrProcessing()) {
+                        Util.sleep(30);
                     }
                 }
             }
 
             public void actionPerformed(NetworkEvent e) {
                 if (e.getError() != null) {
-                    finishedWaiting = true;
                     removeProgressListener(this);
                     removeErrorListener(this);
                     return;
@@ -465,7 +472,6 @@ public void actionPerformed(NetworkEvent e) {
                             request.retrying = false;
                             return;
                         }
-                        finishedWaiting = true;
                         removeProgressListener(this);
                         removeErrorListener(this);
                     }

maven/core-unittests/src/test/java/com/codename1/io/services/AdditionalServicesCoverageTest.java

@@ -1,32 +1,22 @@
 package com.codename1.io.services;
 
-import com.codename1.io.FileSystemStorage;
-import com.codename1.io.NetworkEvent;
-import com.codename1.io.NetworkManager;
 import com.codename1.io.Storage;
 import com.codename1.io.ConnectionRequest;
 import com.codename1.junit.FormTest;
 import com.codename1.junit.UITestBase;
 import com.codename1.testing.TestCodenameOneImplementation;
-import com.codename1.ui.Component;
-import com.codename1.ui.Display;
 import com.codename1.ui.DisplayTest;
-import com.codename1.ui.EncodedImage;
 import com.codename1.ui.Form;
 import com.codename1.ui.Image;
 import com.codename1.ui.Label;
-import com.codename1.ui.geom.Dimension;
-import com.codename1.ui.layouts.BorderLayout;
 import com.codename1.ui.list.DefaultListModel;
 import com.codename1.ui.util.ImageIO;
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.HashMap;
-import java.util.Hashtable;
 import java.util.Vector;
 import java.util.Map;
 import com.codename1.ui.List;