Post rebase fixes

coi-dev · Jun 4, 2020 · 0da1451 · 0da1451
1 parent 5341906
commit 0da1451
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/lib/src/contact/contact_change.dart b/lib/src/contact/contact_change.dart
@@ -162,7 +162,7 @@ class _ContactChangeState extends State<ContactChange> {
                     _navigation.pop(context);
                   } else {
                     if (state.contactStateData.id != null) {
-                      Core.Context coreContext = Core.Context();
+                      dcc.Context coreContext = dcc.Context();
                       var chatId = await coreContext.createChatByContactId(state.contactStateData.id);
                       chatRepository.putIfAbsent(id: chatId);
                       _navigation.pushAndRemoveUntil(

diff --git a/lib/src/message/message_item_event_state.dart b/lib/src/message/message_item_event_state.dart
@@ -40,8 +40,6 @@
  * for more details.
  */
 
-import 'dart:ui';
-
 import 'package:equatable/equatable.dart';
 import 'package:meta/meta.dart';
 import 'package:metadata_fetch/metadata_fetch.dart';
@@ -229,7 +227,7 @@ class MessageStateData extends Equatable {
       ];
 }
 
-class ChatStateData extends Equatable{
+class ChatStateData extends Equatable {
   final int id;
   final String name;
 

diff --git a/lib/src/share/share_bloc.dart b/lib/src/share/share_bloc.dart
@@ -48,9 +48,8 @@ import 'package:ox_coi/src/contact/contact_list_bloc.dart';
 import 'package:ox_coi/src/contact/contact_list_event_state.dart';
 import 'package:ox_coi/src/data/contact_repository.dart';
 import 'package:ox_coi/src/platform/method_channel.dart';
-import 'package:ox_coi/src/platform/preferences.dart';
-import 'package:ox_coi/src/share/share_event_state.dart';
 import 'package:ox_coi/src/share/incoming_shared_data.dart';
+import 'package:ox_coi/src/share/share_event_state.dart';
 
 class ShareBloc extends Bloc<ShareEvent, ShareState> {
   ChatListBloc _chatListBloc = ChatListBloc();