Skip to content

Commit 590361b

Browse files
smilesa-maurice
smiles
authored and
a-maurice
committed
Removed deprecated usage of RegisterCallbackOnPendingResultOrTask()
RegisterCallbackOnPendingResultOrTask was renamed to RegisterCallbackOnTask a long time ago. PiperOrigin-RevId: 264713610
1 parent 60a1e35 commit 590361b

File tree

11 files changed

+31
-48
lines changed

11 files changed

+31
-48
lines changed

‎app/src/util_android.h‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,23 +1047,6 @@ void RegisterCallbackOnTask(JNIEnv* env, jobject task,
10471047
TaskCallbackFn callback_fn, void* callback_data,
10481048
const char* api_identifier);
10491049

1050-
// Alias TaskCallbackFn to PendingResultCallbackFn.
1051-
typedef TaskCallbackFn PendingResultCallbackFn;
1052-
1053-
// Calls callback_fn when the PendingResult `pending_result_or_task` is
1054-
// complete. Where pending_result_or_task is either an instance of
1055-
// com.google.android.gms.common.api.PendingResult or
1056-
// com.google.android.gms.tasks.Task.
1057-
// NOTE: api_identifier must *not* be deallocated or can be nullptr to place
1058-
// the callback in the global pool.
1059-
FIREBASE_DEPRECATED inline void RegisterCallbackOnPendingResultOrTask(
1060-
JNIEnv* env, jobject pending_result_or_task,
1061-
PendingResultCallbackFn callback_fn, void* callback_data,
1062-
const char* api_identifier) {
1063-
return RegisterCallbackOnTask(env, pending_result_or_task, callback_fn,
1064-
callback_data, api_identifier);
1065-
}
1066-
10671050
// Cancel all callbacks associated with the specified API identifier. If an
10681051
// API identifier isn't specified, all pending callbacks are cancelled.
10691052
void CancelCallbacks(JNIEnv* env, const char* api_identifier);

‎auth/src/android/common_android.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ void RegisterCallback(
211211
jobject pending_result, SafeFutureHandle<T> handle, AuthData* auth_data,
212212
typename FutureCallbackData<T>::ReadFutureResultFn read_result_fn) {
213213
// The FutureCallbackData structure is deleted in FutureCallback().
214-
util::RegisterCallbackOnPendingResultOrTask(
214+
util::RegisterCallbackOnTask(
215215
Env(auth_data), pending_result, FutureCallback<T>,
216216
new FutureCallbackData<T>(handle, auth_data, read_result_fn),
217217
auth_data->future_api_id.c_str());

‎database/src/android/database_android.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ namespace database {
3737
namespace internal {
3838

3939
// Used for registering global callbacks. See
40-
// firebase::util::RegisterCallbackOnPendingResultOrTask for context.
40+
// firebase::util::RegisterCallbackOnTask for context.
4141
extern const char kApiIdentifier[];
4242

4343
// This is the Android implementation of Database.

‎database/src/android/database_reference_android.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ Future<void> DatabaseReferenceInternal::RemoveValue() {
323323
JNIEnv* env = db_->GetApp()->GetJNIEnv();
324324
jobject task = env->CallObjectMethod(
325325
obj_, database_reference::GetMethodId(database_reference::kRemoveValue));
326-
util::RegisterCallbackOnPendingResultOrTask(
326+
util::RegisterCallbackOnTask(
327327
env, task, FutureCallback,
328328
// FutureCallback will delete the newed FutureCallbackData.
329329
reinterpret_cast<void*>(
@@ -352,7 +352,7 @@ Future<void> DatabaseReferenceInternal::SetValue(Variant value) {
352352
obj_, database_reference::GetMethodId(database_reference::kSetValue),
353353
value_obj);
354354
util::CheckAndClearJniExceptions(env);
355-
util::RegisterCallbackOnPendingResultOrTask(
355+
util::RegisterCallbackOnTask(
356356
env, task, FutureCallback,
357357
// FutureCallback will delete the newed FutureCallbackData.
358358
reinterpret_cast<void*>(
@@ -385,7 +385,7 @@ Future<void> DatabaseReferenceInternal::SetPriority(Variant priority) {
385385
obj_, database_reference::GetMethodId(database_reference::kSetPriority),
386386
priority_obj);
387387
util::CheckAndClearJniExceptions(env);
388-
util::RegisterCallbackOnPendingResultOrTask(
388+
util::RegisterCallbackOnTask(
389389
env, task, FutureCallback,
390390
// FutureCallback will delete the newed FutureCallbackData.
391391
reinterpret_cast<void*>(
@@ -426,7 +426,7 @@ Future<void> DatabaseReferenceInternal::SetValueAndPriority(Variant value,
426426
database_reference::kSetValueAndPriority),
427427
value_obj, priority_obj);
428428
util::CheckAndClearJniExceptions(env);
429-
util::RegisterCallbackOnPendingResultOrTask(
429+
util::RegisterCallbackOnTask(
430430
env, task, FutureCallback,
431431
// FutureCallback will delete the newed FutureCallbackData.
432432
reinterpret_cast<void*>(
@@ -458,7 +458,7 @@ Future<void> DatabaseReferenceInternal::UpdateChildren(Variant values) {
458458
database_reference::GetMethodId(database_reference::kUpdateChildren),
459459
values_obj);
460460
util::CheckAndClearJniExceptions(env);
461-
util::RegisterCallbackOnPendingResultOrTask(
461+
util::RegisterCallbackOnTask(
462462
env, task, FutureCallback,
463463
// FutureCallback will delete the newed FutureCallbackData.
464464
reinterpret_cast<void*>(

‎database/src/android/disconnection_android.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ Future<void> DisconnectionHandlerInternal::Cancel() {
114114
JNIEnv* env = db_->GetApp()->GetJNIEnv();
115115
jobject task = env->CallObjectMethod(
116116
obj_, on_disconnect::GetMethodId(on_disconnect::kCancel));
117-
util::RegisterCallbackOnPendingResultOrTask(
117+
util::RegisterCallbackOnTask(
118118
env, task, FutureCallback,
119119
// FutureCallback will delete the newed FutureCallbackData.
120120
reinterpret_cast<void*>(new FutureCallbackData(handle, future(), db_)),
@@ -135,7 +135,7 @@ Future<void> DisconnectionHandlerInternal::RemoveValue() {
135135
JNIEnv* env = db_->GetApp()->GetJNIEnv();
136136
jobject task = env->CallObjectMethod(
137137
obj_, on_disconnect::GetMethodId(on_disconnect::kRemoveValue));
138-
util::RegisterCallbackOnPendingResultOrTask(
138+
util::RegisterCallbackOnTask(
139139
env, task, FutureCallback,
140140
// FutureCallback will delete the newed FutureCallbackData.
141141
reinterpret_cast<void*>(new FutureCallbackData(handle, future(), db_)),
@@ -160,7 +160,7 @@ Future<void> DisconnectionHandlerInternal::SetValue(Variant value) {
160160
jobject value_obj = internal::VariantToJavaObject(env, value);
161161
jobject task = env->CallObjectMethod(
162162
obj_, on_disconnect::GetMethodId(on_disconnect::kSetValue), value_obj);
163-
util::RegisterCallbackOnPendingResultOrTask(
163+
util::RegisterCallbackOnTask(
164164
env, task, FutureCallback,
165165
// FutureCallback will delete the newed FutureCallbackData.
166166
reinterpret_cast<void*>(new FutureCallbackData(handle, future(), db_)),
@@ -205,7 +205,7 @@ Future<void> DisconnectionHandlerInternal::SetValueAndPriority(
205205
value_obj, priority.AsDouble().double_value());
206206
}
207207
util::CheckAndClearJniExceptions(env);
208-
util::RegisterCallbackOnPendingResultOrTask(
208+
util::RegisterCallbackOnTask(
209209
env, task, FutureCallback,
210210
// FutureCallback will delete the newed FutureCallbackData.
211211
reinterpret_cast<void*>(new FutureCallbackData(handle, future(), db_)),
@@ -234,7 +234,7 @@ Future<void> DisconnectionHandlerInternal::UpdateChildren(Variant values) {
234234
obj_, on_disconnect::GetMethodId(on_disconnect::kUpdateChildren),
235235
values_obj);
236236
util::CheckAndClearJniExceptions(env);
237-
util::RegisterCallbackOnPendingResultOrTask(
237+
util::RegisterCallbackOnTask(
238238
env, task, FutureCallback,
239239
// FutureCallback will delete the newed FutureCallbackData.
240240
reinterpret_cast<void*>(new FutureCallbackData(handle, future(), db_)),

‎dynamic_links/src/dynamic_links_android.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -956,9 +956,9 @@ static Future<GeneratedDynamicLink> HandleShortLinkTask(
956956
api->CompleteWithResult(handle, kErrorCodeFailed, exception_message.c_str(),
957957
gen_link);
958958
} else {
959-
util::RegisterCallbackOnPendingResultOrTask(
960-
jni_env, task, FutureShortLinkCallback,
961-
*(reinterpret_cast<void* const*>(&handle)), kApiIdentifier);
959+
util::RegisterCallbackOnTask(jni_env, task, FutureShortLinkCallback,
960+
*(reinterpret_cast<void* const*>(&handle)),
961+
kApiIdentifier);
962962
}
963963

964964
jni_env->DeleteLocalRef(link_builder);

‎functions/src/android/callable_reference_android.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ Future<HttpsCallableResult> HttpsCallableReferenceInternal::Call() {
182182
jobject task = env->CallObjectMethod(
183183
obj_, callable_reference::GetMethodId(callable_reference::kCall));
184184

185-
util::RegisterCallbackOnPendingResultOrTask(
185+
util::RegisterCallbackOnTask(
186186
env, task, FutureCallback,
187187
// FutureCallback will delete the newed FutureCallbackData.
188188
reinterpret_cast<void*>(new FutureCallbackData(
@@ -213,7 +213,7 @@ Future<HttpsCallableResult> HttpsCallableReferenceInternal::Call(
213213
java_data);
214214
env->DeleteLocalRef(java_data);
215215

216-
util::RegisterCallbackOnPendingResultOrTask(
216+
util::RegisterCallbackOnTask(
217217
env, task, FutureCallback,
218218
// FutureCallback will delete the newed FutureCallbackData.
219219
reinterpret_cast<void*>(new FutureCallbackData(

‎functions/src/android/functions_android.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ namespace functions {
3333
namespace internal {
3434

3535
// Used for registering global callbacks. See
36-
// firebase::util::RegisterCallbackOnPendingResultOrTask for context.
36+
// firebase::util::RegisterCallbackOnTask for context.
3737
extern const char kApiIdentifier[];
3838

3939
class FunctionsInternal {

‎remote_config/src/remote_config_android.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -682,9 +682,9 @@ Future<void> Fetch(uint64_t cache_expiration_in_seconds) {
682682
g_remote_config_class_instance, config::GetMethodId(config::kFetch),
683683
static_cast<jlong>(cache_expiration_in_seconds));
684684

685-
util::RegisterCallbackOnPendingResultOrTask(
686-
env, task, FutureCallback, *(reinterpret_cast<void* const*>(&handle)),
687-
kApiIdentifier);
685+
util::RegisterCallbackOnTask(env, task, FutureCallback,
686+
*(reinterpret_cast<void* const*>(&handle)),
687+
kApiIdentifier);
688688

689689
env->DeleteLocalRef(task);
690690
return static_cast<const Future<void>&>(

‎storage/src/android/storage_android.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ METHOD_LOOKUP_DECLARATION(cpp_byte_downloader, CPP_BYTE_DOWNLOADER_METHODS)
5454
METHOD_LOOKUP_DECLARATION(cpp_byte_uploader, CPP_BYTE_UPLOADER_METHODS)
5555

5656
// Used for registering global callbacks. See
57-
// firebase::util::RegisterCallbackOnPendingResultOrTask for context.
57+
// firebase::util::RegisterCallbackOnTask for context.
5858
extern const char kApiIdentifier[];
5959

6060
class StorageInternal {

0 commit comments

Comments
 (0)