Commit: 97f614a850a22f8a4f8848ef727cb38a40da0a70 - mmw_app (git)

Commit MetaInfo

• Révision: 97f614a850a22f8a4f8848ef727cb38a40da0a70 (tree)
• l'heure: 2018-08-02 02:22:42
• Auteur: HMML <hmml3939@gmai...>
• Commiter: HMML

Message de Log

Try to replace ion with HttpURLConnection for workaround of weird semaphore lock error...

Change Summary

• modified: app/build.gradle
• modified: app/src/main/java/cloud/hmml/mmw/ConfigManager.java
• modified: app/src/main/java/cloud/hmml/mmw/ForecastFetcher.java

Modification

--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "cloud.hmml.mmw"
         minSdkVersion 17
         targetSdkVersion 27
-        versionCode 7
-        versionName '0.4.3'
+        versionCode 8
+        versionName '0.4.4'
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
     }

--- a/app/src/main/java/cloud/hmml/mmw/ConfigManager.java
+++ b/app/src/main/java/cloud/hmml/mmw/ConfigManager.java
@@ -645,9 +645,7 @@ public class ConfigManager implements GoogleApiClient.ConnectionCallbacks, Googl
         String ns = loadLocationNS();
 
         if (ns != null && ns.equals(LOCATION_NS_JMA)) {
-            if (!(new ForecastFetcher(this.getContext(), ns, loadLocationId())).save(this)) {
-                Log.e("cmgr", "Failed to get JMA forecat!");
-            }
+            new ForecastFetcher(this.getContext(), ns, loadLocationId()).save(this);
         }
     }
 

--- a/app/src/main/java/cloud/hmml/mmw/ForecastFetcher.java
+++ b/app/src/main/java/cloud/hmml/mmw/ForecastFetcher.java
@@ -1,17 +1,24 @@
 package cloud.hmml.mmw;
 
 import android.content.Context;
+import android.os.AsyncTask;
+import android.os.Build;
 import android.util.Log;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.koushikdutta.ion.Ion;
+import com.google.gson.JsonParser;
+import com.google.gson.stream.JsonReader;
 
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.concurrent.ExecutionException;
 
 
 public class ForecastFetcher {
@@ -26,76 +33,137 @@ public class ForecastFetcher {
         this.context = context;
     }
 
-    public boolean save(ConfigManager config) {
-        JsonObject json = getJson();
-        if (json == null) {
-            Log.e("forecast-fetcher", "Failed to fetch forecast JSON.");
-            return false;
-        }
+    public void save(ConfigManager config) {
+        this.save(config, null);
+    }
 
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");
-        Date reportedAt = null;
-        Calendar reportedAtCal = null;
-        try {
-            reportedAt = df.parse(json.getAsJsonPrimitive("reported_at").getAsString());
-            config.saveReportedAt(reportedAt);
-        } catch (ParseException e) {
-            Log.e("forecast-fetcher", "Failed to parse reported_at!");
-            e.printStackTrace();
-        } catch (NullPointerException e) {
-            // ignore!
-        }
 
-        int index = 1;
-        for (JsonElement j: json.getAsJsonArray("daily_forecasts")) {
-            JsonObject day = j.getAsJsonObject();
+    public void save(ConfigManager config, Runnable callback) {
 
-            String label = day.getAsJsonPrimitive("weather_label").getAsString();
-            String ident = day.getAsJsonPrimitive("weather_symbol").getAsString();
-            Integer temp_max = null;
-            Integer temp_min = null;
-            Integer pop = null;
-            try {
-                temp_max = day.getAsJsonPrimitive("temp_max").getAsInt();
-            } catch (ClassCastException e) {
-                // ignroe
-            }
-            try {
-                temp_min = day.getAsJsonPrimitive("temp_min").getAsInt();
-            } catch (ClassCastException e) {
-                // ignroe
+        class JsonFetcher extends AsyncTask<Void, Void, JsonObject> {
+            private ConfigManager config;
+            private Runnable callback;
+
+            public JsonFetcher(ConfigManager config, Runnable callback) {
+                this.config = config;
+                this.callback = callback;
             }
-            try {
-                pop = day.getAsJsonPrimitive("pop").getAsInt();
-            } catch (ClassCastException e) {
-                // ignroe
+
+            @Override
+            protected JsonObject doInBackground(Void... voids) {
+                return ForecastFetcher.this.getJson();
             }
 
-            config.saveWeather(index, ident, label, temp_min, temp_max, pop);
+            @Override
+            protected void onPostExecute(JsonObject json) {
+                if (json == null) {
+                    Log.e("forecast-fetcher", "Failed to fetch forecast JSON.");
+                    return;
+                }
+
+                SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");
+                Date reportedAt = null;
+                Calendar reportedAtCal = null;
+                try {
+                    reportedAt = df.parse(json.getAsJsonPrimitive("reported_at").getAsString());
+                    config.saveReportedAt(reportedAt);
+                } catch (ParseException e) {
+                    Log.e("forecast-fetcher", "Failed to parse reported_at!");
+                    e.printStackTrace();
+                } catch (NullPointerException e) {
+                    // ignore!
+                }
+
+                int index = 1;
+                for (JsonElement j: json.getAsJsonArray("daily_forecasts")) {
+                    JsonObject day = j.getAsJsonObject();
+
+                    String label = day.getAsJsonPrimitive("weather_label").getAsString();
+                    String ident = day.getAsJsonPrimitive("weather_symbol").getAsString();
+                    Integer temp_max = null;
+                    Integer temp_min = null;
+                    Integer pop = null;
+                    try {
+                        temp_max = day.getAsJsonPrimitive("temp_max").getAsInt();
+                    } catch (ClassCastException e) {
+                        // ignroe
+                    }
+                    try {
+                        temp_min = day.getAsJsonPrimitive("temp_min").getAsInt();
+                    } catch (ClassCastException e) {
+                        // ignroe
+                    }
+                    try {
+                        pop = day.getAsJsonPrimitive("pop").getAsInt();
+                    } catch (ClassCastException e) {
+                        // ignroe
+                    }
+
+                    config.saveWeather(index, ident, label, temp_min, temp_max, pop);
+
+                    index++;
+                    if (index > 2) break;
+                }
 
-            index++;
-            if (index > 2) break;
+                config.saveUpdatedAt();
+                Log.d("forecast-fetcher", "Forecast has been fetched successfully.");
+                if (callback != null)
+                    callback.run();
+            }
         }
 
-        config.saveUpdatedAt();
-        Log.d("forecast-fetcher", "Forecast has been fetched successfully.");
-        return true;
+        new JsonFetcher(config, callback).execute();
     }
 
-    private JsonObject getJson() {
+    protected JsonObject getJson() {
+        URL url = null;
+        HttpURLConnection httpconn = null;
+        try {
+            url = new URL(BASE_URL + areaNs + "/" + areaId + ".json");
+        } catch (MalformedURLException e) {
+            Log.e("forecast-fetcher", "BAD URL on getting json: " + e.getMessage());
+            e.printStackTrace();
+            return null;
+        }
         try {
-            return Ion.with(this.context)
-                    .load(BASE_URL + areaNs + "/" + areaId + ".json")
-                    .setHeader("X-Requested-With", "Android cloud.hmml.mmw")
-                    .asJsonObject().get();
-        } catch (InterruptedException e) {
-            Log.e("forecast-fetcher", "Exception in fetching json: " + e.getMessage());
+            httpconn = (HttpURLConnection) url.openConnection();
+        } catch (IOException e) {
+            Log.e("forecast-fetcher", "Failed to open connection to get JSON: " + e.getMessage());
             e.printStackTrace();
             return null;
-        } catch (ExecutionException e) {
-            Log.e("forecast-fetcher", "ExecutionException in fetching json: "+e.getMessage());
+        }
+        httpconn.addRequestProperty("X-Requested-With", "Android cloud.hmml.mmw");
+        httpconn.addRequestProperty("User-Agent", "cloud.hmml.mmw/" + BuildConfig.VERSION_NAME + " (Android " + Build.VERSION.RELEASE + "; " + Build.DEVICE + ")");
+        try {
+            httpconn.connect();
+        } catch (IOException e) {
+            Log.e("forecast-fetcher", "Failed to request to get JSON: " + e.getMessage());
             e.printStackTrace();
             return null;
         }
+
+        try {
+            try {
+                int retcode = httpconn.getResponseCode();
+                if (retcode != 200) {
+                    Log.e("forecast-fetcher", "Invalid return code " + retcode + " on getting JSON");
+                    return null;
+                }
+            } catch (IOException e) {
+                Log.e("forecast-fetcher", "Failed to get response code on getting JSON: " + e.getMessage());
+                e.printStackTrace();
+                return null;
+            }
+
+            try {
+                return (new JsonParser()).parse(new JsonReader(new InputStreamReader(httpconn.getInputStream()))).getAsJsonObject();
+            } catch (IOException e) {
+                Log.e("forecast-fetcher", "Failed to read stream data on getting JSON: " + e.getMessage());
+                e.printStackTrace();
+                return null;
+            }
+        } finally {
+            httpconn.disconnect();
+        }
     }
 }