error handling and fixed logic with analytics

App-Elevate · Oct 10, 2023 · 4f4c6c4 · 4f4c6c4
1 parent 85aaeab
commit 4f4c6c4
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 10 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -13,8 +13,11 @@ void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   String? analyticsDisabled = await readData('disableAnalytics');
   // know if this release is debug
+  if (kDebugMode) {
+    analyticsDisabled = '1';
+  }
 
-  if (analyticsDisabled != '1' || kDebugMode) {
+  if (analyticsDisabled != '1') {
     analyticsEnabledGlobally = true;
     await Firebase.initializeApp(
       options: DefaultFirebaseOptions.currentPlatform,

diff --git a/lib/methods_vars/icanteen.dart b/lib/methods_vars/icanteen.dart
@@ -153,14 +153,18 @@ Future<Canteen> initCanteen({bool hasToBeNew = false, String? url, String? usern
     return Future.error('no internet');
   }
 
-  canteenData = CanteenData(
-    username: username,
-    url: url,
-    uzivatel: await canteenInstance!.ziskejUzivatele(),
-    jidlaNaBurze: await canteenInstance!.ziskatBurzu(),
-    jidelnicky: jidelnicky,
-    pocetJidel: {currentDateWithoutTime: jidelnicky[currentDateWithoutTime]!.jidla.length},
-  );
+  try {
+    canteenData = CanteenData(
+      username: username,
+      url: url,
+      uzivatel: await canteenInstance!.ziskejUzivatele(),
+      jidlaNaBurze: await canteenInstance!.ziskatBurzu(),
+      jidelnicky: jidelnicky,
+      pocetJidel: {currentDateWithoutTime: jidelnicky[currentDateWithoutTime]!.jidla.length},
+    );
+  } catch (e) {
+    return Future.error('no internet');
+  }
   smartPreIndexing(currentDateWithoutTime);
 
   return canteenInstance!;

diff --git a/lib/pages/jidelna.dart b/lib/pages/jidelna.dart
@@ -630,7 +630,14 @@ class _ObjednatJidloTlacitkoState extends State<ObjednatJidloTlacitko> {
                       ),
                     );
                   });
-                  Canteen canteen = await initCanteen();
+                  late Canteen canteen;
+                  try {
+                    canteen = await initCanteen();
+                  } catch (e) {
+                    snackBarMessage('Nastala chyba při objednávání jídla: $e');
+                    return;
+                  }
+
                   switch (stavJidla) {
                     case StavJidla.neobjednano:
                       {