Re-port 10.1.3

Revert "10.1.3"

This reverts commit 12c11a1451.

Re-port 10.1.3
This commit is contained in:
ave 2019-12-21 21:30:11 +03:00
parent 2be217b2c3
commit 2b89b9b6a0
Signed by untrusted user: a
GPG key ID: 398DD7BD03276F6D
56 changed files with 710 additions and 247 deletions

View file

@ -1,13 +1,14 @@
diff -crB from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
*** from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2019-12-21 11:43:12.353840330 +0200
--- to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2019-12-21 11:44:49.811078316 +0200
diff -crB com.discord-1013-base/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali com.discord-1013/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
*** com.discord-1013-base/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2019-12-21 21:31:17.426695114 +0300
--- com.discord-1013/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2019-12-21 21:33:22.047420765 +0300
***************
*** 81,110 ****
*** 80,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}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
!
@ -33,22 +34,25 @@ diff -crB from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.
! :goto_1
! return p1
.end method
--- 81,87 ----
--- 80,86 ----
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Z
.locals 1
! const/4 v0, 0x1
+ const/4 v0, 0x1
! return v0
.end method
diff -crB from/smali/com/discord/stores/StoreExperiments.smali to/smali/com/discord/stores/StoreExperiments.smali
*** from/smali/com/discord/stores/StoreExperiments.smali 2019-12-21 11:43:12.360507101 +0200
--- to/smali/com/discord/stores/StoreExperiments.smali 2019-12-21 11:45:21.660675886 +0200
Only in com.discord-1013/smali/com/discord/stores: StoreExperiments$getExperimentalAlpha$1.smali.orig
Only in com.discord-1013/smali/com/discord/stores: StoreExperiments$getExperimentalAlpha$1.smali.rej
diff -crB com.discord-1013-base/smali/com/discord/stores/StoreExperiments.smali com.discord-1013/smali/com/discord/stores/StoreExperiments.smali
*** com.discord-1013-base/smali/com/discord/stores/StoreExperiments.smali 2019-12-21 21:31:17.430028467 +0300
--- com.discord-1013/smali/com/discord/stores/StoreExperiments.smali 2019-12-21 21:34:51.907943989 +0300
***************
*** 1282,1344 ****
*** 1281,1344 ****
.end method
.method public final isExperimentalAlpha()Z
.locals 4
! .locals 4
! .line 1
! iget-boolean v0, p0, Lcom/discord/stores/StoreExperiments;->initialized:Z
@ -109,19 +113,22 @@ diff -crB from/smali/com/discord/stores/StoreExperiments.smali to/smali/com/disc
.end method
.method public final isInitialized()Lrx/Observable;
--- 1282,1290 ----
--- 1281,1290 ----
.end method
.method public final isExperimentalAlpha()Z
.locals 4
+ const/4 v0, 0x0
! .locals 1
! const/4 v0, 0x1
! return v0
.end method
.method public final isInitialized()Lrx/Observable;
diff -crB from/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali to/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
*** from/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2019-12-21 11:43:12.930515985 +0200
--- to/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2019-12-21 11:45:52.687156483 +0200
Only in com.discord-1013/smali/com/discord/stores: StoreExperiments.smali.orig
Only in com.discord-1013/smali/com/discord/stores: StoreExperiments.smali.rej
diff -crB com.discord-1013-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali com.discord-1013/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
*** com.discord-1013-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2019-12-21 21:31:17.946698142 +0300
--- com.discord-1013/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2019-12-21 21:35:39.508221156 +0300
***************
*** 87,97 ****
@ -143,3 +150,6 @@ diff -crB from/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model
if-eqz p4, :cond_0
Only in com.discord-1013/smali/com/discord/widgets/settings: WidgetSettingsAppearance$Model$Companion$get$1.smali.orig
Only in com.discord-1013/smali/com/discord/widgets/settings: WidgetSettingsAppearance$Model$Companion$get$1.smali.rej