Escape symbols for city. Some cities have '

JunesiPhone · Mar 26, 2019 · 18442de · 18442de
1 parent 33cbea9
commit 18442de
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Tweak/Weather/XIWeather.m b/Tweak/Weather/XIWeather.m
@@ -195,9 +195,9 @@ - (NSString*)_variablesToJSString {
                                      @"hourIndex": [NSNumber numberWithInt:hourForecast.hourIndex]
                                      }];
     }
-    
+
     NSDictionary *weatherInfo = @{
-                                  @"city": self.currentCity.name != nil ? self.currentCity.name : @"Local Weather",
+                                  @"city": [self _escapeString:self.currentCity.name] != nil ? [self _escapeString:self.currentCity.name] : @"Local Weather",
                                   @"address": self.reverseGeocodedAddress ? self.reverseGeocodedAddress : @{},
                                   @"temperature": [NSNumber numberWithInt:temp],
                                   @"low": dailyForecasts.count > 0 ? [dailyForecasts[0] objectForKey:@"low"] : @0,
@@ -228,7 +228,7 @@ - (NSString*)_variablesToJSString {
                                   @"precipitation24hr": [NSNumber numberWithFloat:self.currentCity.precipitationPast24Hours],
                                   @"heatIndex": [NSNumber numberWithInt:(int)roundf(self.currentCity.heatIndex)],
                                   @"moonPhase": [NSNumber numberWithInt:(int)roundf(self.currentCity.moonPhase)],
-                                  @"cityState": self.currentCity.cityAndState != nil ? self.currentCity.cityAndState : @""
+                                  @"cityState": [self _escapeString:self.currentCity.cityAndState] != nil ? [self _escapeString:self.currentCity.cityAndState] : @""
                                   };
 
     NSString * jsonObj = [[NSString alloc] initWithData:[NSJSONSerialization dataWithJSONObject:weatherInfo
@@ -243,7 +243,9 @@ - (NSString*)_escapeString:(NSString*)input {
     if (!input)
         return @"";
 
-    input = [input stringByReplacingOccurrencesOfString:@"'" withString:@"\\'"];
+    input = [input stringByReplacingOccurrencesOfString:@"'" withString:@"&#39;"];
+    input = [input stringByReplacingOccurrencesOfString:@"&" withString:@"&#38;"];
+    input = [input stringByReplacingOccurrencesOfString:@"+" withString:@"&#43;"];
     input = [input stringByReplacingOccurrencesOfString: @"\"" withString:@"\\\""];
     input = [input stringByReplacingOccurrencesOfString: @"/" withString:@"\\/"];
 

diff --git a/control b/control
@@ -1,7 +1,7 @@
 Package: com.junesiphone.xeninfo
 Name: XenInfo
 Depends: mobilesubstrate, firmware (>= 9.0)
-Version: 2.2.1
+Version: 2.2.2
 Conflicts: org.bigboss.datameter, cydia.kiiimo.org.datameter, com.repo.xarold.com.datameter, re.rejail.datameter, org.coolstar.ventana-modern, com.repo.xarold.com.ventana, cydia.kiiimo.org.ventana
 Architecture: iphoneos-arm
 Description: Music, Weather, and battery info for XenHTML