Make checking for TransferNetworkLossHandler optional. (#900)

* Make checking for TransferNetworkLossHandler optional.

Fixes #899

* Remove isNetworkHandlerRegisteredAndNotConnected()

Author: Karthikeyan

aws-android-sdk-s3/src/main/java/com/amazonaws/mobileconnectors/s3/transferutility/UploadTask.java

@@ -88,10 +88,15 @@ public UploadTask(TransferRecord uploadInfo,
      */
     @Override
     public Boolean call() throws Exception {
-        if (!isNetworkHandlerRegisteredAndNetworkConnected()) {
-            LOGGER.info("Network not connected. Setting the state to WAITING_FOR_NETWORK.");
-            updater.updateState(upload.id, TransferState.WAITING_FOR_NETWORK);
-            return false;
+        try {
+            if (TransferNetworkLossHandler.getInstance() != null &&
+                !TransferNetworkLossHandler.getInstance().isNetworkConnected()) {
+                LOGGER.info("Network not connected. Setting the state to WAITING_FOR_NETWORK.");
+                updater.updateState(upload.id, TransferState.WAITING_FOR_NETWORK);	
+                return false;	
+            }	
+        } catch (TransferUtilityException transferUtilityException) {	
+            LOGGER.error("TransferUtilityException: [" + transferUtilityException + "]");	
         }
 
         updater.updateState(upload.id, TransferState.IN_PROGRESS);
@@ -174,10 +179,15 @@ private Boolean uploadMultipartAndWaitForCompletion() throws ExecutionException
                 isSuccess &= b;
             }
             if (!isSuccess) {
-                if (!isNetworkHandlerRegisteredAndNetworkConnected()) {
-                    LOGGER.info("Network not connected. Setting the state to WAITING_FOR_NETWORK.");
-                    updater.updateState(upload.id, TransferState.WAITING_FOR_NETWORK);
-                    return false;
+                try {
+                    if (TransferNetworkLossHandler.getInstance() != null &&
+                        !TransferNetworkLossHandler.getInstance().isNetworkConnected()) {
+                        LOGGER.info("Network not connected. Setting the state to WAITING_FOR_NETWORK.");
+                        updater.updateState(upload.id, TransferState.WAITING_FOR_NETWORK);	
+                        return false;	
+                    }	
+                } catch (TransferUtilityException transferUtilityException) {	
+                    LOGGER.error("TransferUtilityException: [" + transferUtilityException + "]");	
                 }
             }
         } catch (final Exception e) {
@@ -211,10 +221,15 @@ private Boolean uploadMultipartAndWaitForCompletion() throws ExecutionException
                 }
             }
 
-            if (!isNetworkHandlerRegisteredAndNetworkConnected()) {
-                LOGGER.info("Network not connected. Setting the state to WAITING_FOR_NETWORK.");
-                updater.updateState(upload.id, TransferState.WAITING_FOR_NETWORK);
-                return false;
+            try {
+                if (TransferNetworkLossHandler.getInstance() != null &&
+                    !TransferNetworkLossHandler.getInstance().isNetworkConnected()) {
+                    LOGGER.info("Network not connected. Setting the state to WAITING_FOR_NETWORK.");
+                    updater.updateState(upload.id, TransferState.WAITING_FOR_NETWORK);	
+                    return false;	
+                }	
+            } catch (TransferUtilityException transferUtilityException) {	
+                LOGGER.error("TransferUtilityException: [" + transferUtilityException + "]");	
             }
 
             // interrupted due to reasons other than network.
@@ -467,16 +482,6 @@ private static CannedAccessControlList getCannedAclFromString(String cannedAcl)
         return cannedAcl == null ? null : CANNED_ACL_MAP.get(cannedAcl);
     }
 
-    private boolean isNetworkHandlerRegisteredAndNetworkConnected() {
-        try {
-            return TransferNetworkLossHandler.getInstance() != null  &&
-                    TransferNetworkLossHandler.getInstance().isNetworkConnected();
-        } catch (TransferUtilityException transferUtilityException) {
-            LOGGER.error("TransferUtilityException: [" + transferUtilityException + "]");
-            return false;
-        }
-    }
-
     /**
      * Progress Listener for the Main UploadTask.
      */