Bugfixes

android/app/build.gradle

@@ -81,6 +81,10 @@ android {
  }
  minifyEnabled true
  shrinkResources true
+ proguardFiles(
+ getDefaultProguardFile("proguard-android-optimize.txt"),
+ "proguard-rules.pro"
+ )
  }
  }
 }

android/app/proguard-rules.pro

@@ -0,0 +1,29 @@
+##---------------Begin: proguard configuration for Gson ----------
+## Gson rules
+# Gson uses generic type information stored in a class file when working with fields. Proguard
+# removes such information by default, so configure it to keep all of it.
+-keepattributes Signature
+
+# For using GSON @Expose annotation
+-keepattributes *Annotation*
+
+# Gson specific classes
+-dontwarn sun.misc.**
+#-keep class com.google.gson.stream.** { *; }
+
+# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
+# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
+-keep class * extends com.google.gson.TypeAdapter
+-keep class * implements com.google.gson.TypeAdapterFactory
+-keep class * implements com.google.gson.JsonSerializer
+-keep class * implements com.google.gson.JsonDeserializer
+
+# Prevent R8 from leaving Data object members always null
+-keepclassmembers,allowobfuscation class * {
+ @com.google.gson.annotations.SerializedName <fields>;
+}
+
+# Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher.
+-keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
+-keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken
+##---------------End: proguard configuration for Gson ----------

android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
- ext.kotlin_version = "1.9.0"
+ ext.kotlin_version = "1.9.10"
  repositories {
  google()
  mavenCentral()
  }
 
  dependencies {
- classpath "com.android.tools.build:gradle:8.1.0"
+ classpath "com.android.tools.build:gradle:8.1.2"
  classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
  }
 }
@@ -17,21 +17,23 @@ allprojects {
  mavenCentral()
  }
  gradle.projectsEvaluated {
- tasks.withType(JavaCompile) {
- // to see deprecation warnings
- //options.compilerArgs << "-Xlint:deprecation"
+ tasks.withType(JavaCompile).tap {
+ configureEach {
+ // to see deprecation warnings
+ options.compilerArgs << "-Xlint:deprecation"
+ }
  }
  }
 }
 
-rootProject.buildDir = "../build"
+rootProject.layout.buildDirectory = "../build"
 subprojects {
- project.buildDir = "${rootProject.buildDir}/${project.name}"
+ project.layout.buildDirectory = "${rootProject.layout.buildDirectory}/${project.name}"
 }
 subprojects {
  project.evaluationDependsOn(":app")
 }
 
 tasks.register("clean", Delete) {
- delete rootProject.buildDir
+ delete rootProject.layout.buildDirectory
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip

lib/class/abstract_Place.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:foss_warn/services/saveAndLoadSharedPreferences.dart';
 import 'package:provider/provider.dart';
 
 import '../main.dart';
@@ -9,29 +10,17 @@ import 'class_WarnMessage.dart';
 
 abstract class Place {
  final String _name;
- int _countWarnings = 0;
  List<WarnMessage> _warnings = [];
- String _eTag = "";
-
- String get eTag => _eTag;
-
- set eTag(String newETag) {
- _eTag = newETag;
- }
+ String eTag = "";
 
  Place({required String name, required List<WarnMessage> warnings, required String eTag}) : _warnings = warnings, _name = name {
- _countWarnings = this._warnings.length;
- _eTag = eTag;
+ eTag = eTag;
  }
 
  String get name => _name;
- int get countWarnings=> _countWarnings;
+ int get countWarnings=> this.warnings.length;
  List<WarnMessage> get warnings => _warnings;
 
- // control the number of warnings
- void incrementNumberOfWarnings() => _countWarnings++;
- void decrementNumberOfWarnings() => _countWarnings--;
-
  // control the list for warnings
  void addWarningToList(WarnMessage warnMessage) => _warnings.add(warnMessage);
  void removeWarningFromList(WarnMessage warnMessage) => _warnings.remove(warnMessage);
@@ -66,6 +55,7 @@ abstract class Place {
  Future<void> sendNotificationForWarnings() async {
  for (WarnMessage myWarnMessage in _warnings) {
  print(myWarnMessage.headline);
+ print("Read: " + myWarnMessage.read.toString() + " notified " + myWarnMessage.notified.toString());
  print("should notify? :" +
  ((!myWarnMessage.read && !myWarnMessage.notified) &&
  _checkIfEventShouldBeNotified(myWarnMessage.event))
@@ -111,6 +101,7 @@ abstract class Place {
  }
  final updater = Provider.of<Update>(context, listen: false);
  updater.updateReadStatusInList();
+ saveMyPlacesList();
  }
 
  /// return [true] or false if the warning should be irgnored or not
@@ -125,5 +116,6 @@ abstract class Place {
  return true;
  }
  }
+
  Map<String, dynamic> toJson();
 }

lib/class/class_Area.dart

@@ -2,24 +2,19 @@ import '../services/createAreaListFromJson.dart';
 import 'class_Geocode.dart';
 
 class Area {
- String _areaDesc; // Kreisname
- List<Geocode> _geocodeList; // Liste mit Ortschaften
- Area({required String areaDesc, required List<Geocode> geocodeList})
- : _geocodeList = geocodeList,
- _areaDesc = areaDesc;
+ String areaDescription; // Kreisname
+ List<Geocode> geocodeList; // Liste mit Ortschaften
 
- /// returns the description (kreisname)
- String get areaDescription => _areaDesc;
- void set areaDescription(String desc) => _areaDesc = desc;
- List<Geocode> get geocodeList => _geocodeList;
- void set geocodeList(List<Geocode> list) => _geocodeList = list;
+ Area({required String areaDesc, required List<Geocode> geocodeList})
+ : this.areaDescription = areaDesc,
+ this.geocodeList = geocodeList;
 
  Area.fromJson(Map<String, dynamic> json)
- : _areaDesc = json['areaDesc'],
- _geocodeList = geocodeListFromJson(json['geocodeList']);
+ : areaDescription = json['areaDesc'],
+ geocodeList = geocodeListFromJson(json['geocodeList']);
 
  Map<String, dynamic> toJson() => {
- 'areaDesc': _areaDesc,
- 'geocodeList': _geocodeList,
+ 'areaDesc': areaDescription,
+ 'geocodeList': geocodeList,
  };
 }

lib/class/class_NinaPlace.dart

@@ -16,7 +16,7 @@ class NinaPlace extends Place {
 
  /// returns the name of the place with the state
  @override
- String get name => "${super.name}, (${_geocode.stateName})";
+ String get name => "${super.name} (${_geocode.stateName})";
 
  String get nameWithoutState => super.name;
 

lib/class/class_NotificationService.dart

@@ -130,7 +130,7 @@ class NotificationService {
  await _flutterLocalNotificationsPlugin
  .resolvePlatformSpecificImplementation<
  AndroidFlutterLocalNotificationsPlugin>()
- ?.requestPermission();
+ ?.requestNotificationsPermission();
 
  // init the different notifications channels
  try {

lib/class/class_userPreferences.dart

@@ -26,8 +26,10 @@ class UserPreferences {
  bool showAllWarnings = false;
  bool areWarningsFromCache = false;
 
- String versionNumber = "0.6.0-alpha_2 "; // shown in the about view
+ String versionNumber = "0.6.0-alpha_3 "; // shown in the about view
 
  bool activateAlertSwiss = false;
  bool isFirstStart = true;
+
+ Duration networkTimeout = Duration(seconds: 8);
 }

lib/main.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:foss_warn/class/class_alarmManager.dart';
 import 'package:foss_warn/class/class_userPreferences.dart';
 import 'package:foss_warn/services/geocodeHandler.dart';
+import 'package:foss_warn/services/legacyHandler.dart';
 import 'package:foss_warn/services/listHandler.dart';
 import 'package:foss_warn/views/AboutView.dart';
 import 'package:provider/provider.dart';
@@ -19,7 +20,6 @@ import 'class/class_NotificationService.dart';
 
 import 'services/updateProvider.dart';
 import 'services/saveAndLoadSharedPreferences.dart';
-import 'services/sortWarnings.dart';
 
 import 'widgets/SourceStatusWidget.dart';
 import 'widgets/dialogs/SortByDialog.dart';
@@ -31,16 +31,15 @@ final UserPreferences userPreferences = UserPreferences();
 
 void main() async {
  WidgetsFlutterBinding.ensureInitialized();
+ await legacyHandler();
  await NotificationService().init();
- // TODO: run Legacy handler, use improved shared preferences types and names
-
  await loadSettings();
 
  if (userPreferences.shouldNotifyGeneral) {
- print("Background notification enabled");
- // AlarmManager().cancelBackgroundTask(); // just for debug
+ AlarmManager.callback();
  AlarmManager().initialize();
  AlarmManager().registerBackgroundTask();
+ print("Background notification enabled");
  } else {
  print("Background notification disabled due to user setting");
  }
@@ -103,6 +102,8 @@ class _HomeViewState extends State<HomeView> {
  print("call geocode handler");
  geocodeHandler();
  }
+ //display information if the app had to be resetted
+ showMigrationDialog(context);
  }
 
  void listenNotifications() {
@@ -147,7 +148,6 @@ class _HomeViewState extends State<HomeView> {
  return SortByDialog();
  },
  );
- sortWarnings();
  final updater = Provider.of<Update>(context, listen: false);
  updater.updateReadStatusInList();
  },
@@ -159,7 +159,7 @@ class _HomeViewState extends State<HomeView> {
  }
  final snackBar = SnackBar(
  content: Text(
- AppLocalizations.of(context)
+ AppLocalizations.of(context)!
  .main_app_bar_tooltip_mark_all_warnings_as_read,
  style: TextStyle(color: Colors.black),
  ),
@@ -171,7 +171,7 @@ class _HomeViewState extends State<HomeView> {
  ScaffoldMessenger.of(context).showSnackBar(snackBar);
  },
  icon: Icon(Icons.mark_chat_read),
- tooltip: AppLocalizations.of(context)
+ tooltip: AppLocalizations.of(context)!
  .main_app_bar_tooltip_mark_all_warnings_as_read,
  ),
  PopupMenuButton(
@@ -194,12 +194,12 @@ class _HomeViewState extends State<HomeView> {
  },
  itemBuilder: (context) => <PopupMenuEntry>[
  PopupMenuItem(
- child: Text(AppLocalizations.of(context)
+ child: Text(AppLocalizations.of(context)!
  .main_dot_menu_settings),
  value: 0),
  PopupMenuItem(
- child: Text(
- AppLocalizations.of(context).main_dot_menu_about),
+ child: Text(AppLocalizations.of(context)!
+ .main_dot_menu_about),
  value: 1)
  ])
  ],
@@ -208,11 +208,11 @@ class _HomeViewState extends State<HomeView> {
  items: <BottomNavigationBarItem>[
  BottomNavigationBarItem(
  icon: Icon(Icons.add_alert),
- label: AppLocalizations.of(context).main_nav_bar_all_warnings,
+ label: AppLocalizations.of(context)!.main_nav_bar_all_warnings,
  ),
  BottomNavigationBarItem(
  icon: Icon(Icons.place),
- label: AppLocalizations.of(context).main_nav_bar_my_places,
+ label: AppLocalizations.of(context)!.main_nav_bar_my_places,
  ),
  ],
  currentIndex: _selectedIndex,

lib/services/alertSwiss.dart

@@ -1,5 +1,7 @@
 import 'dart:convert';
 
+import 'package:foss_warn/main.dart';
+
 import '../class/class_AlertSwissPlace.dart';
 import '../class/abstract_Place.dart';
 import '../class/class_WarnMessage.dart';
@@ -25,7 +27,7 @@ Future callAlertSwissAPI() async {
  await loadETags();
 
  // get overview if warnings exits for myplaces
- response = await get(Uri.parse(url));
+ response = await get(Uri.parse(url)).timeout(userPreferences.networkTimeout);
 
  // check if request was sucsessfully
  if (response.statusCode == 200) {

lib/services/apiHandler.dart

@@ -44,7 +44,8 @@ Future<void> callAPI() async {
  else if (place is NinaPlace) {
  try {
  Response _response;
- _response = await getDashboard(place, _baseUrl);
+ _response =
+ await getDashboard(place, _baseUrl).timeout(userPreferences.networkTimeout);
 
  // 304 = with etag no change since last request
  if (_response.statusCode == 304) {
@@ -56,7 +57,8 @@ Future<void> callAPI() async {
  _data = jsonDecode(utf8.decode(_response.bodyBytes));
  _tempWarnMessageList.clear();
  // parse the _data into List of Warnings
- _tempWarnMessageList = await parseNinaJsonData(_data, _baseUrl, place);
+ _tempWarnMessageList = await parseNinaJsonData(_data, _baseUrl, place)
+ .timeout(userPreferences.networkTimeout);
  // remove old warning
  removeOldWarningFromList(place, _tempWarnMessageList);
  userPreferences.areWarningsFromCache = false;
@@ -145,8 +147,7 @@ Future<Response> getDashboard(NinaPlace place, String baseUrl) async {
  // get overview if warnings exits for myplaces
  print("Etag for: ${place.name} is ${place.eTag}");
 
- _response =
- await get(_urlDashboard, headers: {'If-None-Match': place.eTag});
+ _response = await get(_urlDashboard, headers: {'If-None-Match': place.eTag});
 
  place.eTag = _response.headers["etag"]!;
  print("new etag for: ${place.name} is: ${_response.headers["etag"]}");
@@ -177,7 +178,6 @@ Future<List<WarnMessage>> parseNinaJsonData(
  " " +
  temp.notified.toString());
  place.addWarningToList(temp);
- place.incrementNumberOfWarnings();
  }
 
  // } //@todo: fix displaying warnings twice
@@ -205,6 +205,5 @@ void removeOldWarningFromList(
  }
  for (WarnMessage message in warnMessagesToRemove) {
  place.removeWarningFromList(message);
- place.decrementNumberOfWarnings();
  }
 }