Merge pull request #4 from JoaoCaixinha/master

Ortc emoji support
realtime-framework · Oct 13, 2015 · 147cca1 · 147cca1
2 parents fc7ed65 + bd8cc73
commit 147cca1
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 7 deletions.
diff --git a/RCTRealtimeMessaging/OrtcClient.m b/RCTRealtimeMessaging/OrtcClient.m
@@ -1279,28 +1279,53 @@ - (void)opReceive:(NSString*) message {
 						[messagesBuffer setObject:msgSentDict forKey:messageId];
 					}
                     aMessage = [self escapeRecvChars:aMessage];
-					channelSubscription.onMessage(self, aChannel, aMessage);
-				}
+
+                    aMessage = [self checkForEmoji:aMessage];
+                    channelSubscription.onMessage(self, aChannel, aMessage);
+                }
             }
         }
     }
 }
 
+
+- (NSString*)checkForEmoji:(NSString*)str{
+    for (int i = 0; i < str.length; i++) {
+        unichar ascii = [str characterAtIndex:i];
+        if(ascii == '\\'){
+            i = i + 1;
+            int next = [str characterAtIndex:i];
+
+            if(next == 'u'){
+                NSString *emoji = [str substringWithRange:NSMakeRange(i - 1, 12)];
+                NSData *pos = [emoji dataUsingEncoding:NSUTF8StringEncoding];
+                emoji = [[NSString alloc] initWithData:pos encoding:NSNonLossyASCIIStringEncoding];
+
+                str = [str stringByReplacingCharactersInRange:NSMakeRange(i - 1, 12) withString:emoji];
+            }
+        }
+    }
+    return str;
+}
+
 - (NSString*)escapeRecvChars:(NSString*) str{
     str = [self simulateJsonParse:str];
     str = [self simulateJsonParse:str];
     return str;
 }
-- (NSString*)simulateJsonParse:(NSString*) str{
+
+- (NSString*)simulateJsonParse:(NSString*)str{
     NSMutableString *ms = [NSMutableString string];
     for(int i =0; i < [str length]; i++){
         unichar ascii = [str characterAtIndex:i];
+
         if(ascii > 128){ //unicode
             [ms appendFormat:@"%@", [NSString stringWithCharacters:&ascii length:1]];
-        } else { //ascii
+        }else { //ascii
             if(ascii == '\\'){
                 i = i + 1;
                 int next = [str characterAtIndex:i];
+
                 if(next == '\\'){
                     [ms appendString:@"\\"];
                 } else if(next == 'n'){
@@ -1315,13 +1340,15 @@ - (NSString*)simulateJsonParse:(NSString*) str{
                     [ms appendString:@"\r"];
                 } else if(next == 't'){
                     [ms appendString:@"\t"];
-                } 
+                } else if(next == 'u'){
+                    [ms appendString:@"\\u"];
+                }
             } else {
                 [ms appendFormat:@"%c", ascii];
             }
         }
     }
-    return ms;
+    return  ms ;
 }
 
 - (NSString*)generateId:(int) size

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-realtimemessaging-ios",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "The Realtime Framework Cloud Messaging Pub/Sub client for React-Native",
   "main": "RCTRealtimeMessagingIOS.js",
   "scripts": {