(iOS): Fix escaping of line endings in multi-line log messages being …

…sent from native iOS implementation to JS console. Resolves #401.
dpa99c · May 19, 2020 · 09af8d3 · 09af8d3
1 parent 0221f42
commit 09af8d3
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/ios/FirebasePlugin.m b/src/ios/FirebasePlugin.m
@@ -1618,27 +1618,28 @@ - (void)executeGlobalJavascript: (NSString*)jsString
 - (void)_logError: (NSString*)msg
 {
  NSLog(@"%@ ERROR: %@", LOG_TAG, msg);
- NSString* jsString = [NSString stringWithFormat:@"console.error(\"%@: %@\")", LOG_TAG, [self escapeDoubleQuotes:msg]];
+ NSString* jsString = [NSString stringWithFormat:@"console.error(\"%@: %@\")", LOG_TAG, [self escapeJavascriptString:msg]];
  [self executeGlobalJavascript:jsString];
 }
 
 - (void)_logInfo: (NSString*)msg
 {
  NSLog(@"%@ INFO: %@", LOG_TAG, msg);
- NSString* jsString = [NSString stringWithFormat:@"console.info(\"%@: %@\")", LOG_TAG, [self escapeDoubleQuotes:msg]];
+ NSString* jsString = [NSString stringWithFormat:@"console.info(\"%@: %@\")", LOG_TAG, [self escapeJavascriptString:msg]];
  [self executeGlobalJavascript:jsString];
 }
 
 - (void)_logMessage: (NSString*)msg
 {
  NSLog(@"%@ LOG: %@", LOG_TAG, msg);
- NSString* jsString = [NSString stringWithFormat:@"console.log(\"%@: %@\")", LOG_TAG, [self escapeDoubleQuotes:msg]];
+ NSString* jsString = [NSString stringWithFormat:@"console.log(\"%@: %@\")", LOG_TAG, [self escapeJavascriptString:msg]];
  [self executeGlobalJavascript:jsString];
 }
 
-- (NSString*)escapeDoubleQuotes: (NSString*)str
+- (NSString*)escapeJavascriptString: (NSString*)str
 {
- NSString *result =[str stringByReplacingOccurrencesOfString: @"\"" withString: @"\\\""];
+ NSString* result = [str stringByReplacingOccurrencesOfString: @"\"" withString: @"\\\""];
+ result = [result stringByReplacingOccurrencesOfString: @"\n" withString: @"\\\n"];
  return result;
 }