From 212c2df7eb4a4938069be9061c88170b160058e8 Mon Sep 17 00:00:00 2001
From: Ang Li <angli@google.com>
Date: Wed, 4 Oct 2017 13:43:36 -0700
Subject: Revert "Make linter happy. (#81)" (#85)

This reverts commit 37402446cd74da1a346469c03e09900d99673b8a.
---
 .../mobly/snippet/bundled/NetworkingSnippet.java   | 57 ++++++++--------------
 1 file changed, 21 insertions(+), 36 deletions(-)

(limited to 'src/main/java/com/google/android/mobly/snippet/bundled/NetworkingSnippet.java')

diff --git a/src/main/java/com/google/android/mobly/snippet/bundled/NetworkingSnippet.java b/src/main/java/com/google/android/mobly/snippet/bundled/NetworkingSnippet.java
index e89fc12..f175fdd 100644
--- a/src/main/java/com/google/android/mobly/snippet/bundled/NetworkingSnippet.java
+++ b/src/main/java/com/google/android/mobly/snippet/bundled/NetworkingSnippet.java
@@ -16,24 +16,24 @@
 
 package com.google.android.mobly.snippet.bundled;
 
-import android.app.DownloadManager;
-import android.content.BroadcastReceiver;
-import android.content.Context;
+import java.util.List;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.io.IOException;
+import java.net.UnknownHostException;
 import android.content.Intent;
+import android.content.Context;
 import android.content.IntentFilter;
+import android.content.BroadcastReceiver;
 import android.net.Uri;
 import android.os.Environment;
+import android.os.ParcelFileDescriptor;
+import android.app.DownloadManager;
 import android.support.test.InstrumentationRegistry;
 import com.google.android.mobly.snippet.Snippet;
 import com.google.android.mobly.snippet.bundled.utils.Utils;
 import com.google.android.mobly.snippet.rpc.Rpc;
 import com.google.android.mobly.snippet.util.Log;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.util.List;
-import java.util.Locale;
 
 /** Snippet class for networking RPCs. */
 public class NetworkingSnippet implements Snippet {
@@ -77,23 +77,18 @@ public class NetworkingSnippet implements Snippet {
         return true;
     }
 
-    @Rpc(
-        description =
-                "Download a file using HTTP. Return content Uri (file remains on device). "
-                        + "The Uri should be treated as an opaque handle for further operations."
-    )
-    public String networkHttpDownload(String url)
-            throws IllegalArgumentException, NetworkingSnippetException {
+    @Rpc(description = "Download a file using HTTP. Return content Uri (file remains on device). "
+                       + "The Uri should be treated as an opaque handle for further operations.")
+    public String networkHttpDownload(String url) throws IllegalArgumentException, NetworkingSnippetException {
 
         Uri uri = Uri.parse(url);
         List<String> pathsegments = uri.getPathSegments();
         if (pathsegments.size() < 1) {
-            throw new IllegalArgumentException(
-                    String.format(Locale.US, "The Uri %s does not have a path.", uri.toString()));
+            throw new IllegalArgumentException(String.format("The Uri %s does not have a path.", uri.toString()));
         }
         DownloadManager.Request request = new DownloadManager.Request(uri);
-        request.setDestinationInExternalPublicDir(
-                Environment.DIRECTORY_DOWNLOADS, pathsegments.get(pathsegments.size() - 1));
+        request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS,
+                                                  pathsegments.get(pathsegments.size() - 1));
         mIsDownloadComplete = false;
         mReqid = 0;
         IntentFilter filter = new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE);
@@ -101,16 +96,9 @@ public class NetworkingSnippet implements Snippet {
         mContext.registerReceiver(receiver, filter);
         try {
             mReqid = mDownloadManager.enqueue(request);
-            Log.d(
-                    String.format(
-                            Locale.US,
-                            "networkHttpDownload download of %s with id %d",
-                            url,
-                            mReqid));
+            Log.d(String.format("networkHttpDownload download of %s with id %d", url, mReqid));
             if (!Utils.waitUntil(() -> mIsDownloadComplete, 30)) {
-                Log.d(
-                        String.format(
-                                Locale.US, "networkHttpDownload timed out waiting for completion"));
+                Log.d(String.format("networkHttpDownload timed out waiting for completion"));
                 throw new NetworkingSnippetException("networkHttpDownload timed out.");
             }
         } finally {
@@ -118,15 +106,11 @@ public class NetworkingSnippet implements Snippet {
         }
         Uri resp = mDownloadManager.getUriForDownloadedFile(mReqid);
         if (resp != null) {
-            Log.d(String.format(Locale.US, "networkHttpDownload completed to %s", resp.toString()));
+            Log.d(String.format("networkHttpDownload completed to %s", resp.toString()));
             mReqid = 0;
             return resp.toString();
         } else {
-            Log.d(
-                    String.format(
-                            Locale.US,
-                            "networkHttpDownload Failed to download %s",
-                            uri.toString()));
+            Log.d(String.format("networkHttpDownload Failed to download %s", uri.toString()));
             throw new NetworkingSnippetException("networkHttpDownload didn't get downloaded file.");
         }
     }
@@ -137,7 +121,8 @@ public class NetworkingSnippet implements Snippet {
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
             long gotid = (long) intent.getExtras().get("extra_download_id");
-            if (DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(action) && gotid == mReqid) {
+            if (DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(action)
+                            && gotid == mReqid) {
                 mIsDownloadComplete = true;
             }
         }
-- 
cgit v1.2.3