Get message improvements

Author: mikemilla

android/build.gradle

@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:7.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

android/src/main/kotlin/com/courier/courier_flutter/CourierFlutterExtensions.kt

@@ -1,9 +1,28 @@
 package com.courier.courier_flutter
 
+import android.content.Intent
 import com.courier.android.client.CourierClient
 import com.courier.android.models.CourierDevice
+import com.courier.android.utils.trackPushNotificationClick
+import com.google.firebase.messaging.RemoteMessage
 import com.google.gson.GsonBuilder
 
+// Remote Message
+
+internal fun Intent.getAndTrackRemoteMessage(): RemoteMessage? {
+
+    var clickedMessage: RemoteMessage? = null
+
+    // Try and track the clicked message
+    // Will return a message if the message was able to be tracked
+    trackPushNotificationClick { message ->
+        clickedMessage = message
+    }
+
+    return clickedMessage
+
+}
+
 // Courier Device
 
 internal fun Map<*, *>.toCourierDevice(): CourierDevice {

android/src/main/kotlin/com/courier/courier_flutter/Utils.kt

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:7.1.3'
         // START: FlutterFire Configuration
         classpath 'com.google.gms:google-services:4.3.10'
         // END: FlutterFire Configuration

example/android/build.gradle

@@ -1,54 +1,52 @@
+import 'package:integration_test/integration_test.dart';
 import 'package:courier_flutter/courier_preference_channel.dart';
 import 'package:courier_flutter/courier_preference_status.dart';
 import 'package:courier_flutter/models/courier_device.dart';
 import 'package:courier_flutter/models/courier_tracking_event.dart';
 import 'package:courier_flutter_sample/env.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:integration_test/integration_test.dart';
 import 'package:uuid/uuid.dart';
 
-import 'client_builder.dart';
-import 'example_server.dart';
+import 'utils.dart';
 
 void main() {
+
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
-  final userId = const Uuid().v1();
+  final userId = const Uuid().v4();
   const trackingUrl = "https://af6303be-0e1e-40b5-bb80-e1d9299cccff.ct0.app/t/tzgspbr4jcmcy1qkhw96m0034bvy";
 
-  Future<String> sendMessage(String userId) {
-    return ExampleServer.sendTest(Env.authKey, userId, "inbox");
-  }
+  group('Options', () {
 
-  Future delay({int milliseconds = 5000}) {
-    return Future.delayed(Duration(milliseconds: milliseconds));
-  }
-
-  group('Client Tests', () {
-    test('Options are setup', () async {
+    test('Setup', () async {
       final client = await ClientBuilder.build(userId: userId);
       final options = client.options;
       expect(options.userId, userId);
     });
+
   });
 
   group('Brand Tests', () {
+
     test('Get Brand', () async {
       final client = await ClientBuilder.build(userId: userId);
       final res = await client.brands.getBrand(brandId: Env.brandId);
       expect(res.data?.brand, isNotNull);
       expect(res.data?.brand?.settings?.inapp?.showCourierFooter, false);
     });
+
   });
 
   group('Token Management Tests', () {
+
     test('Put Token', () async {
       final client = await ClientBuilder.build(userId: userId);
       await client.tokens.putUserToken(
         token: 'example_token',
         provider: 'firebase-fcm',
       );
     });
+
     test('Put Token with Device', () async {
       final client = await ClientBuilder.build(userId: userId);
       final device = CourierDevice(appId: 'example_app_id');
@@ -58,6 +56,7 @@ void main() {
         device: device,
       );
     });
+
     test('Delete Token', () async {
       final client = await ClientBuilder.build(userId: userId);
       final device = CourierDevice(appId: 'example_app_id');
@@ -70,33 +69,39 @@ void main() {
   });
 
   group('Tracking Tests', () {
+
     test('Track Delivered', () async {
       final client = await ClientBuilder.build(userId: userId);
       await client.tracking.postTrackingUrl(
         url: trackingUrl,
         event: CourierTrackingEvent.delivered,
       );
     });
+
     test('Track Clicked', () async {
       final client = await ClientBuilder.build(userId: userId);
       await client.tracking.postTrackingUrl(
         url: trackingUrl,
         event: CourierTrackingEvent.clicked,
       );
     });
+
   });
 
   group('Preferences Tests', () {
+
     test('Get Preferences', () async {
       final client = await ClientBuilder.build(userId: userId);
       final res = await client.preferences.getUserPreferences();
       expect(res.items, isNotEmpty);
     });
+
     test('Get Preference Topic', () async {
       final client = await ClientBuilder.build(userId: userId);
       final res = await client.preferences.getUserPreferenceTopic(topicId: Env.preferenceTopicId);
       expect(res.topic.topicId, Env.preferenceTopicId);
     });
+
     test('Put Preference Topic', () async {
       final client = await ClientBuilder.build(userId: userId);
       await client.preferences.putUserPreferenceTopic(
@@ -106,26 +111,37 @@ void main() {
         customRouting: [CourierUserPreferencesChannel.push],
       );
     });
+
   });
 
   group('Inbox Tests', () {
+
     test('Get All Messages', () async {
+      await sendMessage(userId);
+      await delay();
       final client = await ClientBuilder.build(userId: userId);
       final res = await client.inbox.getMessages();
-      expect(res.data?.messages, isNotNull);
+      expect(res.data?.messages?.nodes?.length, 1);
     });
+
     test('Get Archived Messages', () async {
+      final messageId = await sendMessage(userId);
+      await delay();
       final client = await ClientBuilder.build(userId: userId);
+      await client.inbox.archive(messageId: messageId);
       final res = await client.inbox.getArchivedMessages();
-      expect(res.data?.messages, isNotNull);
+      final message = res.data?.messages?.nodes?.first;
+      expect(message?.archived, true);
     });
+
     test('Get Message By ID', () async {
       final messageId = await sendMessage(userId);
       await delay();
       final client = await ClientBuilder.build(userId: userId);
       final res = await client.inbox.getMessageById(messageId: messageId);
       expect(res.data?.message.messageId, messageId);
     });
+
     test('Get Unread Message Count', () async {
       final newUser = const Uuid().v1();
       await sendMessage(newUser);
@@ -134,41 +150,49 @@ void main() {
       final count = await client.inbox.getUnreadMessageCount();
       expect(count, 1);
     });
+
     test('Open Message', () async {
       final messageId = await sendMessage(userId);
       await delay();
       final client = await ClientBuilder.build(userId: userId);
       await client.inbox.open(messageId: messageId);
     });
+
     test('Click Message', () async {
       final messageId = await sendMessage(userId);
       await delay();
       final client = await ClientBuilder.build(userId: userId);
       await client.inbox.click(messageId: messageId, trackingId: "example_id");
     });
+
     test('Read Message', () async {
       final messageId = await sendMessage(userId);
       await delay();
       final client = await ClientBuilder.build(userId: userId);
       await client.inbox.read(messageId: messageId);
     });
+
     test('Unread Message', () async {
       final messageId = await sendMessage(userId);
       await delay();
       final client = await ClientBuilder.build(userId: userId);
       await client.inbox.unread(messageId: messageId);
     });
+
     test('Archive Message', () async {
       final messageId = await sendMessage(userId);
       await delay();
       final client = await ClientBuilder.build(userId: userId);
       await client.inbox.archive(messageId: messageId);
     });
+
     test('Read All Messages', () async {
       await sendMessage(userId);
       await delay();
       final client = await ClientBuilder.build(userId: userId);
       await client.inbox.readAll();
     });
+
   });
+
 }