Fixed la maison not loading, fixed webcam message showing "body", upd…

…ated gradle
hej2010 · May 30, 2024 · 9dd0c5d · 9dd0c5d
1 parent d644a90
commit 9dd0c5d
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 23 deletions.
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 34
+    compileSdk 34
     defaultConfig {
         applicationId "se.swecookie.valthorens"
         minSdkVersion 16
@@ -33,7 +33,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.squareup.picasso:picasso:2.71828'
     implementation 'org.jsoup:jsoup:1.14.3'
-    implementation 'androidx.recyclerview:recyclerview:1.3.1'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
 }
diff --git a/app/src/main/java/se/swecookie/valthorens/ImageDownloader.java b/app/src/main/java/se/swecookie/valthorens/ImageDownloader.java
@@ -5,6 +5,9 @@
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
@@ -85,7 +88,7 @@ protected Void doInBackground(Void... voids) {
                             }
                             checkDate(i, imageLinks);
                             break;
-                        } else if (s.startsWith(" \"//data.skaping.com/") || s.startsWith(" \"//storage.gra.cloud.ovh.net/")) {
+                        } else if (s.startsWith(" \"//data2.skaping.com/") || s.startsWith(" \"//data.skaping.com/") || s.startsWith(" \"//storage.gra.cloud.ovh.net/")) {
                             imageDownloader.currentURL = "http:" + s.replace("\"", "").trim();
                             checkDate(i, imageLinks);
                             break;
@@ -97,14 +100,18 @@ protected Void doInBackground(Void... voids) {
                     String[] m = script.split("\"messages\":");
                     Log.e(TAG, "doInBackground: m is " + m.length);
                     if (m.length > 1) {
-                        String[] m2 = m[1].split("\\}\\]");
-                        if (m2.length > 1) {
-                            // now we should have: [{"title":"Webcam Hors Service","body":"Cette webcam est d\u00e9sactiv\u00e9e en raison du risque de foudre.\r\nRetour en novembre !","link":null,"delay":null
-                            String[] m3 = m2[0].split("\"");
-                            Log.e(TAG, "doInBackground: " + m2[0]);
-                            if (m3.length > 7) {
-                                title = fixDateString(m3[3]);
-                                body = fixDateString(m3[7]);
+                        String s = m[1].split("\\}\\]")[0] + "}]";
+                        JSONArray arr = new JSONArray(s);
+                        for (int i = 0; i < arr.length(); i++) {
+                            try {
+                                JSONObject o = arr.getJSONObject(i);
+                                if (o.has("title")) {
+                                    title = fixDateString(o.getString("title"));
+                                }
+                                if (o.has("body")) {
+                                    body = fixDateString(o.getString("body"));
+                                }
+                            } catch (JSONException ignored) {
                             }
                         }
                     }

diff --git a/app/src/main/java/se/swecookie/valthorens/WebcamActivity.java b/app/src/main/java/se/swecookie/valthorens/WebcamActivity.java
@@ -281,7 +281,7 @@ public void onImageInfoFound(String currentURL, int height, String imageDate, St
 
             if (showMessages) {
                 boolean showTitle = false, showBody = false;
-                if (!title.isEmpty()) {
+                if (!title.isEmpty() && !title.equals("null")) {
                     txtTitle.setText(title);
                     showTitle = true;
                 }

diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.0'
+        classpath 'com.android.tools.build:gradle:8.4.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists