check cloudflare error in downloading

Author: miku-nyan

src/nya/miku/wishmaster/api/CloudflareChanModule.java

@@ -18,6 +18,8 @@
 
 package nya.miku.wishmaster.api;
 
+import java.io.OutputStream;
+
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
@@ -26,7 +28,11 @@
 import cz.msebera.android.httpclient.cookie.Cookie;
 import cz.msebera.android.httpclient.impl.cookie.BasicClientCookie;
 import nya.miku.wishmaster.R;
+import nya.miku.wishmaster.api.interfaces.CancellableTask;
+import nya.miku.wishmaster.api.interfaces.ProgressListener;
 import nya.miku.wishmaster.http.cloudflare.CloudflareException;
+import nya.miku.wishmaster.http.streamer.HttpRequestModel;
+import nya.miku.wishmaster.http.streamer.HttpStreamer;
 import nya.miku.wishmaster.http.streamer.HttpWrongStatusCodeException;
 
 public abstract class CloudflareChanModule extends AbstractChanModule {
@@ -113,4 +119,16 @@ protected boolean cloudflareRecaptchaFallback() {
         return preferences.getBoolean(getSharedKey(PREF_KEY_CLOUDFLARE_RECAPTCHA_FALLBACK), false);
     }
 
+    @Override
+    public void downloadFile(String url, OutputStream out, ProgressListener listener, CancellableTask task) throws Exception {
+        String fixedUrl = fixRelativeUrl(url);
+        try {
+            HttpRequestModel rqModel = HttpRequestModel.builder().setGET().build();
+            HttpStreamer.getInstance().downloadFileFromUrl(fixedUrl, out, rqModel, httpClient, listener, task, true);
+        } catch (HttpWrongStatusCodeException e) {
+            if (canCloudflare()) checkCloudflareError(e, fixedUrl);
+            throw e;
+        }
+    }
+    
 }

src/nya/miku/wishmaster/chans/makaba/MakabaModule.java

@@ -22,7 +22,6 @@
 import static nya.miku.wishmaster.chans.makaba.MakabaJsonMapper.*;
 
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.util.ArrayList;
@@ -670,18 +669,6 @@ public String reportPost(DeletePostModel model, ProgressListener listener, Cance
         }
     }
 
-    @Override
-    public void downloadFile(String url, OutputStream out, ProgressListener listener, CancellableTask task) throws Exception {
-        String fixedUrl = fixRelativeUrl(url);
-        try {
-            HttpRequestModel rqModel = HttpRequestModel.builder().setGET().build();
-            HttpStreamer.getInstance().downloadFileFromUrl(fixedUrl, out, rqModel, httpClient, listener, task, true);
-        } catch (HttpWrongStatusCodeException e) {
-            checkCloudflareError(e, fixedUrl);
-            throw e;
-        }
-    }
-
     @Override
     public String buildUrl(UrlPageModel model) throws IllegalArgumentException {
         if (!model.chanName.equals(CHAN_NAME)) throw new IllegalArgumentException("wrong chan");