Also fix a bug that prevents installation of multiple branches / official client, thanks whovian for pointing it out.
190 lines
5.5 KiB
Diff
190 lines
5.5 KiB
Diff
diff -crB com.discord-1006-base/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali com.discord-1006/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
|
|
*** com.discord-1006-base/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2019-12-13 11:10:57.210790875 +0300
|
|
--- com.discord-1006/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2019-12-13 13:05:12.545829166 +0300
|
|
***************
|
|
*** 81,110 ****
|
|
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Z
|
|
.locals 1
|
|
|
|
! const-string v0, "meUser"
|
|
!
|
|
! .line 2
|
|
! invoke-static {p1, v0}, Ls/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
|
!
|
|
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
|
!
|
|
! move-result p1
|
|
!
|
|
! if-nez p1, :cond_1
|
|
!
|
|
! if-eqz p2, :cond_0
|
|
!
|
|
! goto :goto_0
|
|
!
|
|
! :cond_0
|
|
! const/4 p1, 0x0
|
|
!
|
|
! goto :goto_1
|
|
!
|
|
! :cond_1
|
|
! :goto_0
|
|
! const/4 p1, 0x1
|
|
!
|
|
! :goto_1
|
|
! return p1
|
|
.end method
|
|
--- 81,87 ----
|
|
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Z
|
|
.locals 1
|
|
|
|
! const/4 v0, 0x1
|
|
!
|
|
! return v0
|
|
.end method
|
|
diff -crB com.discord-1006-base/smali/com/discord/stores/StoreExperiments.smali com.discord-1006/smali/com/discord/stores/StoreExperiments.smali
|
|
*** com.discord-1006-base/smali/com/discord/stores/StoreExperiments.smali 2019-12-13 11:10:57.214124228 +0300
|
|
--- com.discord-1006/smali/com/discord/stores/StoreExperiments.smali 2019-12-13 13:04:24.175505105 +0300
|
|
***************
|
|
*** 1281,1344 ****
|
|
.end method
|
|
|
|
.method public final isExperimentalAlpha()Z
|
|
! .locals 4
|
|
|
|
! .line 1
|
|
! iget-boolean v0, p0, Lcom/discord/stores/StoreExperiments;->initialized:Z
|
|
!
|
|
! const/4 v1, 0x1
|
|
!
|
|
! if-eqz v0, :cond_0
|
|
!
|
|
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->stream:Lcom/discord/stores/StoreStream;
|
|
!
|
|
! invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getUsers$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreUser;
|
|
!
|
|
! move-result-object v0
|
|
!
|
|
! iget-object v0, v0, Lcom/discord/stores/StoreUser;->me:Lcom/discord/models/domain/ModelUser$Me;
|
|
!
|
|
! if-eqz v0, :cond_0
|
|
!
|
|
! invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
|
!
|
|
! move-result v0
|
|
!
|
|
! if-eq v0, v1, :cond_2
|
|
!
|
|
! :cond_0
|
|
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->stream:Lcom/discord/stores/StoreStream;
|
|
!
|
|
! invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getGuilds$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreGuilds;
|
|
!
|
|
! move-result-object v0
|
|
!
|
|
! iget-object v0, v0, Lcom/discord/stores/StoreGuilds;->guilds:Ljava/util/Map;
|
|
!
|
|
! const-string v2, "stream.guilds.guilds"
|
|
!
|
|
! invoke-static {v0, v2}, Ls/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
|
!
|
|
! const-wide v2, 0x2bc056ab0800006L
|
|
!
|
|
! invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
|
|
!
|
|
! move-result-object v2
|
|
!
|
|
! invoke-interface {v0, v2}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
|
|
!
|
|
! move-result v0
|
|
!
|
|
! if-eqz v0, :cond_1
|
|
!
|
|
! goto :goto_0
|
|
!
|
|
! :cond_1
|
|
! const/4 v1, 0x0
|
|
!
|
|
! :cond_2
|
|
! :goto_0
|
|
! return v1
|
|
.end method
|
|
|
|
.method public final isInitialized()Lrx/Observable;
|
|
--- 1281,1290 ----
|
|
.end method
|
|
|
|
.method public final isExperimentalAlpha()Z
|
|
! .locals 1
|
|
! const/4 v0, 0x1
|
|
|
|
! return v0
|
|
.end method
|
|
|
|
.method public final isInitialized()Lrx/Observable;
|
|
diff -crB com.discord-1006-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali com.discord-1006/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
|
|
*** com.discord-1006-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2019-12-13 11:10:57.650793481 +0300
|
|
--- com.discord-1006/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2019-12-13 13:04:24.175505105 +0300
|
|
***************
|
|
*** 87,97 ****
|
|
|
|
if-nez p4, :cond_1
|
|
|
|
! invoke-static {p1, v1}, Ls/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
|
!
|
|
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
|
!
|
|
! move-result p4
|
|
|
|
if-eqz p4, :cond_0
|
|
|
|
--- 87,93 ----
|
|
|
|
if-nez p4, :cond_1
|
|
|
|
! const/4 p4, 0x1
|
|
|
|
if-eqz p4, :cond_0
|
|
|
|
diff -crB com.discord-1006-base/smali/com/discord/widgets/settings/WidgetSettings.smali com.discord-1006/smali/com/discord/widgets/settings/WidgetSettings.smali
|
|
*** com.discord-1006-base/smali/com/discord/widgets/settings/WidgetSettings.smali 2019-12-13 11:10:57.654126834 +0300
|
|
--- com.discord-1006/smali/com/discord/widgets/settings/WidgetSettings.smali 2019-12-13 13:04:24.175505105 +0300
|
|
***************
|
|
*** 958,966 ****
|
|
if-eqz v0, :cond_1
|
|
|
|
.line 2
|
|
! invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
|
!
|
|
! move-result v3
|
|
|
|
if-eq v3, v1, :cond_0
|
|
|
|
--- 958,964 ----
|
|
if-eqz v0, :cond_1
|
|
|
|
.line 2
|
|
! const/4 v3, 0x1
|
|
|
|
if-eq v3, v1, :cond_0
|
|
|
|
***************
|
|
*** 979,987 ****
|
|
if-eqz v0, :cond_2
|
|
|
|
.line 3
|
|
! invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isVerified()Z
|
|
!
|
|
! move-result v4
|
|
|
|
if-ne v4, v1, :cond_2
|
|
|
|
--- 977,983 ----
|
|
if-eqz v0, :cond_2
|
|
|
|
.line 3
|
|
! const/4 v4, 0x1
|
|
|
|
if-ne v4, v1, :cond_2
|
|
|
|
|