3.013

WangDaYeeeeee · Apr 15, 2021 · 7ab5eea · 7ab5eea
1 parent 9eed603
commit 7ab5eea
Show file tree

Hide file tree

Showing 34 changed files with 629,688 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "wangdaye.com.geometricweather"
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 30012
-        versionName "3.012"
+        versionCode 30013
+        versionName "3.013"
         multiDexEnabled true
         ndk {
             abiFilters 'armeabi', 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a'

diff --git a/app/src/main/java/wangdaye/com/geometricweather/remoteviews/NotificationHelper.java b/app/src/main/java/wangdaye/com/geometricweather/remoteviews/NotificationHelper.java
@@ -8,6 +8,7 @@
 import android.content.Context;
 import android.graphics.BitmapFactory;
 import android.os.Build;
+import android.text.TextUtils;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.DrawableRes;
@@ -94,17 +95,18 @@ public static void checkAndSendAlert(Context context,
 
         List<Alert> alertList = new ArrayList<>();
         if (oldResult != null) {
-            for (int i = 0; i < weather.getAlertList().size(); i ++) {
-                boolean newAlert = true;
-                for (int j = 0; j < oldResult.getAlertList().size(); j ++) {
-                    if (weather.getAlertList().get(i).getAlertId()
-                            == oldResult.getAlertList().get(j).getAlertId()) {
-                        newAlert = false;
+            for (Alert newAlert : weather.getAlertList()) {
+                boolean exist = false;
+
+                for (Alert oldAlert : oldResult.getAlertList()) {
+                    if (newAlert.getAlertId() == oldAlert.getAlertId()
+                            || TextUtils.equals(newAlert.getDescription(), oldAlert.getDescription())) {
+                        exist = true;
                         break;
                     }
                 }
-                if (newAlert) {
-                    alertList.add(weather.getAlertList().get(i));
+                if (!exist) {
+                    alertList.add(newAlert);
                 }
             }
         } else {

diff --git a/fastlane/metadata/android/en-US/changelogs/30013.txt b/fastlane/metadata/android/en-US/changelogs/30013.txt
@@ -0,0 +1 @@
+<ul><li>Bug fixed. - Duplicate alert notifications</li></ul>
diff --git a/release/3.013/app-gplay-release.aab b/release/3.013/app-gplay-release.aab
diff --git a/release/3.013/fdroid/release/GeometricWeather 3.013_fdroid.apk b/release/3.013/fdroid/release/GeometricWeather 3.013_fdroid.apk
diff --git a/release/3.013/fdroid/release/output-metadata.json b/release/3.013/fdroid/release/output-metadata.json
@@ -0,0 +1,18 @@
+{
+  "version": 2,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "wangdaye.com.geometricweather",
+  "variantName": "processFdroidReleaseResources",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "versionCode": 30013,
+      "versionName": "3.013_fdroid",
+      "outputFile": "GeometricWeather 3.013_fdroid.apk"
+    }
+  ]
+}
diff --git a/release/3.013/gplay/release/GeometricWeather 3.013_gplay.apk b/release/3.013/gplay/release/GeometricWeather 3.013_gplay.apk
diff --git a/release/3.013/gplay/release/output-metadata.json b/release/3.013/gplay/release/output-metadata.json
@@ -0,0 +1,18 @@
+{
+  "version": 2,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "wangdaye.com.geometricweather",
+  "variantName": "processGplayReleaseResources",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "versionCode": 30013,
+      "versionName": "3.013_gplay",
+      "outputFile": "GeometricWeather 3.013_gplay.apk"
+    }
+  ]
+}
diff --git a/release/3.013/outputs/apk/pub/debug/GeometricWeather 3.012_pub.apk b/release/3.013/outputs/apk/pub/debug/GeometricWeather 3.012_pub.apk
diff --git a/release/3.013/outputs/apk/pub/debug/output-metadata.json b/release/3.013/outputs/apk/pub/debug/output-metadata.json
@@ -0,0 +1,18 @@
+{
+  "version": 2,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "wangdaye.com.geometricweather",
+  "variantName": "processPubDebugResources",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "versionCode": 30012,
+      "versionName": "3.012_pub",
+      "outputFile": "GeometricWeather 3.012_pub.apk"
+    }
+  ]
+}
diff --git a/release/3.013/outputs/logs/manifest-merger-fdroid-release-report.txt b/release/3.013/outputs/logs/manifest-merger-fdroid-release-report.txt
diff --git a/release/3.013/outputs/logs/manifest-merger-gplay-release-report.txt b/release/3.013/outputs/logs/manifest-merger-gplay-release-report.txt
diff --git a/release/3.013/outputs/logs/manifest-merger-pub-debug-report.txt b/release/3.013/outputs/logs/manifest-merger-pub-debug-report.txt
diff --git a/release/3.013/outputs/logs/manifest-merger-pub-release-report.txt b/release/3.013/outputs/logs/manifest-merger-pub-release-report.txt