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,6 +1,6 @@
diff -crB from/smali/com/discord/app/App.smali to/smali/com/discord/app/App.smali
*** from/smali/com/discord/app/App.smali 2019-12-21 11:43:12.150503828 +0200
--- to/smali/com/discord/app/App.smali 2019-12-21 12:05:43.599037211 +0200
diff -crB com.discord-1013-base/smali/com/discord/app/App.smali com.discord-1013/smali/com/discord/app/App.smali
*** com.discord-1013-base/smali/com/discord/app/App.smali 2019-12-21 21:31:17.270027535 +0300
--- com.discord-1013/smali/com/discord/app/App.smali 2019-12-21 21:36:16.655104125 +0300
***************
*** 197,203 ****
@ -18,9 +18,9 @@ diff -crB from/smali/com/discord/app/App.smali to/smali/com/discord/app/App.smal
.line 23
invoke-static {v0}, Lcom/discord/models/domain/emoji/ModelEmojiCustom;->setCdnUri(Ljava/lang/String;)V
diff -crB from/smali/com/discord/BuildConfig.smali to/smali/com/discord/BuildConfig.smali
*** from/smali/com/discord/BuildConfig.smali 2019-12-21 11:43:12.147170442 +0200
--- to/smali/com/discord/BuildConfig.smali 2019-12-21 12:05:43.599037211 +0200
diff -crB com.discord-1013-base/smali/com/discord/BuildConfig.smali com.discord-1013/smali/com/discord/BuildConfig.smali
*** com.discord-1013-base/smali/com/discord/BuildConfig.smali 2019-12-21 21:31:17.266694183 +0300
--- com.discord-1013/smali/com/discord/BuildConfig.smali 2019-12-21 21:36:16.655104125 +0300
***************
*** 18,32 ****
@ -54,9 +54,9 @@ diff -crB from/smali/com/discord/BuildConfig.smali to/smali/com/discord/BuildCon
.field public static final LOCAL_IP:Ljava/lang/String; = ""
diff -crB from/smali/com/discord/stores/StoreGatewayConnection.smali to/smali/com/discord/stores/StoreGatewayConnection.smali
*** from/smali/com/discord/stores/StoreGatewayConnection.smali 2019-12-21 11:43:12.397174339 +0200
--- to/smali/com/discord/stores/StoreGatewayConnection.smali 2019-12-21 12:05:43.599037211 +0200
diff -crB com.discord-1013-base/smali/com/discord/stores/StoreGatewayConnection.smali com.discord-1013/smali/com/discord/stores/StoreGatewayConnection.smali
*** com.discord-1013-base/smali/com/discord/stores/StoreGatewayConnection.smali 2019-12-21 21:31:17.436695173 +0300
--- com.discord-1013/smali/com/discord/stores/StoreGatewayConnection.smali 2019-12-21 21:36:16.658437477 +0300
***************
*** 1333,1339 ****
@ -74,13 +74,10 @@ diff -crB from/smali/com/discord/stores/StoreGatewayConnection.smali to/smali/co
invoke-direct {v9, v3, v2, v0}, Lcom/discord/gateway/rest/RestConfig;-><init>(Ljava/lang/String;Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;Ljava/util/List;)V
Only in to/smali/com/discord/utilities/analytics: AdjustConfig$AdjustLifecycleListener.smali.rej
Only in to/smali/com/discord/utilities/analytics: AnalyticsTracker$AdjustEventTracker.smali.rej
Only in to/smali/com/discord/utilities/analytics: AnalyticSuperProperties.smali.rej
Only in to/smali/com/discord/utilities/analytics: AnalyticsUtils$Tracker.smali.rej
diff -crB from/smali/com/discord/utilities/icon/IconUtils.smali to/smali/com/discord/utilities/icon/IconUtils.smali
*** from/smali/com/discord/utilities/icon/IconUtils.smali 2019-12-21 11:43:12.513842824 +0200
--- to/smali/com/discord/utilities/icon/IconUtils.smali 2019-12-21 12:07:09.089524116 +0200
Only in com.discord-1013/smali/com/discord/stores: StoreGatewayConnection.smali.orig
diff -crB com.discord-1013-base/smali/com/discord/utilities/icon/IconUtils.smali com.discord-1013/smali/com/discord/utilities/icon/IconUtils.smali
*** com.discord-1013-base/smali/com/discord/utilities/icon/IconUtils.smali 2019-12-21 21:31:17.623362926 +0300
--- com.discord-1013/smali/com/discord/utilities/icon/IconUtils.smali 2019-12-21 21:36:37.391891539 +0300
***************
*** 441,447 ****
goto :goto_3
@ -234,11 +231,11 @@ diff -crB from/smali/com/discord/utilities/icon/IconUtils.smali to/smali/com/dis
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
Only in to/smali/com/discord/utilities/icon: IconUtils.smali.rej
Only in to/smali/com/discord/utilities/receiver: CampaignReceiver.smali.rej
diff -crB from/smali/com/discord/utilities/rest/RestAPI$Companion.smali to/smali/com/discord/utilities/rest/RestAPI$Companion.smali
*** from/smali/com/discord/utilities/rest/RestAPI$Companion.smali 2019-12-21 11:43:12.537176520 +0200
--- to/smali/com/discord/utilities/rest/RestAPI$Companion.smali 2019-12-21 12:05:43.599037211 +0200
Only in com.discord-1013/smali/com/discord/utilities/icon: IconUtils.smali.orig
Only in com.discord-1013/smali/com/discord/utilities/icon: IconUtils.smali.rej
diff -crB com.discord-1013-base/smali/com/discord/utilities/rest/RestAPI$Companion.smali com.discord-1013/smali/com/discord/utilities/rest/RestAPI$Companion.smali
*** com.discord-1013-base/smali/com/discord/utilities/rest/RestAPI$Companion.smali 2019-12-21 21:31:17.663363159 +0300
--- com.discord-1013/smali/com/discord/utilities/rest/RestAPI$Companion.smali 2019-12-21 21:36:16.661770830 +0300
***************
*** 302,308 ****
.line 9
@ -256,3 +253,5 @@ diff -crB from/smali/com/discord/utilities/rest/RestAPI$Companion.smali to/smali
invoke-direct {v1, v9, v6}, Lcom/discord/restapi/RestAPIBuilder;-><init>(Ljava/lang/String;Lx/n;)V
Only in com.discord-1013/smali/com/discord/utilities/rest: RestAPI$Companion.smali.orig