release: Increase version for release

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Versione 5.9.1
+- Corretto ordinamento in sottoscrizioni attive (prima Top10k)
+- Modificato parsing per risolvere crash con valori nulli
+
 ## Versione 5.9
 - Aggiunta barra laterale in lista sismi
 - Aggiunto filtro "sismi percepiti"

Sources/Earthquake Network.xcodeproj/project.pbxproj

@@ -1818,7 +1818,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = "$(inherited)";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = WJA4MR4CPC;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -1835,7 +1835,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.9.0;
+				MARKETING_VERSION = "$(inherited)";
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.finazzi.distquake.notificationservice;
@@ -1860,7 +1860,7 @@
 				CODE_SIGN_IDENTITY = "Apple Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = "$(inherited)";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = WJA4MR4CPC;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1873,7 +1873,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.9.0;
+				MARKETING_VERSION = "$(inherited)";
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.finazzi.distquake.notificationservice;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1923,6 +1923,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
+				CURRENT_PROJECT_VERSION = 153;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = WJA4MR4CPC;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1943,6 +1944,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				MARKETING_VERSION = 5.9.1;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -1985,6 +1987,7 @@
 				CODE_SIGN_IDENTITY = "Apple Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
+				CURRENT_PROJECT_VERSION = 153;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = WJA4MR4CPC;
 				ENABLE_NS_ASSERTIONS = NO;
@@ -1999,6 +2002,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				MARKETING_VERSION = 5.9.1;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -2014,7 +2018,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Earthquake Network/Earthquake Network.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = "$(inherited)";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = WJA4MR4CPC;
@@ -2026,7 +2030,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.9.0;
+				MARKETING_VERSION = "$(inherited)";
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -2102,7 +2106,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Earthquake Network/Earthquake Network.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = "$(inherited)";
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = WJA4MR4CPC;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -2113,7 +2117,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.9.0;
+				MARKETING_VERSION = "$(inherited)";
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -2187,7 +2191,7 @@
 				CODE_SIGN_ENTITLEMENTS = EQNNotificationContent/EQNNotificationContent.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = "$(inherited)";
 				DEVELOPMENT_TEAM = WJA4MR4CPC;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -2202,7 +2206,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.9.0;
+				MARKETING_VERSION = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.finazzi.distquake.notificationcontent;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "EQNetwork Extension Content - Development";
@@ -2221,7 +2225,7 @@
 				CODE_SIGN_ENTITLEMENTS = EQNNotificationContent/EQNNotificationContent.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = "$(inherited)";
 				DEVELOPMENT_TEAM = WJA4MR4CPC;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"ADS_ENABLED=0",
@@ -2234,7 +2238,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.9.0;
+				MARKETING_VERSION = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.finazzi.distquake.notificationcontent;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "EQNetwork Extension Content - AppStore";

Sources/Earthquake Network/Controllers/InApp/SubscriptionsViewController.swift

@@ -119,14 +119,21 @@ class SubscriptionsViewController: UITableViewController {
                     let isSubscription = product.isSubscription
                     return isPurchased && isSubscription
                 }.sorted { lProduct, rProduct in
-                    // if user has more than one subscriptions,
-                    // show first the Top10k
-                    let lIs10k = lProduct.isTop100k
-                    let rIs10k = rProduct.isTop100k
-                    if lIs10k {
-                        return lIs10k
+                    // If user has more than one subscriptions,
+                    // show first the Top10k.
+                    let lIs10k = lProduct.isTop10k
+                    let rIs10k = rProduct.isTop10k
+                    
+                    // If left item is Top10k, order first
+                    if lIs10k && !rIs10k {
+                        return true
+                    } else if !lProduct.isTop10k && rProduct.isTop10k {
+                        // right product is Top10k, left no
+                        return false
+                    } else {
+                        // both products Top10k or Top100k, keep existing order
+                        return false
                     }
-                    return rIs10k
                 }
             self.productSubscribed = purchased.first
             self.products = products.sorted(by: { $0.productIdentifier > $1.productIdentifier })

Sources/Earthquake Network/Models/EQNManager.m

@@ -61,8 +61,14 @@
 - (void)scaricaDatiReteSmartphone
 {
     [[ServerRequest defaultServerConnectionSingleton] inviaInformazioniAlServerWithURL:[NSURL URLWithString:EQNServerUrlDownloadSmartphoneNetwork] richiesta:EQNTipoChiamataDownloadDati success:^(id result) {
-        
-        self.rete_smartphone = [[EQNReteSmartphone alloc] initWithInfo:result];
+
+        // Parsiamo la risposta (assicurandoci che non contenga valori nulli)
+        EQNReteSmartphone *rete = [EQNReteSmartphone fromResponse:result];
+        if (rete != nil) {
+            self.rete_smartphone = rete;
+        } else {
+            NSLog(@"[EQNManager] Impossibile parsare la risposta di DownloadSmartphoneNetwork");
+        }
         
         [self performSelectorOnMainThread:@selector(scaricaAreaCheck) withObject:nil waitUntilDone:YES];
     } failure:^(NSError * error) {

Sources/Earthquake Network/Models/EQNReteSmartphone.swift

@@ -21,13 +21,27 @@ class EQNReteSmartphone: NSObject {
     let top10kAvailable: Int
     let top100kAvailable: Int
     
+    // MARK: - Class
+    
+    // Sometimes the response returns a broken response, with all values to null.
+    // In order to avoid crashes due to ObjC-Swift bridging, we need to take a generic nullable object,
+    // and then cast to the expected type (a dictionary).
+    @objc static func from(response: Any?) -> EQNReteSmartphone? {
+        if let info = response as? [[String: Any]?] {
+            return .init(info: info)
+        }
+        return nil
+    }
+    
     // MARK: - Init
     
-    @objc init(info: [[String: Any]]) {
+    private init(info: [[String: Any]?]) {
         // merge array in a single dictionary
-        let allValues = info.reduce([:]) { (result, dictionary) -> [String: Any] in
-            return result.merging(dictionary, uniquingKeysWith: { (_, new) in new })
-        }
+        let allValues = info
+            .compactMap { $0 }
+            .reduce([:]) { (result, dictionary) -> [String: Any] in
+                return result.merging(dictionary, uniquingKeysWith: { (_, new) in new })
+            }
         
         self.counterLastDayAlerts = allValues.integer(forKey: "eq", orDefault: 0)
         self.counterTotalAlerts = allValues.integer(forKey: "eq_p", orDefault: 0)