Merge pull request #65 from SAMA-Communications/development

Release 0.9.0

Author: artem-yatchenko

.env.example

@@ -0,0 +1,12 @@
+API_KEY_ANDROID=YOUR_API_KEY
+APP_ID_ANDROID=YOUR_APP_ID
+MESSAGING_SENDER_ID_ANDROID=YOUR_MESSAGING_SENDER_ID
+PROJECT_ID_ANDROID=YOUR_PROJECT_ID
+STORAGE_BUCKET_ANDROID=YOUR_STORAGE_BUCKET
+
+API_KEY_IOS=YOUR_API_KEY
+APP_ID_IOS=YOUR_APP_ID
+MESSAGING_SENDER_ID_IOS=YOUR_MESSAGING_SENDER_ID
+PROJECT_ID_IOS=YOUR_PROJECT_ID
+STORAGE_BUCKET_IOS=YOUR_STORAGE_BUCKET
+IOS_BUNDLE_ID_IOS=YOUR_IOS_BUNDLE_ID

.gitignore

@@ -12,7 +12,7 @@ pubspec.lock
 doc/api/
 
 # dotenv environment variables file
-.env*
+.env
 
 # Avoid committing generated Javascript files:
 *.dart.js

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.9.0
+
+### Features:
+- Implemented offline mode for chats
+- Implemented offline mode for messages
+- Improved message attachments caching
+
 ## 0.8.0
 
 ### Features:

lib/firebase_options.dart

@@ -1,11 +1,12 @@
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
-import 'firebase_options.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
+import 'sama_firebase_options.dart';
 import 'src/api/api.dart';
 import 'src/db/db_service.dart';
+import 'src/db/local/attachment_local_datasource.dart';
 import 'src/db/local/conversation_local_datasource.dart';
 import 'src/db/local/message_local_datasource.dart';
 import 'src/db/local/user_local_datasource.dart';
@@ -18,6 +19,7 @@ import 'src/repository/messages/messages_repository.dart';
 import 'src/repository/user/user_repository.dart';
 import 'src/shared/auth/bloc/auth_bloc.dart';
 import 'src/shared/connection/bloc/connection_bloc.dart';
+import 'src/shared/messages_collector/messages_collector.dart';
 import 'src/shared/push_notifications/bloc/push_notifications_bloc.dart';
 import 'src/shared/secure_storage.dart';
 import 'src/shared/sharing/bloc/sharing_intent_bloc.dart';
@@ -29,7 +31,7 @@ final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
   await Firebase.initializeApp(
-    options: DefaultFirebaseOptions.currentPlatform,
+    options: await SamaFirebaseOptions.currentPlatform,
   );
   FirebaseMessaging.onBackgroundMessage(onBackgroundMessage);
   DatabaseService.instance.init();
@@ -53,6 +55,7 @@ class _AppState extends State<App> {
   late final MessageLocalDatasource _messageLocalDatasource;
   late final AttachmentsRepository _attachmentsRepository;
   late final UserLocalDataSource _userLocalDataSource;
+  late final AttachmentLocalDatasource _attachmentLocalDatasource;
 
   @override
   void initState() {
@@ -61,26 +64,30 @@ class _AppState extends State<App> {
     _conversationLocalDatasource = ConversationLocalDatasource();
     _messageLocalDatasource = MessageLocalDatasource();
     _userLocalDataSource = UserLocalDataSource();
+    _attachmentLocalDatasource = AttachmentLocalDatasource();
     _userRepository = UserRepository(localDataSource: _userLocalDataSource);
     _authenticationRepository = AuthenticationRepository(_userRepository);
     _messagesRepository = MessagesRepository(
         localDatasource: _messageLocalDatasource,
         userRepository: _userRepository);
-    _attachmentsRepository = AttachmentsRepository();
+    _attachmentsRepository = AttachmentsRepository(_attachmentLocalDatasource);
     _conversationRepository = ConversationRepository(
         localDatasource: _conversationLocalDatasource,
         userRepository: _userRepository,
         messagesRepository: _messagesRepository);
     _globalSearchRepository = GlobalSearchRepository(
         conversationRepository: _conversationRepository,
         userRepository: _userRepository);
+    MessagesCollector.instance
+        .init(_conversationRepository, _messagesRepository);
   }
 
   @override
   void dispose() {
     _authenticationRepository.dispose();
     _messagesRepository.dispose();
     _conversationRepository.dispose();
+    MessagesCollector.instance.destroy();
     DatabaseService.instance.close();
     super.dispose();
   }
@@ -113,7 +120,10 @@ class _AppState extends State<App> {
           create: (context) => AuthenticationBloc(
               authenticationRepository: _authenticationRepository),
         ),
-        BlocProvider(create: (context) => ConnectionBloc(), lazy: false),
+        BlocProvider(
+            create: (context) => ConnectionBloc(
+                authenticationRepository: _authenticationRepository),
+            lazy: false),
         BlocProvider(create: (context) => SharingIntentBloc()),
         BlocProvider(
             create: (context) => PushNotificationsBloc(

lib/main.dart

@@ -5,7 +5,7 @@
   "entities": [
     {
       "id": "8:6709400528399140612",
-      "lastPropertyId": "4:2743437583742703683",
+      "lastPropertyId": "5:5717160279142175066",
       "name": "AttachmentModel",
       "properties": [
         {
@@ -18,8 +18,8 @@
           "id": "2:747399038920962484",
           "name": "fileId",
           "type": 9,
-          "flags": 34848,
-          "indexId": "15:626623788693270148"
+          "flags": 2080,
+          "indexId": "37:873959491954871870"
         },
         {
           "id": "3:768953523524252804",
@@ -30,6 +30,11 @@
           "id": "4:2743437583742703683",
           "name": "fileBlurHash",
           "type": 9
+        },
+        {
+          "id": "5:5717160279142175066",
+          "name": "url",
+          "type": 9
         }
       ],
       "relations": []
@@ -302,7 +307,7 @@
     }
   ],
   "lastEntityId": "13:9106374520578572502",
-  "lastIndexId": "35:2642777293408708995",
+  "lastIndexId": "37:873959491954871870",
   "lastRelationId": "5:7785256265115248397",
   "lastSequenceId": "0:0",
   "modelVersion": 5,
@@ -323,7 +328,9 @@
     8590772032330868498,
     8137762055088700512,
     7050184320199163165,
-    5813459946923529345
+    5813459946923529345,
+    626623788693270148,
+    6221333517652902864
   ],
   "retiredPropertyUids": [
     5244948909752663107,

lib/objectbox-model.json

@@ -0,0 +1,40 @@
+import 'package:firebase_core/firebase_core.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
+
+class SamaFirebaseOptions {
+  static Future<FirebaseOptions> get currentPlatform async {
+    try {
+      await dotenv.load(fileName: ".env");
+    } catch (e) {
+      print('Error loading .env file: $e');
+    }
+    switch (defaultTargetPlatform) {
+      case TargetPlatform.android:
+        return android;
+      case TargetPlatform.iOS:
+        return ios;
+      default:
+        throw UnsupportedError(
+          'SamaFirebaseOptions are not supported for this platform.',
+        );
+    }
+  }
+
+  static FirebaseOptions android = FirebaseOptions(
+    apiKey: dotenv.env['API_KEY_ANDROID'] ?? '',
+    appId: dotenv.env['APP_ID_ANDROID'] ?? '',
+    messagingSenderId: dotenv.env['MESSAGING_SENDER_ID_ANDROID'] ?? '',
+    projectId: dotenv.env['PROJECT_ID_ANDROID'] ?? '',
+    storageBucket: dotenv.env['STORAGE_BUCKET_ANDROID'] ?? '',
+  );
+
+  static FirebaseOptions ios = FirebaseOptions(
+    apiKey: dotenv.env['API_KEY_IOS'] ?? '',
+    appId: dotenv.env['APP_ID_IOS'] ?? '',
+    messagingSenderId: dotenv.env['MESSAGING_SENDER_ID_IOS'] ?? '',
+    projectId: dotenv.env['PROJECT_ID_IOS'] ?? '',
+    storageBucket: dotenv.env['STORAGE_BUCKET_IOS'] ?? '',
+    iosBundleId: dotenv.env['IOS_BUNDLE_ID_IOS'] ?? '',
+  );
+}

lib/objectbox.g.dart

@@ -21,8 +21,14 @@ Future<bool> sendMessage({
     if (message.attachments != null) 'attachments': message.attachments,
   };
 
+  if (SamaConnectionService.instance.connectionState !=
+      ConnectionState.connected) {
+    return Future.value(false);
+  }
+
   return SamaConnectionService.instance
-      .sendRequest(messageRequestName, dataToSend, retryRequestId: message.id)
+      .sendRequest(messageRequestName, dataToSend,
+          retryRequestId: message.id, shouldRetry: false)
       .timeout(messageRequestTimeout)
       .then((response) {
     if (message.id == response['mid']) {