Skip to content

Commit d4f42e4

Browse files
brismithersbrismithers
committed
* Update example app to use com.onesignal.sdk.test application id and signing config for Huawei.
* Remove coroutine launch when registering for HMS push token.
1 parent f8c0d29 commit d4f42e4

File tree

3 files changed

+91
-54
lines changed

3 files changed

+91
-54
lines changed

‎Examples/OneSignalDemo/app/agconnect-services.json

Lines changed: 54 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,75 @@
11
{
22
"agcgw":{
3-
"backurl":"connect-dre.dbankcloud.cn",
4-
"url":"connect-dre.hispace.hicloud.com",
5-
"websocketbackurl":"connect-ws-dre.hispace.dbankcloud.cn",
6-
"websocketurl":"connect-ws-dre.hispace.dbankcloud.com"
3+
"backurl":"connect-dre.hispace.hicloud.com",
4+
"url":"connect-dre.dbankcloud.cn",
5+
"websocketbackurl":"connect-ws-dre.hispace.dbankcloud.com",
6+
"websocketurl":"connect-ws-dre.hispace.dbankcloud.cn"
77
},
88
"agcgw_all":{
9-
"CN":"connect-drcn.hispace.hicloud.com",
10-
"CN_back":"connect-drcn.dbankcloud.cn",
11-
"DE":"connect-dre.hispace.hicloud.com",
12-
"DE_back":"connect-dre.dbankcloud.cn",
13-
"RU":"connect-drru.hispace.hicloud.com",
14-
"RU_back":"connect-drru.dbankcloud.cn",
15-
"SG":"connect-dra.hispace.hicloud.com",
16-
"SG_back":"connect-dra.dbankcloud.cn"
9+
"CN":"connect-drcn.dbankcloud.cn",
10+
"CN_back":"connect-drcn.hispace.hicloud.com",
11+
"DE":"connect-dre.dbankcloud.cn",
12+
"DE_back":"connect-dre.hispace.hicloud.com",
13+
"RU":"connect-drru.hispace.dbankcloud.ru",
14+
"RU_back":"connect-drru.hispace.dbankcloud.cn",
15+
"SG":"connect-dra.dbankcloud.cn",
16+
"SG_back":"connect-dra.hispace.hicloud.com"
17+
},
18+
"websocketgw_all":{
19+
"CN":"connect-ws-drcn.hispace.dbankcloud.cn",
20+
"CN_back":"connect-ws-drcn.hispace.dbankcloud.com",
21+
"DE":"connect-ws-dre.hispace.dbankcloud.cn",
22+
"DE_back":"connect-ws-dre.hispace.dbankcloud.com",
23+
"RU":"connect-ws-drru.hispace.dbankcloud.ru",
24+
"RU_back":"connect-ws-drru.hispace.dbankcloud.cn",
25+
"SG":"connect-ws-dra.hispace.dbankcloud.cn",
26+
"SG_back":"connect-ws-dra.hispace.dbankcloud.com"
1727
},
1828
"client":{
1929
"cp_id":"5190001000034239317",
20-
"product_id":"9105385871709201822",
21-
"client_id":"336482233541985344",
22-
"client_secret":"5E30C748A012DE67BAF83E2C542A4AB694CCAA89F1D5E8FCEFA57E0F28A077FB",
23-
"project_id":"9105385871709201822",
24-
"app_id":"102009847",
25-
"api_key":"CV68fkx9E2fU8Fv/v3zbuO8+rCjJ8w6QiMha7ZJUpIGTxs08n0/ddVXbOueUKBtxf3sD+ni8WPx27htLHhtse5eP5VrT",
26-
"package_name":"com.onesignal.sdktest"
30+
"product_id":"388421841221340564",
31+
"client_id":"1103097158011211392",
32+
"client_secret":"14843C60CAFDCFD5E50025C14864697AFF55886BCF00558E8C817F141E0B4704",
33+
"project_id":"388421841221340564",
34+
"app_id":"107780279",
35+
"api_key":"DAEDAN06wwm3fsiHbQaQzugegFDUc6lpsR9VZGRNoWEbjHpDphR5rSbobUr5/ohT1WlRTyIykjr4GzzEJ/jSxlziFmXF/8e56HAYiw==",
36+
"package_name":"com.onesignal.sdk.test"
2737
},
2838
"oauth_client":{
29-
"client_id":"102009847",
39+
"client_id":"107780279",
3040
"client_type":1
3141
},
3242
"app_info":{
33-
"app_id":"102009847",
34-
"package_name":"com.onesignal.sdktest"
43+
"app_id":"107780279",
44+
"package_name":"com.onesignal.sdk.test"
3545
},
3646
"service":{
3747
"analytics":{
3848
"collector_url":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
49+
"collector_url_ru":"datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com",
50+
"collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
51+
"collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
52+
"collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
3953
"resource_id":"p1",
4054
"channel_id":""
4155
},
56+
"edukit":{
57+
"edu_url":"edukit.edu.cloud.huawei.com.cn",
58+
"dh_url":"edukit.edu.cloud.huawei.com.cn"
59+
},
4260
"search":{
4361
"url":"https://search-dre.cloud.huawei.com"
4462
},
4563
"cloudstorage":{
46-
"storage_url":"https://ops-dre.agcstorage.link"
64+
"storage_url_sg_back":"https://agc-storage-dra.cloud.huawei.asia",
65+
"storage_url_ru_back":"https://agc-storage-drru.cloud.huawei.ru",
66+
"storage_url_ru":"https://agc-storage-drru.cloud.huawei.ru",
67+
"storage_url_de_back":"https://agc-storage-dre.cloud.huawei.eu",
68+
"storage_url_de":"https://ops-dre.agcstorage.link",
69+
"storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn",
70+
"storage_url_sg":"https://ops-dra.agcstorage.link",
71+
"storage_url_cn_back":"https://agc-storage-drcn.cloud.huawei.com.cn",
72+
"storage_url_cn":"https://agc-storage-drcn.platform.dbankcloud.cn"
4773
},
4874
"ml":{
4975
"mlservice_url":"ml-api-dre.ai.dbankcloud.com,ml-api-dre.ai.dbankcloud.cn"
@@ -53,17 +79,17 @@
5379
"configuration_version":"3.0",
5480
"appInfos":[
5581
{
56-
"package_name":"com.onesignal.sdktest",
82+
"package_name":"com.onesignal.sdk.test",
5783
"client":{
58-
"app_id":"102009847"
84+
"app_id":"107780279"
5985
},
6086
"app_info":{
61-
"package_name":"com.onesignal.sdktest",
62-
"app_id":"102009847"
87+
"package_name":"com.onesignal.sdk.test",
88+
"app_id":"107780279"
6389
},
6490
"oauth_client":{
6591
"client_type":1,
66-
"client_id":"102009847"
92+
"client_id":"107780279"
6793
}
6894
}
6995
]

‎Examples/OneSignalDemo/app/build.gradle

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,16 @@ android {
1515
flavorDimensions "default"
1616
}
1717

18-
buildTypes {
19-
release {
20-
minifyEnabled false
21-
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
22-
}
23-
}
18+
// signingConfigs {
19+
// huawei {
20+
// storeFile file('SdkTest.jks')
21+
// keyAlias 'SdkTest'
22+
// keyPassword ''
23+
// storePassword ''
24+
// v1SigningEnabled true
25+
// v2SigningEnabled true
26+
// }
27+
// }
2428

2529
productFlavors {
2630
gms {
@@ -30,7 +34,19 @@ android {
3034
huawei {
3135
dimension "default"
3236
minSdkVersion 17
33-
applicationId "com.onesignal.sdktest"
37+
applicationId "com.onesignal.sdk.test"
38+
}
39+
}
40+
41+
buildTypes {
42+
release {
43+
minifyEnabled false
44+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
45+
}
46+
debug {
47+
// signingConfig null
48+
// productFlavors.huawei.signingConfig signingConfigs.huawei
49+
debuggable true
3450
}
3551
}
3652

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

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ import com.onesignal.core.internal.device.IDeviceService
1313
import com.onesignal.debug.internal.logging.Logging
1414
import com.onesignal.notifications.internal.registration.IPushRegistrator
1515
import com.onesignal.user.internal.subscriptions.SubscriptionStatus
16-
import kotlinx.coroutines.Dispatchers
17-
import kotlinx.coroutines.coroutineScope
18-
import kotlinx.coroutines.launch
1916
import kotlinx.coroutines.withTimeout
2017

2118
internal class PushRegistratorHMS(
@@ -30,26 +27,24 @@ internal class PushRegistratorHMS(
3027

3128
private var _waiter: WaiterWithValue<String?>? = null
3229

33-
override suspend fun registerForPush(): IPushRegistrator.RegisterResult = coroutineScope {
30+
override suspend fun registerForPush(): IPushRegistrator.RegisterResult {
3431
var result: IPushRegistrator.RegisterResult? = null
3532

36-
launch(Dispatchers.Default) {
37-
result = try {
38-
getHMSTokenTask(_applicationService.appContext)
39-
} catch (e: ApiException) {
40-
Logging.error("HMS ApiException getting Huawei push token!", e)
41-
val pushStatus: SubscriptionStatus =
42-
if (e.statusCode == CommonCode.ErrorCode.ARGUMENTS_INVALID) {
43-
SubscriptionStatus.HMS_ARGUMENTS_INVALID
44-
} else {
45-
SubscriptionStatus.HMS_API_EXCEPTION_OTHER
46-
}
33+
result = try {
34+
getHMSTokenTask(_applicationService.appContext)
35+
} catch (e: ApiException) {
36+
Logging.error("HMS ApiException getting Huawei push token!", e)
37+
val pushStatus: SubscriptionStatus =
38+
if (e.statusCode == CommonCode.ErrorCode.ARGUMENTS_INVALID) {
39+
SubscriptionStatus.HMS_ARGUMENTS_INVALID
40+
} else {
41+
SubscriptionStatus.HMS_API_EXCEPTION_OTHER
42+
}
4743

48-
IPushRegistrator.RegisterResult(null, pushStatus)
49-
}
44+
IPushRegistrator.RegisterResult(null, pushStatus)
5045
}
5146

52-
return@coroutineScope result!!
47+
return result!!
5348
}
5449

5550
@Synchronized
@@ -84,7 +79,7 @@ internal class PushRegistratorHMS(
8479
}
8580

8681
return if (pushToken != null) {
87-
Logging.error("ADM registered with ID:$pushToken")
82+
Logging.error("HMS registered with ID:$pushToken")
8883
IPushRegistrator.RegisterResult(
8984
pushToken,
9085
SubscriptionStatus.SUBSCRIBED

0 commit comments

Comments
 (0)