Removed unnecessary async keywords. Use own fork for proxies to support PAC files on android.

Author: RandomModderJDK

lib/discord_util.dart

@@ -27,7 +27,7 @@ class ConfirmationToast extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) => HWMToast(
-        color: Colors.green.shade900.withOpacity(0.8),
+        color: Colors.green.shade900.withValues(alpha: 0.8),
         icon: const Icon(Icons.check),
         text: text,
       );
@@ -42,7 +42,7 @@ class ErrorToast extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) => HWMToast(
-        color: Colors.redAccent.withOpacity(0.8),
+        color: Colors.redAccent.withValues(alpha: 0.8),
         icon: const Icon(Icons.sms_failed_rounded),
         text: text,
       );

lib/general_util.dart

@@ -22,7 +22,7 @@ class _DiscordRouteState extends State<DiscordRoute> {
             itemCount: snapshot.data!.length,
             child: (position) => DiscordRelationListItem(
               dr: snapshot.data![position],
-              onEdit: () async => showDialog<bool>(
+              onEdit: () => showDialog<bool>(
                 context: context,
                 builder: (context) => DiscordRelationFormDialog(
                   dr: snapshot.data![position],
@@ -48,7 +48,8 @@ class _DiscordRouteState extends State<DiscordRoute> {
                       ),
                       action: SnackBarAction(
                         label: context.locals.deleteDiscordRelationToastUndo,
-                        onPressed: () => DBHelper.insertDiscordRelation(dr).then((value) => setState(() {})),
+                        onPressed: () => DBHelper.insertDiscordRelation(dr)
+                            .then((value) => setState(() {})),
                       ),
                     ),
                   );
@@ -80,7 +81,7 @@ class _DiscordRouteState extends State<DiscordRoute> {
       ),
       body: discordRelationList(),
       floatingActionButton: FloatingActionButton(
-        onPressed: () async => showDialog<bool>(
+        onPressed: () => showDialog<bool>(
           context: context,
           builder: (context) => DiscordRelationFormDialog(
             title: context.locals.dialogDiscordRelationAddTitle,

lib/routes/discord_route.dart

@@ -32,7 +32,7 @@ class HomeRouteState extends State<HomeRoute> {
             itemCount: snapshot.data!.length,
             child: (position) => HWListItem(
               homework: snapshot.data![position],
-              onEdit: () async => showDialog(
+              onEdit: () => showDialog(
                 context: context,
                 builder: (context) => HomeworkFormDialog(
                   homework: snapshot.data![position],
@@ -130,9 +130,7 @@ class HomeRouteState extends State<HomeRoute> {
             tooltip: locals.discordHomeworkFetchTitle,
             onPressed: !DiscordHelper().isLoggedIn
                 ? null
-                : () => DiscordHelper().fetchHomework().then((map) async {
-              /*void Function(String text) discordError =
-                      (String text) => HWMToast(text: text, color: Colors.red, icon: const Icon(Icons.cloud_sync_outlined)).show();*/
+                : () => DiscordHelper().fetchHomework().then((map) {
               void fetchConfirmation(String text) =>
                   HWMToast(text: text, color: Colors.green.shade900, icon: const Icon(Icons.cloud_sync_outlined)).show();
               void fetchStatusUpdate(String text) =>
@@ -162,6 +160,9 @@ class HomeRouteState extends State<HomeRoute> {
                 DBHelper.insertHWPages(pages.toList());
                 setState(() {});
               });
+            }).catchError((e,s) {
+              // TODO: handle misconfiguration of permissions properly!
+              discordError(e.toString()); return null;
             }),
           ),
           IconButton(
@@ -176,7 +177,7 @@ class HomeRouteState extends State<HomeRoute> {
       ),
       body: hwListWidget(),
       floatingActionButton: FloatingActionButton(
-        onPressed: () async => showDialog(
+        onPressed: () => showDialog(
           context: context,
           builder: (context) => HomeworkFormDialog(
             title: context.locals.dialogHWAddTitle,

lib/routes/home_route.dart

@@ -51,12 +51,13 @@ class _ImageViewerRouteState extends State<ImageViewerRoute> {
       print("REFRESH IMAGES");
     }
     return FutureBuilder(
-      future: (() async => DBHelper.retrieveHWPages(widget.homework))(),
+      future: DBHelper.retrieveHWPages(widget.homework),
       builder: (_, snap) {
         if (snap.hasData) {
           _images.clear();
           _images.addAll(
-            snap.data!.map((e) => Image.memory(e.data, fit: BoxFit.scaleDown, gaplessPlayback: true)),
+            snap.data!.map((e) => Image.memory(e.data,
+                fit: BoxFit.scaleDown, gaplessPlayback: true)),
           );
           return _images[page];
         } else {
@@ -91,7 +92,8 @@ class _ImageViewerRouteState extends State<ImageViewerRoute> {
             transformationController: _controller,
             minScale: 0.75,
             maxScale: 50,
-            boundaryMargin: const EdgeInsets.symmetric(vertical: 200, horizontal: 700),
+            boundaryMargin:
+                const EdgeInsets.symmetric(vertical: 200, horizontal: 700),
             clipBehavior: Clip.none,
             child: SizedBox(
               width: MediaQuery.of(context).size.width,
@@ -128,7 +130,8 @@ class _ImageViewerRouteState extends State<ImageViewerRoute> {
             icon: const Icon(Icons.delete_rounded),
           ),
           IconButton(
-            onPressed: () => pickAndAddImage(context, widget.homework).then(_addPage),
+            onPressed: () =>
+                pickAndAddImage(context, widget.homework).then(_addPage),
             tooltip: context.locals.takePhoto,
             icon: const Icon(Icons.add_a_photo_rounded),
           ),

lib/routes/image_viewer_route.dart

@@ -127,7 +127,7 @@ class SettingsRoute extends StatelessWidget {
                 leading: const Icon(Icons.task_alt_rounded),
                 description:
                     Text(context.locals.settingsUntisTestLoginDescription),
-                onPressed: (context) async =>
+                onPressed: (context) =>
                     UntisHelper().loginWithPreferences().then(
                           (success) => success
                               ? untisConfirmation(locals.untisLoginSuccess)
@@ -446,7 +446,7 @@ class _SettingsDropdownMenuState<T> extends State<SettingsDropdownMenu<T>> {
   @override
   void initState() {
     widget.rebuildOnValueChange?.addListener(
-      () => widget.menuEntries().then((entries) async {
+      () => widget.menuEntries().then((entries) {
         if (kDebugMode) {
           print("ENTRIES AFTER NOTIFY: $entries");
         }

lib/routes/settings_route.dart

@@ -23,7 +23,7 @@ class _SubjectRouteState extends State<SubjectRoute> {
             itemCount: snapshot.data!.length,
             child: (position) => SubjectListItem(
               subject: snapshot.data![position],
-              onEdit: () async => showDialog<bool>(
+              onEdit: () => showDialog<bool>(
                 context: context,
                 builder: (context) => SubjectFormDialog(
                   subject: snapshot.data![position],
@@ -49,7 +49,8 @@ class _SubjectRouteState extends State<SubjectRoute> {
                       ),
                       action: SnackBarAction(
                         label: context.locals.deleteSubjectToastUndo,
-                        onPressed: () => DBHelper.insertSubject(subject).then((value) => setState(() {})),
+                        onPressed: () => DBHelper.insertSubject(subject)
+                            .then((value) => setState(() {})),
                       ),
                     ),
                   );
@@ -81,7 +82,7 @@ class _SubjectRouteState extends State<SubjectRoute> {
       ),
       body: subjectList(),
       floatingActionButton: FloatingActionButton(
-        onPressed: () async => showDialog<bool>(
+        onPressed: () => showDialog<bool>(
           context: context,
           builder: (context) => SubjectFormDialog(
             title: context.locals.dialogSubjectAddTitle,

lib/routes/subject_route.dart

@@ -22,7 +22,7 @@ class _SynchronizeRouteState extends State<SynchronizeRoute> {
             itemCount: snapshot.data!.length,
             child: (position) => SubjectListItem(
               subject: snapshot.data![position],
-              onEdit: () async => showDialog<bool>(
+              onEdit: () => showDialog<bool>(
                 context: context,
                 builder: (context) => SubjectFormDialog(
                   subject: snapshot.data![position],
@@ -81,7 +81,7 @@ class _SynchronizeRouteState extends State<SynchronizeRoute> {
       ),
       body: subjectList(),
       floatingActionButton: FloatingActionButton(
-        onPressed: () async => showDialog<bool>(
+        onPressed: () => showDialog<bool>(
           context: context,
           builder: (context) => SubjectFormDialog(
             title: context.locals.dialogSubjectAddTitle,