Skip to content

Commit 7ebd34a

Browse files
authored
Merge pull request #390 from firebase/bugfix/android-remote-config-specific-app
use native android call with app as parameter
2 parents 7b410d8 + 8f91321 commit 7ebd34a

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

release_build_files/readme.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,12 @@ code.
571571

572572
## Release Notes
573573

574+
### TBD
575+
- Changes
576+
- Remote Config(Android): Fix for getting Remote Config instance for a
577+
specific app object.
578+
([#991](https://github.com/firebase/quickstart-unity/issues/991).
579+
574580
### 7.3.0
575581
- Changes
576582
- General (iOS): Update dependencies.

remote_config/src/android/remote_config_android.cc

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ DEFINE_FIREBASE_VERSION_STRING(FirebaseRemoteConfig);
3737
// clang-format off
3838
#define REMOTE_CONFIG_METHODS(X) \
3939
X(GetInstance, "getInstance", \
40-
"()Lcom/google/firebase/remoteconfig/FirebaseRemoteConfig;", \
40+
"(Lcom/google/firebase/FirebaseApp;)" \
41+
"Lcom/google/firebase/remoteconfig/FirebaseRemoteConfig;", \
4142
util::kMethodTypeStatic), \
4243
X(EnsureInitialized, "ensureInitialized", \
4344
"()Lcom/google/android/gms/tasks/Task;"), \
@@ -454,8 +455,12 @@ RemoteConfigInternal::RemoteConfigInternal(const firebase::App& app)
454455

455456
// Create the remote config class.
456457
jclass config_class = config::GetClass();
458+
jobject platform_app = app_.GetPlatformApp();
457459
jobject config_instance_local = env->CallStaticObjectMethod(
458-
config_class, config::GetMethodId(config::kGetInstance));
460+
config_class,
461+
config::GetMethodId(config::kGetInstance),
462+
platform_app);
463+
env->DeleteLocalRef(platform_app);
459464
if (util::CheckAndClearJniExceptions(env)) config_instance_local = nullptr;
460465
FIREBASE_ASSERT(config_instance_local);
461466
internal_obj_ = env->NewGlobalRef(config_instance_local);

0 commit comments

Comments
 (0)