From fe5f663fa1e36eae9015c651a6afa01bb8e7ca48 Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Wed, 25 Jun 2025 23:56:03 +0000 Subject: [PATCH 1/3] Fix: Add missing includes for ListResult Added #include "firebase/storage/list_result.h" to storage_reference.h and storage_reference_desktop.h to resolve compilation errors related to undeclared identifier 'ListResult'. --- storage/src/desktop/storage_reference_desktop.h | 1 + storage/src/include/firebase/storage/storage_reference.h | 1 + 2 files changed, 2 insertions(+) diff --git a/storage/src/desktop/storage_reference_desktop.h b/storage/src/desktop/storage_reference_desktop.h index 556b7c1079..055739f4b1 100644 --- a/storage/src/desktop/storage_reference_desktop.h +++ b/storage/src/desktop/storage_reference_desktop.h @@ -22,6 +22,7 @@ #include "app/src/reference_counted_future_impl.h" #include "storage/src/desktop/curl_requests.h" #include "storage/src/desktop/storage_path.h" +#include "storage/src/include/firebase/storage/list_result.h" // Added for ListResult #include "storage/src/include/firebase/storage/storage_reference.h" namespace firebase { diff --git a/storage/src/include/firebase/storage/storage_reference.h b/storage/src/include/firebase/storage/storage_reference.h index a39e9959c2..e9b1579ad6 100644 --- a/storage/src/include/firebase/storage/storage_reference.h +++ b/storage/src/include/firebase/storage/storage_reference.h @@ -20,6 +20,7 @@ #include "firebase/future.h" #include "firebase/internal/common.h" +#include "firebase/storage/list_result.h" // Added for ListResult #include "firebase/storage/metadata.h" namespace firebase { From 6ec0081cac393c776850987bba2ce6c91e7be47a Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Thu, 26 Jun 2025 17:40:29 +0000 Subject: [PATCH 2/3] Fix: Use StorageReference::is_valid() in assertions Changed FIREBASE_ASSERT_RETURN to use is_valid() instead of internal_->is_valid() in StorageReference::ListAll() and StorageReference::List() methods. This corrects the compilation error where 'is_valid' was not a member of the internal PIMPL class. The assertion now correctly checks the validity of the public StorageReference object before proceeding. --- storage/src/common/storage_reference.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/src/common/storage_reference.cc b/storage/src/common/storage_reference.cc index 1c363d1648..c167427061 100644 --- a/storage/src/common/storage_reference.cc +++ b/storage/src/common/storage_reference.cc @@ -257,12 +257,12 @@ Future StorageReference::PutFileLastResult() { bool StorageReference::is_valid() const { return internal_ != nullptr; } Future StorageReference::ListAll() { - FIREBASE_ASSERT_RETURN(Future(), internal_->is_valid()); + FIREBASE_ASSERT_RETURN(Future(), is_valid()); return internal_->ListAll(); } Future StorageReference::List(const char* page_token) { - FIREBASE_ASSERT_RETURN(Future(), internal_->is_valid()); + FIREBASE_ASSERT_RETURN(Future(), is_valid()); return internal_->List(page_token); } From 97effb9243b029a81e7ea741cdf14c75d849073e Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Thu, 26 Jun 2025 18:35:23 +0000 Subject: [PATCH 3/3] Fix: Correct include path for StorageInternal in list_result_desktop.h Changed the include from 'storage_internal_desktop.h' to 'storage_desktop.h' in list_result_desktop.h. 'storage_internal_desktop.h' does not exist; 'storage_desktop.h' contains the definition for internal::StorageInternal, which is used by ListResultInternal. This resolves the 'file not found' compilation error. --- storage/src/desktop/list_result_desktop.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/src/desktop/list_result_desktop.h b/storage/src/desktop/list_result_desktop.h index 0bab1ba589..2f21464bef 100644 --- a/storage/src/desktop/list_result_desktop.h +++ b/storage/src/desktop/list_result_desktop.h @@ -6,7 +6,7 @@ #include #include "firebase/storage/storage_reference.h" -#include "storage/src/desktop/storage_internal_desktop.h" +#include "storage/src/desktop/storage_desktop.h" // Corrected include path #include "storage/src/desktop/storage_reference_desktop.h" namespace firebase {