Merge branch 'dev' into notifications

filcnaplo/lib/helpers/notification_helper.dart

@@ -22,7 +22,9 @@ class NotificationsHelper {
   @pragma('vm:entry-point')
   void backgroundJob() async {
     // initialize providers
-    database = DatabaseProvider();
+    FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin =
+        FlutterLocalNotificationsPlugin();
+    DatabaseProvider database = DatabaseProvider();
     await database.init();
     settingsProvider =
         await database.query.getSettings(database);
@@ -54,45 +56,48 @@ class NotificationsHelper {
 
       // loop through grades and see which hasn't been seen yet
       for (Grade grade in grades) {
-        // if the grade was added over a week ago, don't show it to avoid notification spam
-        if (grade.seenDate.isAfter(lastSeenGrade) && grade.date.difference(DateTime.now()).inDays * -1 < 7) {
-          // send notificiation about new grade
-          const AndroidNotificationDetails androidNotificationDetails =
-              AndroidNotificationDetails('GRADES', 'Jegyek',
-                  channelDescription: 'Értesítés jegyek beírásakor',
-                  importance: Importance.max,
-                  priority: Priority.max,
-                  color: const Color(0xFF3D7BF4),
-                  ticker: 'Jegyek');
-          const NotificationDetails notificationDetails = NotificationDetails(android: androidNotificationDetails);
-          if(userProvider.getUsers().length == 1) {
-          await flutterLocalNotificationsPlugin.show(
-              grade.id.hashCode,
-              "title_grade".i18n,
-              "body_grade".i18n.fill([
-                grade.value.value.toString(),
-                grade.subject.isRenamed &&
-                        settingsProvider.renamedSubjectsEnabled
-                    ? grade.subject.renamedTo!
-                    : grade.subject.name
-              ]),
-              notificationDetails);
-        } else { // multiple users are added, also display student name
-          await flutterLocalNotificationsPlugin.show(
-              grade.id.hashCode,
-              "title_grade".i18n,
-              "body_grade_multiuser".i18n.fill([
-                userProvider.displayName!,
-                grade.value.value.toString(),
-                grade.subject.isRenamed &&
-                        settingsProvider.renamedSubjectsEnabled
-                    ? grade.subject.renamedTo!
-                    : grade.subject.name
-              ]),
-              notificationDetails);
-        }
+        // if grade is not a normal grade (1-5), don't show it
+        if ([1, 2, 3, 4, 5].contains(grade.value.value)) {
+          // if the grade was added over a week ago, don't show it to avoid notification spam
+          if (grade.seenDate.isAfter(lastSeenGrade) && grade.date.difference(DateTime.now()).inDays * -1 < 7) {
+            // send notificiation about new grade
+            const AndroidNotificationDetails androidNotificationDetails =
+                AndroidNotificationDetails('GRADES', 'Jegyek',
+                    channelDescription: 'Értesítés jegyek beírásakor',
+                    importance: Importance.max,
+                    priority: Priority.max,
+                    color: const Color(0xFF3D7BF4),
+                    ticker: 'Jegyek');
+            const NotificationDetails notificationDetails = NotificationDetails(android: androidNotificationDetails);
+            if(userProvider.getUsers().length == 1) {
+            await flutterLocalNotificationsPlugin.show(
+                grade.id.hashCode,
+                "title_grade".i18n,
+                "body_grade".i18n.fill([
+                  grade.value.value.toString(),
+                  grade.subject.isRenamed &&
+                          settingsProvider.renamedSubjectsEnabled
+                      ? grade.subject.renamedTo!
+                      : grade.subject.name
+                ]),
+                notificationDetails);
+          } else { // multiple users are added, also display student name
+            await flutterLocalNotificationsPlugin.show(
+                grade.id.hashCode,
+                "title_grade".i18n,
+                "body_grade_multiuser".i18n.fill([
+                  userProvider.displayName!,
+                  grade.value.value.toString(),
+                  grade.subject.isRenamed &&
+                          settingsProvider.renamedSubjectsEnabled
+                      ? grade.subject.renamedTo!
+                      : grade.subject.name
+                ]),
+                notificationDetails);
+          }
         } 
       }
+      }
       // set grade seen status
       gradeProvider.seenAll();
   }

filcnaplo/lib/helpers/update_helper.dart

@@ -6,6 +6,7 @@ import 'package:filcnaplo/api/client.dart';
 import 'package:filcnaplo/helpers/storage_helper.dart';
 import 'package:filcnaplo/models/release.dart';
 import 'package:open_file/open_file.dart';
+import 'package:permission_handler/permission_handler.dart';
 
 enum UpdateState { none, preparing, downloading, installing }
 
@@ -32,12 +33,17 @@ extension UpdateHelper on Release {
 
     updateCallback(-1, UpdateState.installing);
 
-    var result = await OpenFile.open(apk.path);
+    var permStatus =
+        (await Permission.manageExternalStorage.request().isGranted &&
+            await Permission.requestInstallPackages.request().isGranted);
+    if (permStatus) {
+      var result = await OpenFile.open(apk.path);
 
-    if (result.type != ResultType.done) {
-      // ignore: avoid_print
-      print("ERROR: installUpdate.openFile: ${result.message}");
-      throw result.message;
+      if (result.type != ResultType.done) {
+        // ignore: avoid_print
+        print("ERROR: installUpdate.openFile: ${result.message}");
+        throw result.message;
+      }
     }
 
     updateCallback(-1, UpdateState.none);