maxime_commit

Author: maxgfr

.idea/misc.xml

@@ -31,10 +31,9 @@ public class MakeRequestTask extends AsyncTask<Void, Void, List<String>> {
 
     private com.google.api.services.youtube.YouTube mService = null;
     private Exception mLastError = null;
-    private String result;
-    private int status;
     private ProgressDialog mProgress;
     private YoutubeUser youtubeUser;
+    private RequestInfo ri = RequestInfo.getInstance();
 
     private static final int REQUEST_AUTHORIZATION = 1001;
 
@@ -158,21 +157,18 @@ private List<String> getDataFromApi() throws IOException {
 
     @Override
     protected void onPreExecute() {
-        result="";
-        System.out.println(result);
+        ri.addInfo("");
         mProgress.show();
     }
 
     @Override
     protected void onPostExecute(List<String> output) {
         mProgress.hide();
         if (output == null || output.size() == 0) {
-            result="No results returned.";
-            System.out.println(result);
+            ri.addInfo("No results returned.");
         } else {
             output.add(0, "Data retrieved using the YouTube Data API:");
-            result=TextUtils.join("\n", output);
-            System.out.println(result);
+            ri.addInfo(TextUtils.join("\n", output));
         }
     }
 
@@ -182,30 +178,17 @@ protected void onCancelled() {
         if (mLastError != null) {
             if (mLastError instanceof GooglePlayServicesAvailabilityIOException) {
                 int connectionStatusCode = ((GooglePlayServicesAvailabilityIOException) mLastError).getConnectionStatusCode();
-                setStatusErr(connectionStatusCode);
+                ri.addStatus(connectionStatusCode);
             } else if (mLastError instanceof UserRecoverableAuthIOException) {
-                setStatusErr(this.REQUEST_AUTHORIZATION);
+                ri.addStatus(this.REQUEST_AUTHORIZATION);
             } else {
-                result="The following error occurred:\n" +mLastError.getMessage();
-                System.out.println(result);
+                ri.addInfo("The following error occurred:\n" +mLastError.getMessage());
             }
         } else {
-            result="Request cancelled.";
-            System.out.println(result);
+            ri.addInfo("Request cancelled.");
         }
     }
 
-    public String getResult () {
-        return result;
-    }
-
-    public int getStatusErr () {
-        return status;
-    }
-
-    public void setStatusErr (int nb) {
-        this.status = nb;
-    }
 
     /*
      * Print information about all of the items in the playlist.

app/src/main/java/com/example/golfier/android_youtube_api/MakeRequestTask.java

@@ -0,0 +1,46 @@
+package com.example.golfier.android_youtube_api;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class RequestInfo {
+
+    private List<String> listInfo;
+    private List<Integer> statusInfo;
+    private static RequestInfo instance = null;
+
+    protected RequestInfo() {
+        listInfo = new ArrayList<>();
+        statusInfo = new ArrayList<>();
+    }
+    public static RequestInfo getInstance() {
+        if(instance == null) {
+            instance = new RequestInfo();
+        }
+        return instance;
+    }
+
+    public List<String> getInfo () {
+        return listInfo;
+    }
+
+    public void setInfo (List<String> list) {
+        this.listInfo = list;
+    }
+
+    public void addInfo(String info) {
+        this.listInfo.add(info);
+    }
+
+    public List<Integer> getStatus () {
+        return statusInfo;
+    }
+
+    public void setStatus (List<Integer> list) {
+        this.statusInfo = list;
+    }
+
+    public void addStatus (Integer status) {
+        this.statusInfo.add(status);
+    }
+}

app/src/main/java/com/example/golfier/android_youtube_api/RequestInfo.java

@@ -1,7 +1,5 @@
 package com.example.golfier.android_youtube_api;
 
-import com.google.api.client.util.DateTime;
-
 public class YoutubeVideo {
     private String videoId;
     private String title;