Skip to content

Commit eb775e1

Browse files
a-mauricea-maurice
committed
Code formatting
1 parent 8d93389 commit eb775e1

File tree

3 files changed

+56
-48
lines changed

3 files changed

+56
-48
lines changed

‎analytics/integration_test/src/integration_test.cc

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -278,15 +278,20 @@ TEST_F(FirebaseAnalyticsTest, TestLogEventWithComplexParameters) {
278278
first_item.map()[firebase::analytics::kParameterItemName] = "Horse Armor DLC";
279279
firebase::Variant second_item = firebase::Variant::EmptyMap();
280280
second_item.map()[firebase::analytics::kParameterItemID] = "SKU_67890";
281-
second_item.map()[firebase::analytics::kParameterItemName] = "Gold Horse Armor DLC";
281+
second_item.map()[firebase::analytics::kParameterItemName] =
282+
"Gold Horse Armor DLC";
282283

283284
// Define the parameters that are sent with the ViewCart event.
284285
const firebase::analytics::Parameter kViewCartParameters[] = {
285-
firebase::analytics::Parameter(firebase::analytics::kParameterCurrency, "USD"),
286-
firebase::analytics::Parameter(firebase::analytics::kParameterValue, 30.03),
287-
firebase::analytics::Parameter(firebase::analytics::kParameterItems, std::vector<firebase::Variant>{ first_item, second_item }),
286+
firebase::analytics::Parameter(firebase::analytics::kParameterCurrency,
287+
"USD"),
288+
firebase::analytics::Parameter(firebase::analytics::kParameterValue,
289+
30.03),
290+
firebase::analytics::Parameter(
291+
firebase::analytics::kParameterItems,
292+
std::vector<firebase::Variant>{first_item, second_item}),
288293
};
289-
294+
290295
firebase::analytics::LogEvent(
291296
firebase::analytics::kEventViewCart, kViewCartParameters,
292297
sizeof(kViewCartParameters) / sizeof(kViewCartParameters[0]));

‎analytics/src/analytics_android.cc

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -355,17 +355,21 @@ void AddToBundle(JNIEnv* env, jobject bundle, const char* key, int64_t value) {
355355
env->DeleteLocalRef(key_string);
356356
}
357357

358-
void AddArrayListToBundle(JNIEnv* env, jobject bundle, const char* key, jobject arraylist) {
358+
void AddArrayListToBundle(JNIEnv* env, jobject bundle, const char* key,
359+
jobject arraylist) {
359360
jstring key_string = env->NewStringUTF(key);
360-
env->CallVoidMethod(bundle, util::bundle::GetMethodId(util::bundle::kPutParcelableArrayList),
361-
key_string, arraylist);
361+
env->CallVoidMethod(
362+
bundle, util::bundle::GetMethodId(util::bundle::kPutParcelableArrayList),
363+
key_string, arraylist);
362364
util::CheckAndClearJniExceptions(env);
363365
env->DeleteLocalRef(key_string);
364366
}
365367

366-
void AddBundleToBundle(JNIEnv* env, jobject bundle, const char* key, jobject inner_bundle) {
368+
void AddBundleToBundle(JNIEnv* env, jobject bundle, const char* key,
369+
jobject inner_bundle) {
367370
jstring key_string = env->NewStringUTF(key);
368-
env->CallVoidMethod(bundle, util::bundle::GetMethodId(util::bundle::kPutBundle),
371+
env->CallVoidMethod(bundle,
372+
util::bundle::GetMethodId(util::bundle::kPutBundle),
369373
key_string, inner_bundle);
370374
util::CheckAndClearJniExceptions(env);
371375
env->DeleteLocalRef(key_string);
@@ -374,15 +378,16 @@ void AddBundleToBundle(JNIEnv* env, jobject bundle, const char* key, jobject inn
374378
jobject MapToBundle(JNIEnv* env, const std::map<Variant, Variant>& map);
375379

376380
jobject VectorToArrayList(JNIEnv* env, const std::vector<Variant>& vector) {
377-
jobject arraylist =
378-
env->NewObject(util::array_list::GetClass(),
379-
util::array_list::GetMethodId(util::array_list::kConstructor));
381+
jobject arraylist = env->NewObject(
382+
util::array_list::GetClass(),
383+
util::array_list::GetMethodId(util::array_list::kConstructor));
380384

381385
for (const Variant& element : vector) {
382386
if (element.is_map()) {
383387
jobject bundle = MapToBundle(env, element.map());
384-
env->CallBooleanMethod(arraylist, util::array_list::GetMethodId(util::array_list::kAdd),
385-
bundle);
388+
env->CallBooleanMethod(
389+
arraylist, util::array_list::GetMethodId(util::array_list::kAdd),
390+
bundle);
386391
env->DeleteLocalRef(bundle);
387392
} else {
388393
LogError("VectorToArrayList: Unsupported type (%s) within vector.",
@@ -392,15 +397,14 @@ jobject VectorToArrayList(JNIEnv* env, const std::vector<Variant>& vector) {
392397
return arraylist;
393398
}
394399

395-
bool AddVariantToBundle(JNIEnv* env, jobject bundle, const char* key, const Variant& value) {
400+
bool AddVariantToBundle(JNIEnv* env, jobject bundle, const char* key,
401+
const Variant& value) {
396402
if (value.is_int64()) {
397403
AddToBundle(env, bundle, key, value.int64_value());
398404
} else if (value.is_double()) {
399-
AddToBundle(env, bundle, key,
400-
value.double_value());
405+
AddToBundle(env, bundle, key, value.double_value());
401406
} else if (value.is_string()) {
402-
AddToBundle(env, bundle, key,
403-
value.string_value());
407+
AddToBundle(env, bundle, key, value.string_value());
404408
} else if (value.is_bool()) {
405409
// Just use integer 0 or 1.
406410
AddToBundle(env, bundle, key,
@@ -433,9 +437,11 @@ jobject MapToBundle(JNIEnv* env, const std::map<Variant, Variant>& map) {
433437
if (!pair.first.is_string()) {
434438
continue;
435439
}
436-
if (!AddVariantToBundle(env, bundle, pair.first.string_value(), pair.second)) {
440+
if (!AddVariantToBundle(env, bundle, pair.first.string_value(),
441+
pair.second)) {
437442
LogError("MapToBundle: Unsupported type (%s) within map with key %s.",
438-
Variant::TypeName(pair.second.type()), pair.first.string_value());
443+
Variant::TypeName(pair.second.type()),
444+
pair.first.string_value());
439445
}
440446
util::CheckAndClearJniExceptions(env);
441447
}

‎analytics/src/analytics_ios.mm

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -249,31 +249,28 @@ void LogEvent(const char* name) {
249249

250250
bool AddVariantToDictionary(NSMutableDictionary* dict, NSString* key, const Variant& value) {
251251
if (value.is_int64()) {
252-
[dict setObject:[NSNumber numberWithLongLong:value.int64_value()]
253-
forKey:key];
254-
} else if (value.is_double()) {
255-
[dict setObject:[NSNumber numberWithDouble:value.double_value()]
256-
forKey:key];
257-
} else if (value.is_string()) {
258-
[dict setObject:SafeString(value.string_value()) forKey:key];
259-
} else if (value.is_bool()) {
260-
// Just use integer 0 or 1.
261-
[dict setObject:[NSNumber numberWithLongLong:value.bool_value() ? 1 : 0]
262-
forKey:key];
263-
} else if (value.is_null()) {
264-
// Just use integer 0 for null.
265-
[dict setObject:[NSNumber numberWithLongLong:0] forKey:key];
266-
} else if (value.is_vector()) {
267-
NSArray* array = VectorToArray(value.vector());
268-
[dict setObject:array forKey:key];
269-
} else if (value.is_map()) {
270-
NSDictionary* inner_dict = MapToDictionary(value.map());
271-
[dict setObject:inner_dict forKey:key];
272-
} else {
273-
// A Variant type that couldn't be handled was passed in.
274-
return false;
275-
}
276-
return true;
252+
[dict setObject:[NSNumber numberWithLongLong:value.int64_value()] forKey:key];
253+
} else if (value.is_double()) {
254+
[dict setObject:[NSNumber numberWithDouble:value.double_value()] forKey:key];
255+
} else if (value.is_string()) {
256+
[dict setObject:SafeString(value.string_value()) forKey:key];
257+
} else if (value.is_bool()) {
258+
// Just use integer 0 or 1.
259+
[dict setObject:[NSNumber numberWithLongLong:value.bool_value() ? 1 : 0] forKey:key];
260+
} else if (value.is_null()) {
261+
// Just use integer 0 for null.
262+
[dict setObject:[NSNumber numberWithLongLong:0] forKey:key];
263+
} else if (value.is_vector()) {
264+
NSArray* array = VectorToArray(value.vector());
265+
[dict setObject:array forKey:key];
266+
} else if (value.is_map()) {
267+
NSDictionary* inner_dict = MapToDictionary(value.map());
268+
[dict setObject:inner_dict forKey:key];
269+
} else {
270+
// A Variant type that couldn't be handled was passed in.
271+
return false;
272+
}
273+
return true;
277274
}
278275

279276
NSDictionary* MapToDictionary(const std::map<Variant, Variant>& map) {
@@ -301,7 +298,7 @@ void LogEvent(const char* name, const Parameter* parameters, size_t number_of_pa
301298
for (size_t i = 0; i < number_of_parameters; ++i) {
302299
const Parameter& parameter = parameters[i];
303300
NSString* parameter_name = SafeString(parameter.name);
304-
if (!AddVariantToDictionary(parameters_dict, parameter_name, parameter.value)){
301+
if (!AddVariantToDictionary(parameters_dict, parameter_name, parameter.value)) {
305302
// A Variant type that couldn't be handled was passed in.
306303
LogError("LogEvent(%s): %s is not a valid parameter value type. "
307304
"No event was logged.",

0 commit comments

Comments
 (0)