From 8feea02f68b8a15d941f06f98c8032d8f05a10e7 Mon Sep 17 00:00:00 2001 From: Kima Date: Mon, 4 Sep 2023 21:45:11 +0200 Subject: [PATCH] added api endpoint and auto update fix --- .../Flutter/flutter_export_environment 2.sh | 13 ++++++++ filcnaplo/lib/api/login.dart | 30 +++++++++---------- filcnaplo/lib/helpers/update_helper.dart | 15 ++++++---- filcnaplo/pubspec.yaml | 2 +- filcnaplo_kreta_api/lib/client/api.dart | 7 +++++ .../lib/providers/homework_provider.dart | 12 ++++++-- .../common/widgets/update/updates_view.dart | 29 +++++++++++++----- 7 files changed, 77 insertions(+), 31 deletions(-) create mode 100755 filcnaplo/ios/Flutter/flutter_export_environment 2.sh diff --git a/filcnaplo/ios/Flutter/flutter_export_environment 2.sh b/filcnaplo/ios/Flutter/flutter_export_environment 2.sh new file mode 100755 index 0000000..276363d --- /dev/null +++ b/filcnaplo/ios/Flutter/flutter_export_environment 2.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# This is a generated file; do not edit or check into version control. +export "FLUTTER_ROOT=/Users/kima/src/flutter" +export "FLUTTER_APPLICATION_PATH=/Users/kima/Documents/refilc/app/naplo/filcnaplo" +export "COCOAPODS_PARALLEL_CODE_SIGN=true" +export "FLUTTER_TARGET=lib/main.dart" +export "FLUTTER_BUILD_DIR=build" +export "FLUTTER_BUILD_NAME=4.2.0" +export "FLUTTER_BUILD_NUMBER=220" +export "DART_OBFUSCATION=false" +export "TRACK_WIDGET_CREATION=true" +export "TREE_SHAKE_ICONS=false" +export "PACKAGE_CONFIG=.dart_tool/package_config.json" diff --git a/filcnaplo/lib/api/login.dart b/filcnaplo/lib/api/login.dart index 961eece..4afc7ce 100644 --- a/filcnaplo/lib/api/login.dart +++ b/filcnaplo/lib/api/login.dart @@ -101,21 +101,21 @@ Future loginAPI({ Provider.of(context, listen: false).setUser(user.id); // Get user data - // try { - await Future.wait([ - Provider.of(context, listen: false).fetch(), - Provider.of(context, listen: false) - .fetch(week: Week.current()), - Provider.of(context, listen: false).fetch(), - Provider.of(context, listen: false).fetch(), - Provider.of(context, listen: false).fetchAll(), - Provider.of(context, listen: false).fetch(), - Provider.of(context, listen: false).fetch(), - Provider.of(context, listen: false).fetch(), - ]); - // } catch (error) { - // print("WARNING: failed to fetch user data: $error"); - // } + try { + await Future.wait([ + Provider.of(context, listen: false).fetch(), + Provider.of(context, listen: false) + .fetch(week: Week.current()), + Provider.of(context, listen: false).fetch(), + Provider.of(context, listen: false).fetch(), + Provider.of(context, listen: false).fetchAll(), + Provider.of(context, listen: false).fetch(), + Provider.of(context, listen: false).fetch(), + Provider.of(context, listen: false).fetch(), + ]); + } catch (error) { + print("WARNING: failed to fetch user data: $error"); + } if (onSuccess != null) onSuccess(); diff --git a/filcnaplo/lib/helpers/update_helper.dart b/filcnaplo/lib/helpers/update_helper.dart index 5aec576..52be719 100644 --- a/filcnaplo/lib/helpers/update_helper.dart +++ b/filcnaplo/lib/helpers/update_helper.dart @@ -25,18 +25,23 @@ extension UpdateHelper on Release { if (!await apk.exists()) { updateCallback(-1, UpdateState.downloading); - var bytes = await download(updateCallback: updateCallback); - if (!await StorageHelper.write(apk.path, bytes)) { - throw "failed to write apk: permission denied"; + var storagePerms = await Permission.storage.request().isGranted; + if (storagePerms) { + var bytes = await download(updateCallback: updateCallback); + if (!await StorageHelper.write(apk.path, bytes)) { + throw "failed to write apk: permission denied"; + } + } else { + throw storagePerms; } } updateCallback(-1, UpdateState.installing); - var permStatus = + var installPerms = (await Permission.manageExternalStorage.request().isGranted && await Permission.requestInstallPackages.request().isGranted); - if (permStatus) { + if (installPerms) { var result = await OpenFile.open(apk.path); if (result.type != ResultType.done) { diff --git a/filcnaplo/pubspec.yaml b/filcnaplo/pubspec.yaml index 3fa9e11..5ee5c56 100644 --- a/filcnaplo/pubspec.yaml +++ b/filcnaplo/pubspec.yaml @@ -3,7 +3,7 @@ description: "Nem hivatalos e-napló alkalmazás az e-Kréta rendszerhez" homepage: https://refilc.hu publish_to: "none" -version: 4.2.1+221 +version: 4.2.0+220 environment: sdk: ">=2.17.0 <3.0.0" diff --git a/filcnaplo_kreta_api/lib/client/api.dart b/filcnaplo_kreta_api/lib/client/api.dart index cb8674b..4060961 100644 --- a/filcnaplo_kreta_api/lib/client/api.dart +++ b/filcnaplo_kreta_api/lib/client/api.dart @@ -24,6 +24,11 @@ class KretaAPI { KretaApiEndpoints.groupAverages + "?oktatasiNevelesiFeladatUid=" + uid; + static String averages(String iss, String uid) => + BaseKreta.kreta(iss) + + KretaApiEndpoints.averages + + "?oktatasiNevelesiFeladatUid=" + + uid; static String timetable(String iss, {DateTime? start, DateTime? end}) => BaseKreta.kreta(iss) + KretaApiEndpoints.timetable + @@ -90,6 +95,8 @@ class KretaApiEndpoints { static const groups = "/ellenorzo/V3/Sajat/OsztalyCsoportok"; static const groupAverages = "/ellenorzo/V3/Sajat/Ertekelesek/Atlagok/OsztalyAtlagok"; + static const averages = + "/ellenorzo/V3/Sajat/Ertekelesek/Atlagok/TantargyiAtlagok"; static const timetable = "/ellenorzo/V3/Sajat/OrarendElemek"; static const exams = "/ellenorzo/V3/Sajat/BejelentettSzamonkeresek"; static const homework = "/ellenorzo/V3/Sajat/HaziFeladatok"; diff --git a/filcnaplo_kreta_api/lib/providers/homework_provider.dart b/filcnaplo_kreta_api/lib/providers/homework_provider.dart index 3a20e1f..58c697b 100644 --- a/filcnaplo_kreta_api/lib/providers/homework_provider.dart +++ b/filcnaplo_kreta_api/lib/providers/homework_provider.dart @@ -73,8 +73,16 @@ class HomeworkProvider with ChangeNotifier { if (user == null) throw "Cannot fetch Homework for User null"; String iss = user.instituteCode; - List? homeworkJson = await Provider.of(_context, listen: false) - .getAPI(KretaAPI.homework(iss, start: from)); + + List? homeworkJson = []; + + try { + homeworkJson = await Provider.of(_context, listen: false) + .getAPI(KretaAPI.homework(iss, start: from)); + } catch (e) { + // error fetcing homework (unknown error) + } + if (homeworkJson == null) throw "Cannot fetch Homework for User ${user.id}"; List homework = []; diff --git a/filcnaplo_mobile_ui/lib/common/widgets/update/updates_view.dart b/filcnaplo_mobile_ui/lib/common/widgets/update/updates_view.dart index 07386a1..7463ce5 100755 --- a/filcnaplo_mobile_ui/lib/common/widgets/update/updates_view.dart +++ b/filcnaplo_mobile_ui/lib/common/widgets/update/updates_view.dart @@ -18,7 +18,8 @@ class UpdateView extends StatefulWidget { final Release release; - static void show(Release release, {required BuildContext context}) => showBottomCard(context: context, child: UpdateView(release)); + static void show(Release release, {required BuildContext context}) => + showBottomCard(context: context, child: UpdateView(release)); @override _UpdateViewState createState() => _UpdateViewState(); @@ -45,7 +46,8 @@ class _UpdateViewState extends State { children: [ Text( "new_update".i18n, - style: const TextStyle(fontWeight: FontWeight.w700, fontSize: 18.0), + style: const TextStyle( + fontWeight: FontWeight.w700, fontSize: 18.0), ), Text( "${widget.release.version}", @@ -75,7 +77,7 @@ class _UpdateViewState extends State { borderRadius: BorderRadius.circular(12.0), ), child: SizedBox( - height: 125.0, + height: 200.0, child: Markdown( padding: const EdgeInsets.symmetric(horizontal: 12.0), physics: const BouncingScrollPhysics(), @@ -91,21 +93,30 @@ class _UpdateViewState extends State { child: Row( mainAxisSize: MainAxisSize.min, children: [ - if (state == UpdateState.downloading || state == UpdateState.preparing) + if (state == UpdateState.downloading || + state == UpdateState.preparing) Container( height: 18.0, width: 18.0, margin: const EdgeInsets.only(right: 8.0), child: CircularProgressIndicator( value: progress > 0.05 ? progress : null, - color: ColorUtils.foregroundColor(AppColors.of(context).filc), + color: ColorUtils.foregroundColor( + AppColors.of(context).filc), ), ), - Text(["download".i18n, "downloading".i18n, "downloading".i18n, "installing".i18n][state.index].toUpperCase()), + Text([ + "download".i18n, + "downloading".i18n, + "downloading".i18n, + "installing".i18n + ][state.index] + .toUpperCase()), ], ), backgroundColor: AppColors.of(context).filc, - onPressed: state == UpdateState.none ? () => downloadPrecheck() : null, + onPressed: + state == UpdateState.none ? () => downloadPrecheck() : null, ), ), ], @@ -113,7 +124,8 @@ class _UpdateViewState extends State { ); } - String fmtSize() => "${(widget.release.downloads.first.size / 1024 / 1024).toStringAsFixed(1)} MB"; + String fmtSize() => + "${(widget.release.downloads.first.size / 1024 / 1024).toStringAsFixed(1)} MB"; void downloadPrecheck() { final status = Provider.of(context, listen: false); @@ -157,6 +169,7 @@ class _UpdateViewState extends State { .then((_) => Navigator.of(context).maybePop()) .catchError((error, stackTrace) { if (mounted) { + Navigator.of(context).maybePop(); ScaffoldMessenger.of(context).showSnackBar(CustomSnackBar( context: context, content: Text("error".i18n),