added server recommendations

made listId optional
go-vikunja · May 12, 2023 · 882bf55 · 882bf55
1 parent 77a1e8c
commit 882bf55
Show file tree

Hide file tree

Showing 5 changed files with 203 additions and 92 deletions.
diff --git a/lib/api/list_implementation.dart b/lib/api/list_implementation.dart
@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:developer';
 
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:vikunja_app/api/client.dart';
@@ -48,9 +47,10 @@ class ListAPIService extends APIService implements ListService {
   Future<List<TaskList>?> getAll() {
     return client.get('/lists').then(
         (list) {
-          if (list == null) return null;
+          if (list == null || list.statusCode != 200) return null;
           if (list.body.toString().isEmpty)
             return Future.value([]);
+          print(list.statusCode);
           return convertList(list.body, (result) => TaskList.fromJson(result));});
   }
 
@@ -66,7 +66,7 @@ class ListAPIService extends APIService implements ListService {
     }
     return client.get('/namespaces/$namespaceId/lists').then(
         (list) {
-          if (list == null) return null;
+          if (list == null || list.statusCode != 200) return null;
           return convertList(list.body, (result) => TaskList.fromJson(result));
         });
   }

diff --git a/lib/global.dart b/lib/global.dart
@@ -1,7 +1,6 @@
 import 'dart:developer' as dev;
 
 import 'package:flutter/material.dart';
-import 'package:flutter_timezone/flutter_timezone.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:vikunja_app/api/bucket_implementation.dart';
 import 'package:vikunja_app/api/client.dart';
@@ -19,7 +18,6 @@ import 'package:vikunja_app/managers/user.dart';
 import 'package:vikunja_app/models/user.dart';
 import 'package:vikunja_app/service/services.dart';
 import 'package:timezone/data/latest_all.dart' as tz;
-import 'package:flutter_local_notifications/flutter_local_notifications.dart'as notifs;
 import 'package:workmanager/workmanager.dart';
 
 
@@ -147,18 +145,21 @@ class VikunjaGlobalState extends State<VikunjaGlobal> {
   }
 
 
-  void logoutUser(BuildContext context) {
-    _storage.deleteAll().then((_) {
+  void logoutUser(BuildContext context) async {
+//    _storage.deleteAll().then((_) {
+      var userId = await _storage.read(key: "currentUser");
+      _storage.delete(key: userId!); //delete token
+      _storage.delete(key: "${userId}_base");
       Navigator.pop(context);
       setState(() {
         client.reset();
         _currentUser = null;
       });
-    }).catchError((err) {
+ /*   }).catchError((err) {
       ScaffoldMessenger.of(context).showSnackBar(SnackBar(
         content: Text('An error occured while logging out!'),
       ));
-    });
+    });*/
   }
 
   void _loadCurrentUser() async {

diff --git a/lib/models/task.dart b/lib/models/task.dart
@@ -10,7 +10,7 @@ import 'package:vikunja_app/utils/checkboxes_in_text.dart';
 class Task {
   final int id;
   final int? parentTaskId, priority, bucketId;
-  final int listId;
+  final int? listId;
   final DateTime created, updated;
   DateTime? dueDate, startDate, endDate;
   final List<DateTime> reminderDates;