no internet messages

geode-sdk · Jan 6, 2024 · 4ac6345 · 4ac6345
1 parent c4abb0c
commit 4ac6345
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/app/src/main/java/com/geode/launcher/MainActivity.kt b/app/src/main/java/com/geode/launcher/MainActivity.kt
@@ -36,6 +36,8 @@ import com.geode.launcher.ui.theme.Typography
 import com.geode.launcher.utils.LaunchUtils
 import com.geode.launcher.utils.PreferenceUtils
 import com.geode.launcher.utils.useCountdownTimer
+import java.net.ConnectException
+import java.net.UnknownHostException
 
 
 class MainActivity : ComponentActivity() {
@@ -137,7 +139,11 @@ fun UpdateCard(releaseViewModel: ReleaseViewModel, modifier: Modifier = Modifier
 
     when (val state = releaseState) {
         is ReleaseViewModel.ReleaseUIState.Failure -> {
-            val message = state.exception.message
+            val message = when (state.exception) {
+                is UnknownHostException, is ConnectException ->
+                    stringResource(R.string.release_fetch_no_internet)
+                else -> state.exception.message
+            }
 
             UpdateMessageIndicator(
                 stringResource(R.string.release_fetch_failed, message ?: ""),

diff --git a/app/src/main/java/com/geode/launcher/SettingsActivity.kt b/app/src/main/java/com/geode/launcher/SettingsActivity.kt
@@ -37,6 +37,8 @@ import com.geode.launcher.api.ReleaseViewModel
 import com.geode.launcher.ui.theme.GeodeLauncherTheme
 import com.geode.launcher.ui.theme.Typography
 import com.geode.launcher.utils.PreferenceUtils
+import java.net.ConnectException
+import java.net.UnknownHostException
 
 class SettingsActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -118,9 +120,13 @@ fun UpdateIndicator(
 
         when (updateStatus) {
             is ReleaseViewModel.ReleaseUIState.Failure -> {
-                snackbarHostState.showSnackbar(
-                    context.getString(R.string.preference_check_for_updates_failed),
-                )
+                val message = when (updateStatus.exception) {
+                    is UnknownHostException, is ConnectException ->
+                        context.getString(R.string.release_fetch_no_internet)
+                    else -> context.getString(R.string.preference_check_for_updates_failed)
+                }
+
+                snackbarHostState.showSnackbar(message)
             }
             is ReleaseViewModel.ReleaseUIState.Finished -> {
                 if (updateStatus.hasUpdated) {

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -24,6 +24,7 @@
     <string name="release_fetch_success">Geode updated!</string>
     <string name="release_fetch_downloading">Downloading update… (%1$s/%2$s)</string>
     <string name="release_fetch_cancelling">Cancelling update…</string>
+    <string name="release_fetch_no_internet">No internet found.</string>
     <string name="release_fetch_cancelled">Update cancelled.</string>
     <string name="release_fetch_button_retry">Retry</string>
     <string name="release_fetch_button_cancel">Cancel</string>
@@ -54,5 +55,6 @@
     <string name="preference_check_for_updates_none_found">No updates found.</string>
     <string name="preference_check_for_updates_success">Geode has been updated!</string>
     <string name="preference_check_for_updates_downloading">Downloading update…</string>
+    <string name="preference_check_for_updates_no_internet">No internet found.</string>
     <string name="preference_check_for_updates_already_updating">An update is already in progress!</string>
 </resources>