Skip to content

Commit fe5f854

Browse files
committed
[User Model] Don't show "Missing Google Project number!" error message until remote config loaded.
1 parent f9b0f75 commit fe5f854

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/config/ConfigModel.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ import org.json.JSONArray
55
import org.json.JSONObject
66

77
class ConfigModel : Model() {
8+
/**
9+
* Whether this config has been initialized with remote data.
10+
*/
11+
var isInitializedWithRemote: Boolean
12+
get() = getBooleanProperty(::isInitializedWithRemote.name) { false }
13+
set(value) { setBooleanProperty(::isInitializedWithRemote.name, value) }
14+
815
/**
916
* The current OneSignal application ID provided to the SDK.
1017
*/

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/config/impl/ConfigModelStoreListener.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ internal class ConfigModelStoreListener(
6868
val config = ConfigModel()
6969
config.initializeFromModel(null, _configModelStore.model)
7070

71+
config.isInitializedWithRemote = true
72+
7173
// these are always copied from the backend params
7274
config.appId = appId
7375
config.notificationChannels = params.notificationChannels

OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/registration/impl/PushRegistratorAbstractGoogle.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ internal abstract class PushRegistratorAbstractGoogle(
5151
abstract suspend fun getToken(senderId: String): String
5252

5353
override suspend fun registerForPush(): IPushRegistrator.RegisterResult {
54+
if(!_configModelStore.model.isInitializedWithRemote) {
55+
return IPushRegistrator.RegisterResult(null, SubscriptionStatus.FIREBASE_FCM_INIT_ERROR)
56+
}
57+
5458
if (!_deviceService.hasFCMLibrary) {
5559
Logging.fatal("The Firebase FCM library is missing! Please make sure to include it in your project.")
5660
return IPushRegistrator.RegisterResult(null, SubscriptionStatus.MISSING_FIREBASE_FCM_LIBRARY)

0 commit comments

Comments
 (0)