fix: complete and delete task logic

CCExtractor · Jul 6, 2024 · c190e1a · c190e1a
1 parent 33a10cb
commit c190e1a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/lib/api_service.dart b/lib/api_service.dart
@@ -141,18 +141,24 @@ Future<void> updateTasksInDatabase(List<Tasks> tasks) async {
           localTask.status,
           localTask.uuid!,
         );
+        if (localTask.status == 'completed') {
+          completeTask('email', localTask.uuid!);
+        } else if (localTask.status == 'deleted') {
+          deleteTask('email', localTask.uuid!);
+        }
       }
     }
   }
 }
 
-Future<void> deleteTask(
-    String email, String encryptionSecret, String uuid, String taskUuid) async {
+Future<void> deleteTask(String email, String taskUuid) async {
+  var c = await CredentialsStorage.getClientId();
+  var e = await CredentialsStorage.getEncryptionSecret();
   final url = Uri.parse('$baseUrl/delete-task');
   final body = jsonEncode({
     'email': email,
-    'encryptionSecret': encryptionSecret,
-    'UUID': uuid,
+    'encryptionSecret': e,
+    'UUID': c,
     'taskuuid': taskUuid,
   });
 
@@ -175,13 +181,14 @@ Future<void> deleteTask(
   }
 }
 
-Future<void> completeTask(
-    String email, String encryptionSecret, String uuid, String taskUuid) async {
+Future<void> completeTask(String email, String taskUuid) async {
+  var c = await CredentialsStorage.getClientId();
+  var e = await CredentialsStorage.getEncryptionSecret();
   final url = Uri.parse('$baseUrl/complete-task');
   final body = jsonEncode({
     'email': email,
-    'encryptionSecret': encryptionSecret,
-    'UUID': uuid,
+    'encryptionSecret': e,
+    'UUID': c,
     'taskuuid': taskUuid,
   });
 

diff --git a/lib/app/modules/home/views/show_tasks.dart b/lib/app/modules/home/views/show_tasks.dart
@@ -8,7 +8,6 @@ import 'package:taskwarrior/app/modules/home/views/show_details.dart';
 import 'package:taskwarrior/app/utils/constants/palette.dart';
 import 'package:taskwarrior/app/utils/constants/taskwarrior_colors.dart';
 import 'package:taskwarrior/app/utils/constants/taskwarrior_fonts.dart';
-import 'package:taskwarrior/app/utils/taskchampion/credentials_storage.dart';
 import 'package:taskwarrior/app/utils/theme/app_settings.dart';
 
 class TaskViewBuilder extends StatelessWidget {
@@ -234,23 +233,17 @@ class TaskViewBuilder extends StatelessWidget {
   }
 
   void _markTaskAsCompleted(String uuid) async {
-    String clientId = (await CredentialsStorage.getClientId()) ?? '';
-    String encryptionSecret =
-        (await CredentialsStorage.getEncryptionSecret()) ?? '';
     TaskDatabase taskDatabase = TaskDatabase();
     await taskDatabase.open();
     taskDatabase.markTaskAsCompleted(uuid);
-    completeTask('email', encryptionSecret, clientId, uuid);
+    completeTask('email', uuid);
   }
 
   void _markTaskAsDeleted(String uuid) async {
-    String clientId = (await CredentialsStorage.getClientId()) ?? '';
-    String encryptionSecret =
-        (await CredentialsStorage.getEncryptionSecret()) ?? '';
     TaskDatabase taskDatabase = TaskDatabase();
     await taskDatabase.open();
     taskDatabase.markTaskAsDeleted(uuid);
-    deleteTask('email', encryptionSecret, clientId, uuid);
+    deleteTask('email', uuid);
   }
 
   Color _getPriorityColor(String priority) {