Merge pull request #13 from AsakuraFuuko/weatherapi

fix no network will crash
AsakuraFuuko · Mar 10, 2024 · 4c32629 · 4c32629
2 parents 3369744 + 2348402
commit 4c32629
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
@@ -26,7 +26,7 @@ jobs:
 
       - name: Install Homebrew dependencies
         run: |
-          HOMEBREW_NO_AUTO_UPDATE=1 brew install dpkg ldid make libplist openssl@3
+          HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install --overwrite dpkg ldid make libplist openssl@3
           echo "/usr/local/opt/make/libexec/gnubin" >> $GITHUB_PATH
 
       - name: Checkout XXTouchNG/theos

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,7 +22,7 @@ jobs:
 
       - name: Install Homebrew dependencies
         run: |
-          HOMEBREW_NO_AUTO_UPDATE=1 brew install dpkg ldid make libplist openssl@3
+          HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install dpkg ldid make libplist openssl@3
           echo "/usr/local/opt/make/libexec/gnubin" >> $GITHUB_PATH
 
       - name: Checkout XXTouchNG/theos

diff --git a/src/extensions/Weather/ColorfulClouds.mm b/src/extensions/Weather/ColorfulClouds.mm
@@ -60,7 +60,7 @@ - (NSData *)fetchLocationIDForName:(NSString *)name{
 }
 
 -(NSString *)locationName {
-	return self.city.subLocality;
+	return self.city.subLocality ?: @"--";
 }
 
 -(NSString *)temperature {

diff --git a/src/extensions/Weather/QWeather.mm b/src/extensions/Weather/QWeather.mm
@@ -72,7 +72,7 @@ - (NSDictionary *)fetch24HoursWeatherForLocation:(NSString *)location{
 }
 
 -(NSString *)locationName {
-	return self.city.subLocality;
+	return self.city.subLocality ?: @"--";
 }
 
 -(NSString *)temperature {