Merge branch 'develop' of https://github.com/dreautall/waterfly-iii into develop

Author: dreautall

lib/l10n/app_en.arb

@@ -842,10 +842,18 @@
     "@settingsNLAppAddInfo": {
         "description": "Help text when no more app is available to add."
     },
+    "settingsNLAutoAdd": "Create transaction without interaction",
+    "@settingsNLAutoAdd": {
+        "description": "With this setting enabled, the transaction will be added automatically without further user interaction."
+    },
     "settingsNLDescription": "This service allows you to fetch transaction details from incoming push notifications. Additionally, you can select a default account which the transaction should be assigned to - if no value is set, it tries to extract an account from the notification.",
     "@settingsNLDescription": {
         "description": "Description text for the notification listener service."
     },
+    "settingsNLEmptyNote": "Keep note field empty",
+    "@settingsNLEmptyNote": {
+        "description": "Usually the note field will be pre-filled with the notification details. With this setting enabled, it will be empty instead."
+    },
     "settingsNLPermissionGrant": "Tap to grant permission.",
     "@settingsNLPermissionGrant": {
         "description": "Indicates user should tap the text to grant certain permissions (notification access)."
@@ -864,7 +872,7 @@
     },
     "settingsNLPrefillTXTitle": "Prefill transaction title with notification title",
     "@settingsNLPrefillTXTitle": {
-        "description": "First line for setting to use pre-fill transaction title with notification title."
+        "description": "Setting pre-fill transaction title with notification title."
     },
     "settingsNLServiceChecking": "Checking status…",
     "@settingsNLServiceChecking": {

lib/notificationlistener.dart

@@ -3,10 +3,14 @@ import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:logging/logging.dart';
 
+import 'package:chopper/chopper.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:notifications_listener_service/notifications_listener_service.dart';
+import 'package:timezone/data/latest.dart' as tz;
 
 import 'package:waterflyiii/app.dart';
+import 'package:waterflyiii/auth.dart';
+import 'package:waterflyiii/generated/swagger_fireflyiii_api/firefly_iii.swagger.dart';
 import 'package:waterflyiii/pages/transaction.dart';
 import 'package:waterflyiii/settings.dart';
 
@@ -70,17 +74,19 @@ void nlCallback() async {
   log.finest(() => "nlCallback()");
   NotificationServicePlugin.instance
       .executeNotificationListener((NotificationEvent? evt) async {
-    if (evt?.packageName?.startsWith("com.dreautall.waterflyiii") ?? false) {
+    if (evt == null || evt.packageName == null) {
       return;
     }
-    if (evt?.state == NotificationState.remove) {
+    if (evt.packageName?.startsWith("com.dreautall.waterflyiii") ?? false) {
+      return;
+    }
+    if (evt.state == NotificationState.remove) {
       return;
     }
 
-    final Iterable<RegExpMatch> matches =
-        rFindMoney.allMatches(evt?.text ?? "");
+    final Iterable<RegExpMatch> matches = rFindMoney.allMatches(evt.text ?? "");
     if (matches.isEmpty) {
-      log.finer(() => "nlCallback(${evt?.packageName}): no money found");
+      log.finer(() => "nlCallback(${evt.packageName}): no money found");
       return;
     }
 
@@ -93,40 +99,142 @@ void nlCallback() async {
       }
     }
     if (!validMatch) {
-      log.finer(() =>
-          "nlCallback(${evt?.packageName}): no money with currency found");
+      log.finer(
+          () => "nlCallback(${evt.packageName}): no money with currency found");
       return;
     }
 
-    SettingsProvider().notificationAddKnownApp(evt?.packageName ?? "");
+    final SettingsProvider settings = SettingsProvider();
 
-    if (!(await SettingsProvider().notificationUsedApps(forceReload: true))
-        .contains(evt?.packageName ?? "")) {
-      log.finer(() => "nlCallback(${evt?.packageName}): app not used");
+    settings.notificationAddKnownApp(evt.packageName!);
+
+    if (!(await settings.notificationUsedApps()).contains(evt.packageName)) {
+      log.finer(() => "nlCallback(${evt.packageName}): app not used");
       return;
     }
 
-    FlutterLocalNotificationsPlugin().show(
-      DateTime.now().millisecondsSinceEpoch ~/ 1000,
-      "Create Transaction?",
-      "Click to create a transaction based on the notification ${evt?.title}",
-      const NotificationDetails(
-        android: AndroidNotificationDetails(
-          'extract_transaction',
-          'Create Transaction from Notification',
-          channelDescription:
-              'Notification asking to create a transaction from another Notification.',
-          importance: Importance.low, // Android 8.0 and higher
-          priority: Priority.low, // Android 7.1 and lower
+    final NotificationAppSettings appSettings =
+        await settings.notificationGetAppSettings(evt.packageName!);
+    bool showNotification = true;
+
+    if (appSettings.autoAdd) {
+      tz.initializeTimeZones();
+      log.finer(() =>
+          "nlCallback(${evt.packageName}): trying to auto-add transaction");
+      try {
+        final FireflyService ffService = FireflyService();
+        if (!await ffService.signInFromStorage()) {
+          throw UnauthenticatedResponse;
+        }
+        final FireflyIii api = ffService.api;
+        final CurrencyRead localCurrency = ffService.defaultCurrency;
+        late CurrencyRead? currency;
+        late double amount;
+
+        (currency, amount) =
+            await parseNotificationText(api, evt.text!, localCurrency);
+        // Fallback solution
+        currency ??= localCurrency;
+
+        // Set date
+        DateTime date = ffService.tzHandler
+            .notificationTXTime(
+                DateTime.tryParse(evt.postTime ?? "") ?? DateTime.now())
+            .toLocal();
+        String note = "";
+        if (appSettings.autoAdd) {
+          note = evt.text ?? "";
+        }
+
+        // Check currency
+        if (currency != localCurrency) {
+          throw Exception("Can't auto-add TX with foreign currency");
+        }
+
+        // Check account
+        if (appSettings.defaultAccountId == null) {
+          throw Exception("Can't auto-add TX with no default account ID");
+        }
+
+        final TransactionStore newTx = TransactionStore(
+          groupTitle: null,
+          transactions: <TransactionSplitStore>[
+            TransactionSplitStore(
+              type: TransactionTypeProperty.withdrawal,
+              date: date,
+              amount: amount.toString(),
+              description: evt.title!,
+              // destinationId
+              // destinationName
+              notes: note,
+              order: 0,
+              sourceId: appSettings.defaultAccountId,
+            )
+          ],
+          applyRules: true,
+          fireWebhooks: true,
+          errorIfDuplicateHash: true,
+        );
+        final Response<TransactionSingle> resp =
+            await api.v1TransactionsPost(body: newTx);
+        if (!resp.isSuccessful || resp.body == null) {
+          try {
+            ValidationErrorResponse valError = ValidationErrorResponse.fromJson(
+              json.decode(resp.error.toString()),
+            );
+            throw Exception(valError.message);
+          } catch (_) {
+            throw Exception("unknown");
+          }
+        }
+
+        FlutterLocalNotificationsPlugin().show(
+          DateTime.now().millisecondsSinceEpoch ~/ 1000,
+          "Transaction created",
+          "Transaction created based on notification ${evt.title}",
+          const NotificationDetails(
+            android: AndroidNotificationDetails(
+              'extract_transaction_created',
+              'Transaction from Notification Created',
+              channelDescription:
+                  'Notification that a Transaction has been created from another Notification.',
+              importance: Importance.low, // Android 8.0 and higher
+              priority: Priority.low, // Android 7.1 and lower
+            ),
+          ),
+          payload: "",
+        );
+
+        showNotification = false;
+      } catch (e, stackTrace) {
+        log.severe("Error while auto-adding transaction", e, stackTrace);
+        showNotification = true;
+      }
+    }
+
+    if (showNotification) {
+      FlutterLocalNotificationsPlugin().show(
+        DateTime.now().millisecondsSinceEpoch ~/ 1000,
+        "Create Transaction?",
+        "Click to create a transaction based on the notification ${evt.title}",
+        const NotificationDetails(
+          android: AndroidNotificationDetails(
+            'extract_transaction',
+            'Create Transaction from Notification',
+            channelDescription:
+                'Notification asking to create a transaction from another Notification.',
+            importance: Importance.low, // Android 8.0 and higher
+            priority: Priority.low, // Android 7.1 and lower
+          ),
         ),
-      ),
-      payload: jsonEncode(NotificationTransaction(
-        evt?.packageName ?? "",
-        evt?.title ?? "",
-        evt?.text ?? "",
-        DateTime.tryParse(evt?.postTime ?? "") ?? DateTime.now(),
-      )),
-    );
+        payload: jsonEncode(NotificationTransaction(
+          evt.packageName ?? "",
+          evt.title ?? "",
+          evt.text ?? "",
+          DateTime.tryParse(evt.postTime ?? "") ?? DateTime.now(),
+        )),
+      );
+    }
   });
 }
 
@@ -150,3 +258,88 @@ Future<void> nlNotificationTap(
     ),
   );
 }
+
+Future<(CurrencyRead?, double)> parseNotificationText(
+    FireflyIii api, String notificationBody, CurrencyRead localCurrency) async {
+  CurrencyRead? currency;
+  double amount = 0;
+  // Try to extract some money
+  final Iterable<RegExpMatch> matches = rFindMoney.allMatches(notificationBody);
+  if (matches.isNotEmpty) {
+    RegExpMatch? validMatch;
+    for (RegExpMatch match in matches) {
+      if ((match.namedGroup("postCurrency")?.isNotEmpty ?? false) ||
+          (match.namedGroup("preCurrency")?.isNotEmpty ?? false)) {
+        validMatch = match;
+        break;
+      }
+    }
+    if (validMatch != null) {
+      // extract currency
+      String currencyStr = validMatch.namedGroup("preCurrency") ?? "";
+      String currencyStrAlt = validMatch.namedGroup("postCurrency") ?? "";
+      if (currencyStr.isEmpty) {
+        currencyStr = currencyStrAlt;
+      }
+      if (currencyStr.isEmpty) {
+        log.warning("no currency found");
+      }
+      if (localCurrency.attributes.code == currencyStr ||
+          localCurrency.attributes.symbol == currencyStr ||
+          localCurrency.attributes.code == currencyStrAlt ||
+          localCurrency.attributes.symbol == currencyStrAlt) {
+      } else {
+        final Response<CurrencyArray> response = await api.v1CurrenciesGet();
+        if (!response.isSuccessful || response.body == null) {
+          log.warning("api currency fetch failed");
+        } else {
+          for (CurrencyRead cur in response.body!.data) {
+            if (cur.attributes.code == currencyStr ||
+                cur.attributes.symbol == currencyStr ||
+                cur.attributes.code == currencyStrAlt ||
+                cur.attributes.symbol == currencyStrAlt) {
+              currency = cur;
+              break;
+            }
+          }
+        }
+      }
+      // extract amount
+      // Check if string has a decimal separator
+      final String amountStr =
+          (validMatch.namedGroup("amount") ?? "").replaceAll(" ", "");
+      final int decimalSepPos = amountStr.length >= 3 &&
+              (amountStr[amountStr.length - 3] == "." ||
+                  amountStr[amountStr.length - 3] == ",")
+          ? amountStr.length - 3
+          : amountStr.length - 2;
+      final String decimalSep =
+          amountStr.length >= decimalSepPos && decimalSepPos > 0
+              ? amountStr[decimalSepPos]
+              : "";
+      if (decimalSep == "," || decimalSep == ".") {
+        final double wholes = double.tryParse(amountStr
+                .substring(0, decimalSepPos)
+                .replaceAll(",", "")
+                .replaceAll(".", "")) ??
+            0;
+        final String decStr = amountStr
+            .substring(decimalSepPos + 1)
+            .replaceAll(",", "")
+            .replaceAll(".", "");
+        final double dec = double.tryParse(decStr) ?? 0;
+        amount = decStr.length == 1 ? wholes + dec / 10 : wholes + dec / 100;
+      } else {
+        amount = double.tryParse(
+                amountStr.replaceAll(",", "").replaceAll(".", "")) ??
+            0;
+      }
+    } else {
+      log.info("no currency was found");
+    }
+  } else {
+    log.warning("regex did not match");
+  }
+
+  return (currency, amount);
+}

lib/pages/settings/notifications.dart

@@ -339,11 +339,14 @@ class _AppCardState extends State<AppCard> {
                     width: MediaQuery.of(context).size.width - 128,
                     onSelected: (AccountRead? account) async {
                       FocusManager.instance.primaryFocus?.unfocus();
-                      if ((account?.id ?? "0") == "0") {
-                        widget.settings.defaultAccountId = null;
-                      } else {
-                        widget.settings.defaultAccountId = account!.id;
-                      }
+                      setState(() {
+                        if ((account?.id ?? "0") == "0") {
+                          widget.settings.defaultAccountId = null;
+                          widget.settings.autoAdd = false;
+                        } else {
+                          widget.settings.defaultAccountId = account!.id;
+                        }
+                      });
                       await context
                           .read<SettingsProvider>()
                           .notificationSetAppSettings(
@@ -355,6 +358,7 @@ class _AppCardState extends State<AppCard> {
                     title: Text(S.of(context).settingsNLPrefillTXTitle),
                     isThreeLine: false,
                     value: widget.settings.includeTitle,
+                    enabled: !widget.settings.autoAdd,
                     onChanged: (bool? value) async {
                       setState(() {
                         widget.settings.includeTitle = value ?? true;
@@ -365,6 +369,36 @@ class _AppCardState extends State<AppCard> {
                               widget.app, widget.settings);
                     },
                   ),
+                  CheckboxListTile(
+                    title: Text(S.of(context).settingsNLAutoAdd),
+                    isThreeLine: false,
+                    value: widget.settings.autoAdd,
+                    enabled: widget.settings.defaultAccountId != null,
+                    onChanged: (bool? value) async {
+                      setState(() {
+                        widget.settings.autoAdd = value ?? false;
+                        widget.settings.includeTitle = true;
+                      });
+                      await context
+                          .read<SettingsProvider>()
+                          .notificationSetAppSettings(
+                              widget.app, widget.settings);
+                    },
+                  ),
+                  CheckboxListTile(
+                    title: Text(S.of(context).settingsNLEmptyNote),
+                    isThreeLine: false,
+                    value: widget.settings.emptyNote,
+                    onChanged: (bool? value) async {
+                      setState(() {
+                        widget.settings.emptyNote = value ?? false;
+                      });
+                      await context
+                          .read<SettingsProvider>()
+                          .notificationSetAppSettings(
+                              widget.app, widget.settings);
+                    },
+                  ),
                 ],
               ),
             ),