Merge pull request #285 from OpenDTU-App/276-links-not-working

Implement better error visualization for linking.canOpen
OpenDTU-App · Dec 18, 2024 · 3f5c74b · 3f5c74b
2 parents 7de4b96 + 5f62319
commit 3f5c74b
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 5 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -39,6 +39,8 @@
         <intent>
             <action android:name="android.intent.action.VIEW" />
             <data android:scheme="https" />
+            <!-- https://stackoverflow.com/a/70672054 -->
+            <data android:host="*" />
         </intent>
     </queries>
 </manifest>
diff --git a/src/components/firmware/FirmwareListItem.tsx b/src/components/firmware/FirmwareListItem.tsx
@@ -2,6 +2,7 @@ import type { FC } from 'react';
 import { useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Badge, Divider, List, Text, useTheme } from 'react-native-paper';
+import Toast from 'react-native-toast-message';
 
 import { Linking, View } from 'react-native';
 
@@ -18,6 +19,7 @@ import useDtuState from '@/hooks/useDtuState';
 import useHasAuthConfigured from '@/hooks/useHasAuthConfigured';
 
 import capitalize from '@/utils/capitalize';
+import { rootLogging } from '@/utils/log';
 
 import { minimumOpenDtuFirmwareVersion, spacing } from '@/constants';
 import type { SupportedLanguage } from '@/translations';
@@ -35,6 +37,8 @@ const needsCapitalization: Record<SupportedLanguage, boolean> = {
   de: true,
 };
 
+const log = rootLogging.extend('FirmwareListItem');
+
 const FirmwareListItem: FC<FirmwareListItemProps> = ({
   release,
   selectRelease,
@@ -53,8 +57,14 @@ const FirmwareListItem: FC<FirmwareListItemProps> = ({
 
     if (await Linking.canOpenURL(url)) {
       await Linking.openURL(url);
+    } else {
+      log.error(`Cannot open URL: ${url}`);
+      Toast.show({
+        type: 'error',
+        text1: t('cannotOpenUrl'),
+      });
     }
-  }, [release.html_url]);
+  }, [release.html_url, t]);
 
   const handleInstallFirmware = useCallback(() => {
     selectRelease(release);

diff --git a/src/components/modals/ChangeLanguageModal.tsx b/src/components/modals/ChangeLanguageModal.tsx
@@ -10,6 +10,7 @@ import {
   Text,
   useTheme,
 } from 'react-native-paper';
+import Toast from 'react-native-toast-message';
 
 import { Linking } from 'react-native';
 
@@ -53,10 +54,13 @@ const ChangeLanguageModal: FC<Omit<ModalProps, 'children'>> = props => {
     if (await Linking.canOpenURL(weblateUrl)) {
       await Linking.openURL(weblateUrl);
     } else {
-      // TODO: Better error handling (issue #101)
       log.error('Cannot open Weblate URL');
+      Toast.show({
+        type: 'error',
+        text1: t('cannotOpenUrl'),
+      });
     }
-  }, []);
+  }, [t]);
 
   return (
     <Portal>

diff --git a/src/translations b/src/translations
diff --git a/src/views/navigation/screens/InformationGroup/LicensesScreen.tsx b/src/views/navigation/screens/InformationGroup/LicensesScreen.tsx
@@ -2,17 +2,22 @@ import type { FC } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Box } from 'react-native-flex-layout';
 import { Appbar, List, useTheme } from 'react-native-paper';
+import Toast from 'react-native-toast-message';
 
 import { Linking, ScrollView, View } from 'react-native';
 
 import type { Licenses } from 'npm-license-crawler';
 
+import { rootLogging } from '@/utils/log';
+
 import { spacing } from '@/constants';
 import { StyledView } from '@/style';
 import type { PropsWithNavigation } from '@/views/navigation/NavigationStack';
 
 import licenses from '@root/licenses.json';
 
+const log = rootLogging.extend('LicensesScreen');
+
 const LicensesScreen: FC<PropsWithNavigation> = ({ navigation }) => {
   const { t } = useTranslation();
   const theme = useTheme();
@@ -41,6 +46,12 @@ const LicensesScreen: FC<PropsWithNavigation> = ({ navigation }) => {
                             const url = repository || licenseUrl;
                             if (await Linking.canOpenURL(url)) {
                               await Linking.openURL(url);
+                            } else {
+                              log.error(`Cannot open URL: ${url}`);
+                              Toast.show({
+                                type: 'error',
+                                text1: t('cannotOpenUrl'),
+                              });
                             }
                           }
                         : undefined

diff --git a/src/views/navigation/screens/InformationGroup/SystemInformationScreen.tsx b/src/views/navigation/screens/InformationGroup/SystemInformationScreen.tsx
@@ -3,6 +3,7 @@ import { useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Box } from 'react-native-flex-layout';
 import { Appbar, Badge, List, Switch, useTheme } from 'react-native-paper';
+import Toast from 'react-native-toast-message';
 
 import { Linking, ScrollView, View } from 'react-native';
 
@@ -20,13 +21,16 @@ import useHasNewOpenDtuVersion from '@/hooks/useHasNewOpenDtuVersion';
 
 import correctTag from '@/utils/correctTag';
 import formatBytes from '@/utils/formatBytes';
+import { rootLogging } from '@/utils/log';
 import percentage from '@/utils/percentage';
 
 import { colors, spacing } from '@/constants';
 import { useAppDispatch, useAppSelector } from '@/store';
 import { StyledView } from '@/style';
 import type { PropsWithNavigation } from '@/views/navigation/NavigationStack';
 
+const log = rootLogging.extend('SystemInformationScreen');
+
 const SystemInformationScreen: FC<PropsWithNavigation> = ({ navigation }) => {
   const theme = useTheme();
   const { t } = useTranslation();
@@ -62,8 +66,14 @@ const SystemInformationScreen: FC<PropsWithNavigation> = ({ navigation }) => {
 
     if (await Linking.canOpenURL(url)) {
       await Linking.openURL(url);
+    } else {
+      log.error(`Cannot open URL: ${url}`);
+      Toast.show({
+        type: 'error',
+        text1: t('cannotOpenUrl'),
+      });
     }
-  }, [systemStatus]);
+  }, [systemStatus, t]);
 
   const versionString = useMemo(() => {
     if (!latestVersion || !systemStatus?.git_hash)