Update notifications API request methods, fix activity not ending

ivirtex · Nov 1, 2023 · 6ee9e03 · 6ee9e03
1 parent 1f652af
commit 6ee9e03
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 24 deletions.
diff --git a/packages/notifications_api/lib/src/notifications_api.dart b/packages/notifications_api/lib/src/notifications_api.dart
@@ -1,5 +1,4 @@
 // Dart imports:
-import 'dart:convert';
 import 'dart:developer';
 import 'dart:io';
 
@@ -32,19 +31,11 @@ class NotificationsApi {
 
   /// Sends the given [token] to the API.
   Future<void> sendLiveActivityPushToken(String token) async {
-    final request = Uri.https(baseUrl, '/starcat/v1/push_token');
+    final request = Uri.https(baseUrl, '/starcat/v1/push_token/$token');
 
     log('sendLiveActivityPushToken: $request');
 
-    final response = await _httpClient.post(
-      request,
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: jsonEncode({
-        'token': token,
-      }),
-    );
+    final response = await _httpClient.post(request);
 
     if (response.statusCode != HttpStatus.created &&
         response.statusCode != HttpStatus.ok) {
@@ -53,19 +44,11 @@ class NotificationsApi {
   }
 
   Future<void> invalidateLiveActivityPushToken(String token) async {
-    final request = Uri.https(baseUrl, '/starcat/v1/push_token');
+    final request = Uri.https(baseUrl, '/starcat/v1/push_token/$token');
 
     log('invalidateLiveActivityPushToken: $request');
 
-    final response = await _httpClient.delete(
-      request,
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: jsonEncode({
-        'token': token,
-      }),
-    );
+    final response = await _httpClient.delete(request);
 
     if (response.statusCode == HttpStatus.notFound) {
       throw TokenAlreadyInvalidatedException();

diff --git a/packages/notifications_repository/lib/src/notifications_repository.dart b/packages/notifications_repository/lib/src/notifications_repository.dart
@@ -81,10 +81,11 @@ class NotificationsRepository {
         },
         // ignore: body_might_complete_normally_nullable
         ended: (state) async {
-          log('Activity is inactive, invalidating token');
+          log('Activity is inactive, invalidating token ${state.activityId}');
 
           try {
-            await _notificationsApi.invalidateLiveActivityPushToken(id);
+            await _notificationsApi
+                .invalidateLiveActivityPushToken(activityPushToken!);
           } catch (e) {
             log('Failed to invalidate push token', error: e);
 
@@ -101,7 +102,7 @@ class NotificationsRepository {
   Future<void> cancelLiveActivityTracking(String id) async {
     await activityUpdateStream!.cancel();
     await _liveActivitiesPlugin.endActivity(id);
-    await _notificationsApi.invalidateLiveActivityPushToken(id);
+    await _notificationsApi.invalidateLiveActivityPushToken(activityPushToken!);
     activityPushToken = null;
   }
 }