Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 修复Sentry上报的BUG

Browse Source
This commit is contained in:
曾祥俊
2024-04-01 11:15:57 +08:00
parent c2aae6d5f9
commit f449a41257
4 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/com/halo/assistant/HaloApp.java
View File

@ -456,7 +456,7 @@ public class HaloApp extends MultiDexApplication {
.getInstance()
.build(RouteConsts.provider.push)
.navigation();
pushProvider.initialize(this);
if (pushProvider != null) pushProvider.initialize(this);
}
/**
@ -469,12 +469,14 @@ public class HaloApp extends MultiDexApplication {
.build(RouteConsts.provider.push)
.navigation();
if (pushProvider == null) return;
// 绑定账号
Single<String> bindAccountSingle = pushProvider.bindAccount(getOAID());
// 绑定标签
Single<String> bindTagSingle = pushProvider.bindTag(mChannel)
.subscribeOn(Schedulers.io());
Single<String> bindTagSingle = !TextUtils.isEmpty(mChannel)
? pushProvider.bindTag(mChannel).subscribeOn(Schedulers.io()) : null;
// 初始化推送
pushProvider
@ -482,8 +484,13 @@ public class HaloApp extends MultiDexApplication {
.flatMap((response) -> {
// 绑定别名、标签和账号任意一个流程失败，都不会影响其他流程的执行
Single<String> single = bindAccountSingle
.onErrorReturn((e) -> response)
.zipWith(bindTagSingle.onErrorReturn((e) -> response), (s1, s2) -> response);
.onErrorReturn((e) -> response);
if (bindTagSingle != null) {
single = single
.zipWith(bindTagSingle.onErrorReturn((e) -> response), (s1, s2) -> response);
}
if (UserManager.getInstance().isLoggedIn()) {
String userId = UserManager.getInstance().getUserId();
// 绑定别名