From aa7717d48066344d03663f080b75931cc0a3defb Mon Sep 17 00:00:00 2001 From: eatsfoobars Date: Fri, 8 May 2020 16:40:05 +0100 Subject: [PATCH] Remove branding patches from notrack patch --- patches/notrack/1132.patch | 259 ++----------------------------------- 1 file changed, 13 insertions(+), 246 deletions(-) diff --git a/patches/notrack/1132.patch b/patches/notrack/1132.patch index ddfd28f..9b867d8 100644 --- a/patches/notrack/1132.patch +++ b/patches/notrack/1132.patch @@ -1,67 +1,8 @@ diff -crB from/AndroidManifest.xml to/AndroidManifest.xml -*** from/AndroidManifest.xml 2020-05-08 14:21:12.745416341 +0100 ---- to/AndroidManifest.xml 2020-05-08 14:29:42.363723556 +0100 +*** from/AndroidManifest.xml 2020-05-08 16:37:35.212835997 +0100 +--- to/AndroidManifest.xml 2020-05-08 16:37:40.530705156 +0100 *************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 20,31 **** - - - -! - - - - -! - - - ---- 20,31 ---- - - - -! - - - - -! - - - -*************** -*** 114,120 **** - - - -! - - - ---- 114,120 ---- - - - -! - - - -*************** -*** 144,155 **** - - - -! +*** 148,155 **** @@ -70,11 +11,7 @@ diff -crB from/AndroidManifest.xml to/AndroidManifest.xml ---- 144,155 ---- - - - -! +--- 148,155 ---- @@ -83,108 +20,9 @@ diff -crB from/AndroidManifest.xml to/AndroidManifest.xml -*************** -*** 161,167 **** - - - -! - - - ---- 161,167 ---- - - - -! - - - -*************** -*** 176,182 **** - - - -! - - - ---- 176,182 ---- - - - -! - - - -*************** -*** 186,192 **** - - - -! - - - ---- 186,192 ---- - - - -! - - - -*************** -*** 226,239 **** - - - -! - - - - - -! -! - - -! -\ No newline at end of file ---- 226,239 ---- - - - -! - - - - - -! -! - - -! -diff -crB from/apktool.yml to/apktool.yml -*** from/apktool.yml 2020-05-08 14:20:55.799591501 +0100 ---- to/apktool.yml 2020-05-08 14:29:25.335923282 +0100 -*************** -*** 190,194 **** - tag: null - version: 2.4.2-f3136b-SNAPSHOT - versionInfo: -! versionCode: '1132' -! versionName: 22-alpha1 ---- 190,194 ---- - tag: null - version: 2.4.2-f3136b-SNAPSHOT - versionInfo: -! versionCode: '1132CTCBUILD' -! versionName: '22-alpha1-cutthecord-CTCBUILD' diff -crB from/res/values/strings.xml to/res/values/strings.xml -*** from/res/values/strings.xml 2020-05-08 14:20:51.075640107 +0100 ---- to/res/values/strings.xml 2020-05-08 14:29:42.363723556 +0100 +*** from/res/values/strings.xml 2020-05-08 16:37:35.212835997 +0100 +--- to/res/values/strings.xml 2020-05-08 16:37:40.532705107 +0100 *************** *** 1057,1063 **** OR @@ -202,60 +40,9 @@ diff -crB from/res/values/strings.xml to/res/values/strings.xml Coming Soon Search Animated GIFs on the Web Displays text with emphasis. -*************** -*** 1389,1395 **** - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! Discord - Discord is an all-in-one communication app for your friends, communities, and gaming. - Team voice & text chat - discord.gg/ ---- 1389,1395 ---- - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! CTCNAME - Discord is an all-in-one communication app for your friends, communities, and gaming. - Team voice & text chat - discord.gg/ -*************** -*** 3790,3796 **** - Failed to reply to %1$s - Replied to %1$s - Notification Settings -! Discord - "Somebody Playin'" - Notifications - Setup notifications to know when your friends send a message. ---- 3790,3796 ---- - Failed to reply to %1$s - Replied to %1$s - Notification Settings -! CTCNAME - "Somebody Playin'" - Notifications - Setup notifications to know when your friends send a message. -*************** -*** 5119,5125 **** - Subscriptions - Suggestions - %1$s, %2$s -! Support - Remove all embeds - This will remove all embeds on this message for everyone. - Remove All Embeds ---- 5119,5125 ---- - Subscriptions - Suggestions - %1$s, %2$s -! CutTheCord Repo - Remove all embeds - This will remove all embeds on this message for everyone. - Remove All Embeds 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-05-08 14:20:52.929621043 +0100 ---- to/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali 2020-05-08 14:30:23.863234861 +0100 +--- to/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali 2020-05-08 16:37:40.532705107 +0100 *************** *** 42,135 **** .end method @@ -369,7 +156,7 @@ diff -crB from/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycl 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-05-08 14:20:52.929621043 +0100 ---- to/smali/com/discord/utilities/analytics/AdjustConfig.smali 2020-05-08 14:29:42.365723534 +0100 +--- to/smali/com/discord/utilities/analytics/AdjustConfig.smali 2020-05-08 16:37:40.532705107 +0100 *************** *** 12,18 **** @@ -389,7 +176,7 @@ diff -crB from/smali/com/discord/utilities/analytics/AdjustConfig.smali to/smali 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-05-08 14:20:52.929621043 +0100 ---- to/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali 2020-05-08 14:30:55.310862854 +0100 +--- to/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali 2020-05-08 16:37:40.532705107 +0100 *************** *** 15,23 **** @@ -460,7 +247,7 @@ diff -crB from/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEven .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-05-08 14:20:52.931621023 +0100 ---- to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-05-08 14:31:28.310471046 +0100 +--- to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-05-08 16:37:40.532705107 +0100 *************** *** 173,179 **** .method private final setBaselineProperties()V @@ -991,7 +778,7 @@ diff -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.sma .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-05-08 14:20:52.933621002 +0100 ---- to/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali 2020-05-08 14:33:00.071374535 +0100 +--- to/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali 2020-05-08 16:37:40.532705107 +0100 *************** *** 149,157 **** .method public static final synthetic access$drainEventsQueue(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;)V @@ -1409,29 +1196,9 @@ diff -crB from/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smal return-void .end method -diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali -*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-05-08 14:20:52.947620858 +0100 ---- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-05-08 14:29:25.337923258 +0100 -*************** -*** 76,82 **** - .line 3 - new-instance v0, Landroid/content/Intent; - -! const-string v1, "https://discordapp.com/app" - - .line 4 - invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; ---- 76,82 ---- - .line 3 - new-instance v0, Landroid/content/Intent; - -! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" - - .line 4 - invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; 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-05-08 14:20:52.979620529 +0100 ---- to/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali 2020-05-08 14:29:42.365723534 +0100 +--- to/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali 2020-05-08 16:37:40.532705107 +0100 *************** *** 45,51 **** @@ -1451,7 +1218,7 @@ diff -crB from/smali/com/discord/utilities/integrations/SpotifyHelper$openPlaySt 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-05-08 14:20:53.015620159 +0100 ---- to/smali/com/discord/utilities/receiver/CampaignReceiver.smali 2020-05-08 14:33:21.109121808 +0100 +--- to/smali/com/discord/utilities/receiver/CampaignReceiver.smali 2020-05-08 16:37:40.532705107 +0100 *************** *** 16,62 ****