From 22189774d7d138b132eef7337b9e4331a7da86d8 Mon Sep 17 00:00:00 2001
From: JonOfUs <jonofus@flueren.eu>
Date: Wed, 12 Mar 2025 19:29:42 +0100
Subject: [PATCH] Remove unused code, add version to license screen
---
lib/manager/upload_manger.dart | 19 ++++++++++---------
lib/obs_settings_page.dart | 10 ++++++++--
lib/providers/trip_provider.dart | 5 -----
3 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/lib/manager/upload_manger.dart b/lib/manager/upload_manger.dart
index 579bce8..eff1c18 100644
--- a/lib/manager/upload_manger.dart
+++ b/lib/manager/upload_manger.dart
@@ -26,18 +26,19 @@ class UploadManager {
} catch (e) {
Sentry.captureException(e);
}
- await database.writeTxn(() async {
- final t = await database.trips.get(trip.id);
- if (t == null) {
- throw Exception("Trip was deleted while uploading!");
- }
- if (success) {
+ if (success) {
+ successCount++;
+ await database.writeTxn(() async {
+ final t = await database.trips.get(trip.id);
+ if (t == null) {
+ Sentry.captureException("Trip was deleted while uploading!");
+ return;
+ }
t.uploaded = true;
- successCount++;
database.trips.put(t);
- }
- });
+ });
+ }
}
return (successCount, trips.length);
}
diff --git a/lib/obs_settings_page.dart b/lib/obs_settings_page.dart
index 26f6dbb..acc737e 100644
--- a/lib/obs_settings_page.dart
+++ b/lib/obs_settings_page.dart
@@ -2,6 +2,7 @@ import 'package:app/database/privacy_zone.dart';
import 'package:app/widgets/map_page.dart';
import 'package:app/providers/privacy_zone_provider.dart';
import 'package:flutter/material.dart';
+import 'package:package_info_plus/package_info_plus.dart';
import 'package:provider/provider.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'widgets/number_editing_controller.dart';
@@ -76,6 +77,11 @@ class _OBSSettingsPageState extends State<OBSSettingsPage> {
});
}
+ Future<String> _getAppVersion() async {
+ final packageInfo = await PackageInfo.fromPlatform();
+ return packageInfo.version;
+ }
+
Future<void> _saveStringValue(String key, String value) async {
SharedPreferencesAsync prefs = SharedPreferencesAsync();
await prefs.setString(key, value);
@@ -237,11 +243,11 @@ class _OBSSettingsPageState extends State<OBSSettingsPage> {
),
//Show the licence page
ElevatedButton(
- onPressed: () {
+ onPressed: () async {
showLicensePage(
context: context,
applicationName: localizations.appTitle,
- applicationVersion: 'TODO',
+ applicationVersion: await _getAppVersion(),
);
},
child: Text(localizations.settingsPageShowLicensesButton),
diff --git a/lib/providers/trip_provider.dart b/lib/providers/trip_provider.dart
index 3f8b37a..ff94b1b 100644
--- a/lib/providers/trip_provider.dart
+++ b/lib/providers/trip_provider.dart
@@ -30,11 +30,6 @@ class TripProvider extends ChangeNotifier {
notifyListeners();
}
- // update the trip with the given id
- updateTrip(int id, Trip trip) async {
- await isar.writeTxn(() => isar.trips.put(trip));
- }
-
deleteTrip(int id) async {
// Remove the trip from the database
// We need at least one trip in the database
--
GitLab