SD image requests - cleanup logging 2

Author: jusjoken

java/sage/MetaImage.java

@@ -3216,7 +3216,7 @@ private boolean loadCacheFile()
         HttpURLConnection.setFollowRedirects(true);
         URL myURL = (URL) src;
         URLConnection myURLConn;
-        boolean isSDURL = false;
+        boolean isSDURL = false; //identifies an Schedules Direct image that needs special handling
         try
         {
           while (true)
@@ -3245,8 +3245,7 @@ private boolean loadCacheFile()
                     if (Sage.DBG) System.out.println("MetaImage.loadCacheFile: No token so skipping src = '" + src + "'");
                     break;
                 }else{
-                    //TODO: remove the following after testing
-                    if (Sage.DBG) System.out.println("MetaImage.loadCacheFile: Adding token to Request. token = '" + sdToken + "'");
+                    if (Sage.DBG && SDSession.debugEnabled()) System.out.println("MetaImage.loadCacheFile: Adding token to Request. token = '" + sdToken + "'");
                     myURLConn.addRequestProperty("token", sdToken);
                     myURLConn.setRequestProperty("User-Agent", SDSession.USER_AGENT);
                     //secret SD debug mode that will send requests to their debug server. Only enable when working with SD Support
@@ -3260,13 +3259,10 @@ private boolean loadCacheFile()
             is = myURLConn.getInputStream();
             if (myURLConn instanceof HttpURLConnection)
             {
-              //TODO: SD testing of response code
               HttpURLConnection httpConn = (HttpURLConnection) myURLConn;
               if (isSDURL) {
-                  if (Sage.DBG) System.out.println("MetaImage.loadCacheFile: HttpURLConnection response found for SD image - type:" + httpConn.getContentType() + " response code:" + httpConn.getResponseCode());
                   if ("application/json".equals(httpConn.getContentType())){
                       //SD returned an error which is within the returned json
-                      //TODO: remove after testing
                       int imageErrorCode = SDUtils.handleSDJsonErrorFromHttpResponse(httpConn);
                       if(imageErrorCode==1004){ //no or invalid token
                         is.close();

java/sage/epg/sd/SDUtils.java

@@ -90,8 +90,6 @@ public static int handleSDJsonErrorFromHttpResponse(HttpURLConnection httpConn)
     InputStream inputStream = new BufferedInputStream(httpConn.getInputStream());
     InputStreamReader reader = new InputStreamReader(inputStream, SDSession.IN_CHARSET);
     JsonElement errorElement = GSON.fromJson(reader, JsonElement.class);
-    if (Sage.DBG) System.out.println("SDUtils.handleSDJsonErrorFromHttpResponse: Start of handler");
-                
     if (errorElement instanceof JsonObject)
     {
         JsonElement codeElement = ((JsonObject) errorElement).get("code");