diff --git a/patches/notrack/1180.patch b/patches/notrack/1180.patch index 4c87e4a8da..69aa484a86 100644 --- a/patches/notrack/1180.patch +++ b/patches/notrack/1180.patch @@ -1,6 +1,6 @@ diff -crB from/res/values/strings.xml to/res/values/strings.xml -*** from/res/values/strings.xml 2020-07-07 14:29:57.390000000 +0300 ---- to/res/values/strings.xml 2020-07-07 18:06:47.600000000 +0300 +*** from/res/values/strings.xml 2020-07-07 21:22:21.610000000 +0300 +--- to/res/values/strings.xml 2020-07-08 02:02:23.900000000 +0300 *************** *** 1132,1138 **** Presets @@ -19,8 +19,8 @@ diff -crB from/res/values/strings.xml to/res/values/strings.xml Search Animated GIFs on the Web Displays text with emphasis. diff -crB from/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali to/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali -*** from/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali 2020-07-07 14:30:01.960000000 +0300 ---- to/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali 2020-07-07 18:06:47.600000000 +0300 +*** from/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali 2020-07-07 21:22:24.430000000 +0300 +--- to/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali 2020-07-08 02:02:23.900000000 +0300 *************** *** 42,97 **** .end method @@ -95,8 +95,8 @@ diff -crB from/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycl .end method diff -crB from/smali/com/discord/utilities/analytics/AdjustConfig.smali to/smali/com/discord/utilities/analytics/AdjustConfig.smali -*** from/smali/com/discord/utilities/analytics/AdjustConfig.smali 2020-07-07 14:30:01.960000000 +0300 ---- to/smali/com/discord/utilities/analytics/AdjustConfig.smali 2020-07-07 18:06:47.600000000 +0300 +*** from/smali/com/discord/utilities/analytics/AdjustConfig.smali 2020-07-07 21:22:24.430000000 +0300 +--- to/smali/com/discord/utilities/analytics/AdjustConfig.smali 2020-07-08 02:02:23.900000000 +0300 *************** *** 12,18 **** @@ -115,8 +115,8 @@ diff -crB from/smali/com/discord/utilities/analytics/AdjustConfig.smali to/smali .field public static final ADJUST_ENVIRONMENT:Ljava/lang/String; diff -crB from/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali to/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali -*** from/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali 2020-07-07 14:30:01.960000000 +0300 ---- to/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali 2020-07-07 18:06:47.600000000 +0300 +*** from/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali 2020-07-07 21:22:24.440000000 +0300 +--- to/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali 2020-07-08 02:02:23.900000000 +0300 *************** *** 15,23 **** @@ -224,8 +224,8 @@ diff -crB from/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEven return-void .end method diff -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali -*** from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-07-07 14:30:01.960000000 +0300 ---- to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-07-07 18:11:22.830000000 +0300 +*** from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-07-07 21:22:24.440000000 +0300 +--- to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-07-08 03:07:37.070000000 +0300 *************** *** 167,173 **** .method private final setBaselineProperties()V @@ -239,15 +239,44 @@ diff -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.sma .method private final setBaselineProperties()V .locals 5 -! const/16 v0, 0x4 +! const/16 v0, 0x3 new-array v0, v0, [Lkotlin/Pair; *************** -*** 228,310 **** +*** 199,267 **** - aput-object v2, v0, v1 + const/4 v1, 0x2 +- const/16 v2, 0x49c +- +- .line 3 +- invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; +- +- move-result-object v2 +- +- .line 4 +- new-instance v3, Lkotlin/Pair; +- +- const-string v4, "client_build_number" +- +- invoke-direct {v3, v4, v2}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V +- +- aput-object v3, v0, v1 +- +- const/4 v1, 0x3 +- +- .line 5 +- new-instance v2, Lkotlin/Pair; +- +- const-string v3, "client_version" +- +- const-string v4, "30.0" +- +- invoke-direct {v2, v3, v4}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V +- +- aput-object v2, v0, v1 +- - const/4 v1, 0x4 - - .line 6 @@ -282,17 +311,15 @@ diff -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.sma - - const/4 v1, 0x5 - -- .line 8 -- new-instance v2, Lkotlin/Pair; -- -- const-string v3, "os" -- -- const-string v4, "Android" -- -- invoke-direct {v2, v3, v4}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V -- -- aput-object v2, v0, v1 -- + .line 8 + new-instance v2, Lkotlin/Pair; + +--- 199,204 ---- +*************** +*** 273,310 **** + + aput-object v2, v0, v1 + - const/4 v1, 0x6 - - .line 9 @@ -328,7 +355,7 @@ diff -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.sma .line 13 invoke-static {v0}, Lj0/i/u;->mapOf([Lkotlin/Pair;)Ljava/util/Map; ---- 228,233 ---- +--- 210,215 ---- *************** *** 534,949 **** .end method @@ -452,12 +479,12 @@ diff -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.sma ! check-cast v5, Ljava/lang/String; ! ! const-string v6, "=" -! -! .line 8 -! filled-new-array {v6}, [Ljava/lang/String; -! -! move-result-object v6 +- .line 8 +- filled-new-array {v6}, [Ljava/lang/String; +- +- move-result-object v6 +- - invoke-static {v5, v6, v0, v0, v4}, Lj0/t/q;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Ljava/util/List; - - move-result-object v5 @@ -747,7 +774,7 @@ diff -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.sma - 0x7b737fcc -> :sswitch_0 - .end sparse-switch .end method ---- 457,469 ---- +--- 439,451 ---- .end method .method public final setAdvertiserId(Ljava/lang/String;)V @@ -762,8 +789,8 @@ diff -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.sma return-void .end method diff -crB from/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali to/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali -*** from/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali 2020-07-07 14:30:01.960000000 +0300 ---- to/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali 2020-07-07 18:12:51.830000000 +0300 +*** from/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali 2020-07-07 21:22:24.440000000 +0300 +--- to/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali 2020-07-08 02:02:23.900000000 +0300 *************** *** 149,157 **** .method public static final synthetic access$drainEventsQueue(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;)V @@ -1181,8 +1208,8 @@ diff -crB from/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smal return-void .end method diff -crB from/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali to/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali -*** from/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali 2020-07-07 14:30:02.010000000 +0300 ---- to/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali 2020-07-07 18:06:47.610000000 +0300 +*** from/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali 2020-07-07 21:22:24.490000000 +0300 +--- to/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali 2020-07-08 02:02:23.900000000 +0300 *************** *** 45,51 **** @@ -1201,8 +1228,8 @@ diff -crB from/smali/com/discord/utilities/integrations/SpotifyHelper$openPlaySt invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; diff -crB from/smali/com/discord/utilities/receiver/CampaignReceiver.smali to/smali/com/discord/utilities/receiver/CampaignReceiver.smali -*** from/smali/com/discord/utilities/receiver/CampaignReceiver.smali 2020-07-07 14:30:02.060000000 +0300 ---- to/smali/com/discord/utilities/receiver/CampaignReceiver.smali 2020-07-07 18:13:57.790000000 +0300 +*** from/smali/com/discord/utilities/receiver/CampaignReceiver.smali 2020-07-07 21:22:24.550000000 +0300 +--- to/smali/com/discord/utilities/receiver/CampaignReceiver.smali 2020-07-08 02:02:23.900000000 +0300 *************** *** 16,62 ****