[go: nahoru, domu]
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove calls to LogInfo, LogError, LogDebug during obj-c +load. #706

Merged
merged 4 commits into from
Nov 23, 2021
Merged

Remove calls to LogInfo, LogError, LogDebug during obj-c +load. #706

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8aa84b0
Remove calls to LogInfo, LogError, LogDebug during obj-c +load.
jonsimantov Oct 18, 2021
90d5c20
Fix NSLog call
jonsimantov Oct 18, 2021
c221e8a
Merge branch 'main' into bugfix/ios15_load
jonsimantov Nov 22, 2021
74557de
Format code.
jonsimantov Nov 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Format code.
  • Loading branch information
@jonsimantov
jonsimantov committed Nov 22, 2021
commit 74557de122807cc9eebde6227494809e67525719
112 changes: 47 additions & 65 deletions app/src/util_ios.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ - (void)application:(UIApplication *)application
}
- (void)application:(UIApplication *)application
didReceiveRemoteNotification:(NSDictionary *)userInfo
fetchCompletionHandler:
(void (^)(UIBackgroundFetchResult result))handler {
fetchCompletionHandler:(void (^)(UIBackgroundFetchResult result))handler {
}
#if defined(__IPHONE_12_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_12_0
- (BOOL)application:(UIApplication *)application
Expand All @@ -74,7 +73,7 @@ - (BOOL)application:(UIApplication *)application
restorationHandler:(void (^)(NSArray *))restorationHandler {
return NO;
}
#endif // defined(__IPHONE_12_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_12_0
#endif // defined(__IPHONE_12_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_12_0
@end

namespace firebase {
Expand Down Expand Up @@ -103,20 +102,18 @@ void ForEachAppDelegateClass(void (^block)(Class)) {
}
if (!blacklisted) {
if (GetLogLevel() <= kLogLevelDebug) {
// Call NSLog directly because we may be in a +load method,
// and C++ classes may not be constructed yet.
NSLog(@"Firebase: Found UIApplicationDelegate class %s",
class_name);
}
// Call NSLog directly because we may be in a +load method,
// and C++ classes may not be constructed yet.
NSLog(@"Firebase: Found UIApplicationDelegate class %s", class_name);
}
block(clazz);
}
}
}
free(classes);
}

NSDictionary *StringMapToNSDictionary(
const std::map<std::string, std::string> &string_map) {
NSDictionary *StringMapToNSDictionary(const std::map<std::string, std::string> &string_map) {
NSMutableDictionary *dictionary = [[NSMutableDictionary alloc] init];
for (auto &kv : string_map) {
dictionary[[NSString stringWithUTF8String:kv.first.c_str()]] =
Expand All @@ -125,8 +122,7 @@ void ForEachAppDelegateClass(void (^block)(Class)) {
return dictionary;
}

NSDictionary *CharArrayMapToNSDictionary(
const std::map<const char *, const char *> &string_map) {
NSDictionary *CharArrayMapToNSDictionary(const std::map<const char *, const char *> &string_map) {
NSMutableDictionary *dictionary = [[NSMutableDictionary alloc] init];
for (auto &kv : string_map) {
dictionary[[NSString stringWithUTF8String:kv.first]] =
Expand All @@ -147,17 +143,14 @@ void ForEachAppDelegateClass(void (^block)(Class)) {
return std::string(static_cast<const char *>(data.bytes), data.length);
}

NSString *StringToNSString(const std::string &str) {
return CStringToNSString(str.c_str());
}
NSString *StringToNSString(const std::string &str) { return CStringToNSString(str.c_str()); }

NSString *CStringToNSString(const char *c_str) {
return [NSString stringWithCString:c_str encoding:NSUTF8StringEncoding];
}

std::string NSStringToString(NSString *str) {
return str ? std::string([str cStringUsingEncoding:NSUTF8StringEncoding]) :
std::string();
return str ? std::string([str cStringUsingEncoding:NSUTF8StringEncoding]) : std::string();
}

NSMutableArray *StringVectorToNSMutableArray(const std::vector<std::string> &vector) {
Expand All @@ -168,41 +161,37 @@ void ForEachAppDelegateClass(void (^block)(Class)) {
return array;
}

NSMutableArray* StdVectorToNSMutableArray(const std::vector<Variant>& vector) {
NSMutableArray* array =
[[NSMutableArray alloc] initWithCapacity:vector.size()];
for (auto& variant : vector) {
NSMutableArray *StdVectorToNSMutableArray(const std::vector<Variant> &vector) {
NSMutableArray *array = [[NSMutableArray alloc] initWithCapacity:vector.size()];
for (auto &variant : vector) {
[array addObject:VariantToId(variant)];
}
return array;
}

NSMutableDictionary* StdMapToNSMutableDictionary(
const std::map<Variant, Variant>& map) {
NSMutableDictionary* dictionary =
[[NSMutableDictionary alloc] initWithCapacity:map.size()];
for (auto& pair : map) {
[dictionary setObject:VariantToId(pair.second)
forKey:VariantToId(pair.first)];
NSMutableDictionary *StdMapToNSMutableDictionary(const std::map<Variant, Variant> &map) {
NSMutableDictionary *dictionary = [[NSMutableDictionary alloc] initWithCapacity:map.size()];
for (auto &pair : map) {
[dictionary setObject:VariantToId(pair.second) forKey:VariantToId(pair.first)];
}
return dictionary;
}

void NSArrayToStdVector(NSArray *array, std::vector<Variant>* vector) {
void NSArrayToStdVector(NSArray *array, std::vector<Variant> *vector) {
vector->reserve(array.count);
for (id object in array) {
vector->push_back(IdToVariant(object));
}
}

void NSDictionaryToStdMap(NSDictionary *dictionary, std::map<Variant, Variant>* map) {
void NSDictionaryToStdMap(NSDictionary *dictionary, std::map<Variant, Variant> *map) {
for (id key in dictionary) {
id value = [dictionary objectForKey:key];
map->insert(std::make_pair(IdToVariant(key), IdToVariant(value)));
}
}

id VariantToId(const Variant& variant) {
id VariantToId(const Variant &variant) {
switch (variant.type()) {
case Variant::kTypeNull: {
return [NSNull null];
Expand Down Expand Up @@ -235,22 +224,18 @@ id VariantToId(const Variant& variant) {

static bool IdIsBoolean(id value) {
if ([value isKindOfClass:[NSNumber class]]) {
const char* type = [value objCType];
return strcmp(type, @encode(BOOL)) == 0 ||
strcmp(type, @encode(signed char)) == 0;
const char *type = [value objCType];
return strcmp(type, @encode(BOOL)) == 0 || strcmp(type, @encode(signed char)) == 0;
}
return false;
}

static bool IdIsInteger(id value) {
if ([value isKindOfClass:[NSNumber class]]) {
const char* type = [value objCType];
return strcmp(type, @encode(int)) == 0 ||
strcmp(type, @encode(short)) == 0 ||
strcmp(type, @encode(long)) == 0 ||
strcmp(type, @encode(long long)) == 0 ||
strcmp(type, @encode(unsigned char)) == 0 ||
strcmp(type, @encode(unsigned int)) == 0 ||
const char *type = [value objCType];
return strcmp(type, @encode(int)) == 0 || strcmp(type, @encode(short)) == 0 ||
strcmp(type, @encode(long)) == 0 || strcmp(type, @encode(long long)) == 0 ||
strcmp(type, @encode(unsigned char)) == 0 || strcmp(type, @encode(unsigned int)) == 0 ||
strcmp(type, @encode(unsigned short)) == 0 ||
strcmp(type, @encode(unsigned long)) == 0 ||
strcmp(type, @encode(unsigned long long)) == 0;
Expand All @@ -260,9 +245,8 @@ static bool IdIsInteger(id value) {

static bool IdIsFloatingPoint(id value) {
if ([value isKindOfClass:[NSNumber class]]) {
const char* type = [value objCType];
return strcmp(type, @encode(float)) == 0 ||
strcmp(type, @encode(double)) == 0;
const char *type = [value objCType];
return strcmp(type, @encode(float)) == 0 || strcmp(type, @encode(double)) == 0;
}
return false;
}
Expand Down Expand Up @@ -311,15 +295,13 @@ void DispatchAsyncSafeMainQueue(void (^block)(void)) {
}
}

void RunOnMainThread(void (*function_ptr)(void *function_data),
void *function_data) {
void RunOnMainThread(void (*function_ptr)(void *function_data), void *function_data) {
dispatch_async(dispatch_get_main_queue(), ^{
function_ptr(function_data);
});
}

void RunOnBackgroundThread(void (*function_ptr)(void *function_data),
void *function_data) {
void RunOnBackgroundThread(void (*function_ptr)(void *function_data), void *function_data) {
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
function_ptr(function_data);
});
Expand Down Expand Up @@ -354,8 +336,8 @@ void RunOnBackgroundThread(void (*function_ptr)(void *function_data),

// Get the type encoding of the selector from a type_encoding_class (which is a class which
// implements a stub for the method).
const char *type_encoding = method_getTypeEncoding(
class_getInstanceMethod(type_encoding_class, name));
const char *type_encoding =
method_getTypeEncoding(class_getInstanceMethod(type_encoding_class, name));
FIREBASE_ASSERT(type_encoding);

NSString *new_method_name_nsstring = nil;
Expand All @@ -376,18 +358,18 @@ void RunOnBackgroundThread(void (*function_ptr)(void *function_data),
}
const char *new_method_name = new_method_name_nsstring.UTF8String;
if (retry == 0) {
NSLog(@"Failed to add method %s on class %s as the %s method already exists on the class. To resolve this issue, change the name of the method %s on the class %s.",
new_method_name, class_name, new_method_name, new_method_name, class_name);
NSLog(@"Failed to add method %s on class %s as the %s method already exists on the class. To "
@"resolve this issue, change the name of the method %s on the class %s.",
new_method_name, class_name, new_method_name, new_method_name, class_name);
return;
}
method_setImplementation(method, imp);
// Save the selector name that points at the original method implementation.
SetMethod(name, new_method_name_nsstring);
if (GetLogLevel() <= kLogLevelDebug) {
NSLog(@"Registered method for %s selector %s (original method %s 0x%08x)",
class_name, selector_name, new_method_name,
static_cast<int>(reinterpret_cast<intptr_t>(
original_method_implementation)));
NSLog(@"Registered method for %s selector %s (original method %s 0x%08x)", class_name,
selector_name, new_method_name,
static_cast<int>(reinterpret_cast<intptr_t>(original_method_implementation)));
}
} else if (add_method) {
if (GetLogLevel() <= kLogLevelDebug) {
Expand All @@ -399,8 +381,8 @@ void RunOnBackgroundThread(void (*function_ptr)(void *function_data),
}
} else {
if (GetLogLevel() <= kLogLevelDebug) {
NSLog(@"Method implementation for %s selector %s not found, ignoring.",
class_name, selector_name);
NSLog(@"Method implementation for %s selector %s not found, ignoring.", class_name,
selector_name);
}
}
}
Expand Down Expand Up @@ -431,19 +413,19 @@ void RunOnBackgroundThread(void (*function_ptr)(void *function_data),
const char *selector_implementation_name = selector_implementation_name_nsstring.UTF8String;
SEL selector_implementation = NSSelectorFromString(selector_implementation_name_nsstring);
search_class = clazz;
for ( ; search_class; search_class = class_getSuperclass(search_class)) {
for (; search_class; search_class = class_getSuperclass(search_class)) {
const char *search_class_name = class_getName(search_class);
firebase::LogDebug("Searching for selector %s (%s) on class %s",
selector_name, selector_implementation_name, search_class_name);
firebase::LogDebug("Searching for selector %s (%s) on class %s", selector_name,
selector_implementation_name, search_class_name);
Method method = class_getInstanceMethod(search_class, selector_implementation);
method_implementation = method ? method_getImplementation(method) : nil;
if (method_implementation) break;
}
if (method_implementation) break;
}
if (!method_implementation) {
firebase::LogDebug("Class %s does not respond to selector %s (%s)", class_name,
selector_name, selector_implementation_name_nsstring.UTF8String);
firebase::LogDebug("Class %s does not respond to selector %s (%s)", class_name, selector_name,
selector_implementation_name_nsstring.UTF8String);
return nil;
}
firebase::LogDebug("Found %s (%s, 0x%08x) on class %s (%s)", selector_name,
Expand Down Expand Up @@ -483,8 +465,8 @@ void RunOnBackgroundThread(void (*function_ptr)(void *function_data),
while (retry--) {
// Cache the old method implementation in a new method so that we can lookup the original
// implementation from the instance of the class.
NSString *random_selector_name = [[NSString alloc] initWithFormat:@"FIRA%x%@", arc4random(),
selector_name];
NSString *random_selector_name =
[[NSString alloc] initWithFormat:@"FIRA%x%@", arc4random(), selector_name];
if (!implementation_selector_names[random_selector_name]) {
return random_selector_name;
}
Expand Down