Fix some small issues

chat-sdk · Dec 3, 2020 · 52e58a1 · 52e58a1
1 parent 7f022a7
commit 52e58a1
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 21 deletions.
diff --git a/ChatSDKCore/Classes/Handlers/Abstract/BAbstractCoreHandler.m b/ChatSDKCore/Classes/Handlers/Abstract/BAbstractCoreHandler.m
@@ -59,7 +59,7 @@ -(RXPromise *) pushUser: (BOOL) uploadAvatar {
  */
 -(id<PUser>) currentUserModel {
     NSString * currentUserID = BChatSDK.auth.currentUserID;
-    if (currentUserID && !_currentUser) {
+    if (currentUserID && (!_currentUser || !_currentUser.entityID)) {
         _currentUser = [BChatSDK.db fetchEntityWithID:currentUserID withType:bUserEntity];
     }
     return _currentUser;
@@ -68,10 +68,14 @@ -(RXPromise *) pushUser: (BOOL) uploadAvatar {
 -(RXPromise *) currentUserModelAsync {
     NSString * currentUserID = BChatSDK.auth.currentUserID;
     if (currentUserID.length && !_currentUser) {
-        return [BChatSDK.db performOnMain:^id {
+        RXPromise * promise = [RXPromise new];
+
+        [BChatSDK.db performOnMain:^{
             _currentUser = [BChatSDK.db fetchEntityWithID:currentUserID withType:bUserEntity];
-            return _currentUser;
+            [promise resolveWithResult:_currentUser];
         }];
+
+        return promise;
     } else {
         return [RXPromise resolveWithResult:_currentUser];
     }

diff --git a/ChatSDKCore/Classes/Interfaces/PStorageAdapter.h b/ChatSDKCore/Classes/Interfaces/PStorageAdapter.h
@@ -81,7 +81,7 @@ typedef enum {
 -(NSArray<PMessage> *) loadMessagesForThread: (id<PThread>) thread oldest: (int) count;
 
 //-(RXPromise *) performOnPrivate: (id (^)(void)) block;
--(RXPromise *) performOnMain: (id (^)(void)) block;
+-(void) performOnMain: (void(^)(void)) block;
 -(void) performOnMainAndWait:(void(^)(void)) block;
 
 //-(RXPromise *) performOnPrivateAndSave:(id (^)(void))block;

diff --git a/ChatSDKCoreData/Classes/BCoreDataStorageAdapter.m b/ChatSDKCoreData/Classes/BCoreDataStorageAdapter.m
@@ -309,10 +309,18 @@ -(id) fetchEntityWithID: (NSString *) entityID withType: (NSString *) type {
 //    return [self performOn:self.backgroundManagedObjectContext withBlock:block];
 //}
 
--(RXPromise *) performOnMain:(id(^)(void)) block  {
-    return [self performOn:_mainMoc withBlock:block];
+-(void) performOnMain: (void(^)(void)) block {
+    [_mainMoc performBlock:^{
+        if (block != nil) {
+            block();
+        }
+    }];
 }
 
+//-(RXPromise *) performOnMain:(id(^)(void)) block  {
+//    return [self performOn:_mainMoc withBlock:block];
+//}
+
 -(void) performOnMainAndWait:(void(^)(void)) block {
     [_mainMoc performBlockAndWait:^{
         block();
@@ -343,14 +351,14 @@ -(RXPromise *) performOnAndSave: (NSManagedObjectContext *) context withBlock: (
     return promise;
 }
 
--(RXPromise *) performOn: (NSManagedObjectContext *) context withBlock: (id(^)(void)) block {
-    RXPromise * promise = [RXPromise new];
-    [context performBlock:^{
-        id result = block();
-        [promise resolveWithResult:result];
-    }];
-    return promise;
-}
+//-(RXPromise *) performOn: (NSManagedObjectContext *) context withBlock: (void(^)(void)) block {
+//    RXPromise * promise = [RXPromise new];
+//    [context performBlock:^{
+//        block();
+//        [promise resolveWithResult:result];
+//    }];
+//    return promise;
+//}
 
 -(id) fetchOrCreateEntityWithID: (NSString *) entityID withType: (NSString *) type {
 

diff --git a/ChatSDKFirebase/FirebaseNetworkAdapter/Classes/Handlers/BFirebaseAuthenticationHandler.m b/ChatSDKFirebase/FirebaseNetworkAdapter/Classes/Handlers/BFirebaseAuthenticationHandler.m
@@ -151,10 +151,13 @@ -(RXPromise *) loginWithFirebaseUser: (FIRUser *) firebaseUser {
 -(RXPromise *) loginWithFirebaseUser: (FIRUser *) firebaseUser accountDetails: (BAccountDetails *) details {
 
     // If the user isn't authenticated they'll need to login
-    if (!firebaseUser) {
+    if (!firebaseUser || !firebaseUser.uid) {
         return [RXPromise resolveWithResult:Nil];
     }
 
+    // Save the authentication ID for the current user
+    [self setCurrentUserID:firebaseUser.uid];
+
     // Get the user
     id<PUser> cachedUser = [BChatSDK.db fetchEntityWithID:firebaseUser.uid withType:bUserEntity];
 
@@ -205,10 +208,7 @@ -(RXPromise *) loginWithFirebaseUser: (FIRUser *) firebaseUser accountDetails: (
 -(RXPromise *) completeAuthentication: (BAccountDetails *) details withUser: (id<PUser>) user {
 
     _isAuthenticatedThisSession = YES;
-
-    // Save the authentication ID for the current user
-    [self setCurrentUserID:user.entityID];
-
+
     // If the user was authenticated automatically
     if (!details) {
         [BHookNotification notificationDidAuthenticate:user type:bHook_AuthenticationTypeCached];

diff --git a/ChatSDKFirebase/FirebaseNetworkAdapter/Classes/Handlers/BFirebaseEventHandler.m b/ChatSDKFirebase/FirebaseNetworkAdapter/Classes/Handlers/BFirebaseEventHandler.m
@@ -13,8 +13,12 @@
 @implementation BFirebaseEventHandler
 
 -(void) currentUserOn: (NSString *) entityID {
-
+        
     id<PUser> user = [BChatSDK.db fetchEntityWithID:entityID withType:bUserEntity];
+
+    if (!user.entityID) {
+        NSLog(@"");
+    }
 
     [BHookNotification notificationUserOn:user];
 

diff --git a/ChatSDKUI/Classes/Components/Chat View/BTextInputView.m b/ChatSDKUI/Classes/Components/Chat View/BTextInputView.m
@@ -182,7 +182,8 @@ -(void) updateInterfaceForReachabilityStateChange {
     _optionsButton.enabled = connected;
 
     if (BChatSDK.config.disableSendButtonWhenDisconnected) {
-        connected = BChatSDK.core.connectionStatus == bConnectionStatusConnected;
+        bConnectionStatus status = BChatSDK.core.connectionStatus;
+        connected = status == bConnectionStatusConnected || status == bConnectionStatusNone;
         _sendButton.enabled = connected;
         _optionsButton.enabled = connected;
     }

diff --git a/ChatSDKUI/Classes/Swift/Views/ReconnectingView.swift b/ChatSDKUI/Classes/Swift/Views/ReconnectingView.swift
@@ -88,6 +88,7 @@ import KeepLayout
 //                self.isHidden = status == bConnectionStatusConnected
 
                 self?.label?.isHidden = connStatus == bConnectionStatusNone
+                self?.imageView?.isHidden = connStatus == bConnectionStatusNone
 
                 if connStatus == bConnectionStatusConnecting {
 //                    self.label?.text = Bundle.t(bConnecting)
@@ -104,7 +105,10 @@ import KeepLayout
                     self?.label?.text = Bundle.t(bOnline)
                     self?.stopBlink()
                     self?.imageView?.image = Bundle.uiImageNamed("icn_20_connected")
+                } else {
+                    self?.stopBlink()
                 }
+
                 self?.label?.keepWidth.equal = self?.label?.intrinsicContentSize.width ?? 130
             } else {
                 self?.isHidden = true