Comment clean up

Author: AustinBenoit

storage/integration_test/src/integration_test.cc

@@ -785,10 +785,9 @@ TEST_F(FirebaseStorageTest, TestList) {
       return;
     }
     EXPECT_EQ(list_future.error(), firebase::storage::kErrorNone);
+    return;
   }
 
-  if (list_future.error() != firebase::storage::kErrorNone) return;
-
   firebase::storage::StorageListResult result = *list_future.result();
   EXPECT_EQ(result.items().size(), 3);
   EXPECT_EQ(result.prefixes().size(), 1);

storage/src/android/storage_reference_android.cc

@@ -341,31 +341,24 @@ void StorageReferenceInternal::FutureCallback(JNIEnv* env, jobject result,
     std::vector<StorageReference> items;
     std::string page_token = util::JStringToString(env, page_token_jstr);
 
-    if (prefixes_list) {
-      int size = env->CallIntMethod(prefixes_list,
-                                    util::list::GetMethodId(util::list::kSize));
-      for (int i = 0; i < size; ++i) {
-        jobject ref_obj = env->CallObjectMethod(
-            prefixes_list, util::list::GetMethodId(util::list::kGet), i);
-        prefixes.push_back(StorageReference(
-            new StorageReferenceInternal(data->storage, ref_obj)));
-        env->DeleteLocalRef(ref_obj);
+    auto process_list = [&](jobject list_obj,
+                            std::vector<StorageReference>& out_vec) {
+      if (list_obj) {
+        int size = env->CallIntMethod(
+            list_obj, util::list::GetMethodId(util::list::kSize));
+        for (int i = 0; i < size; ++i) {
+          jobject ref_obj = env->CallObjectMethod(
+              list_obj, util::list::GetMethodId(util::list::kGet), i);
+          out_vec.push_back(StorageReference(
+              new StorageReferenceInternal(data->storage, ref_obj)));
+          env->DeleteLocalRef(ref_obj);
+        }
+        env->DeleteLocalRef(list_obj);
       }
-      env->DeleteLocalRef(prefixes_list);
-    }
+    };
 
-    if (items_list) {
-      int size = env->CallIntMethod(items_list,
-                                    util::list::GetMethodId(util::list::kSize));
-      for (int i = 0; i < size; ++i) {
-        jobject ref_obj = env->CallObjectMethod(
-            items_list, util::list::GetMethodId(util::list::kGet), i);
-        items.push_back(StorageReference(
-            new StorageReferenceInternal(data->storage, ref_obj)));
-        env->DeleteLocalRef(ref_obj);
-      }
-      env->DeleteLocalRef(items_list);
-    }
+    process_list(prefixes_list, prefixes);
+    process_list(items_list, items);
 
     if (page_token_jstr) env->DeleteLocalRef(page_token_jstr);
 

storage/src/ios/storage_reference_ios.mm

@@ -474,16 +474,15 @@
       std::vector<StorageReference> items;
       NSString* next_page_token = result.pageToken;
 
-      for (FIRStorageReference* prefix_ref in result.prefixes) {
-        prefixes.push_back(
-            StorageReference(new StorageReferenceInternal(
-                storage, std::make_unique<FIRStorageReferencePointer>(prefix_ref))));
-      }
-      for (FIRStorageReference* item_ref in result.items) {
-        items.push_back(
-            StorageReference(new StorageReferenceInternal(
-                storage, std::make_unique<FIRStorageReferencePointer>(item_ref))));
-      }
+      auto process_refs = [&](NSArray<FIRStorageReference*>* refs,
+                              std::vector<StorageReference>& out_vec) {
+        for (FIRStorageReference* ref in refs) {
+          out_vec.push_back(StorageReference(new StorageReferenceInternal(
+              storage, std::make_unique<FIRStorageReferencePointer>(ref))));
+        }
+      };
+      process_refs(result.prefixes, prefixes);
+      process_refs(result.items, items);
 
       internal::StorageListResultInternal* list_result_internal = new internal::StorageListResultInternal(
           prefixes, items, next_page_token ? [next_page_token UTF8String] : "");