.gitignore

@@ -1,14 +1,2 @@
 patches/*/*-custom.patch
 patches/*/*.patch-failed
-resources/distok/versionlogs/*
-!resources/distok/versionlogs/.gitkeep
-resources/fdroid/repo/icons/*.xml
-resources/fonts/*.ttf
-resources/fonts/*.otf
-resources/icons/others/*
-!resources/icons/others/.gitkeep
-resources/ringtones/*
-!resources/ringtones/.gitkeep
-resources/keystores/*
-!resources/keystores/.gitkeep
-*.apk

Dockerfile

@@ -3,9 +3,6 @@ FROM ubuntu:21.04
 # Install needed packages
 RUN apt-get update
 RUN DEBIAN_FRONTEND=noninteractive apt-get -y install python3 android-sdk-build-tools wget unzip imagemagick git patch software-properties-common
-# Mirror is being weird currently so install this seperatly
-RUN apt-get update
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install zipmerge
 
 # Install fdroid
 RUN add-apt-repository ppa:fdroid/fdroidserver
@@ -23,9 +20,6 @@ RUN wget -O ${CTC_FOLDER}/tools/apktool.jar https://f001.backblazeb2.com/file/av
 # Grab xml-patch (https://github.com/dnault/xml-patch)
 RUN wget -O ${CTC_FOLDER}/tools/xml-patch.jar https://jcenter.bintray.com/com/github/dnault/xml-patch/0.3.1/xml-patch-0.3.1.jar
 
-# Grab dex2jar (https://github.com/Aliucord/dex2jar)
-RUN wget -O ${CTC_FOLDER}/tools/dex2jar.jar https://github.com/Aliucord/dex2jar/releases/download/v19-fork2/dex2jar.jar
-
 # Grab emoji sets
 ENV EMOJI_PATH=${CTC_FOLDER}/emojis
 ENV EMOJI_MUTANT_PATH=${EMOJI_PATH}/mutant

README.md

@@ -2,9 +2,7 @@
 
 Modular Client Mod for Discord's Android app.
 
-**THIS IS A WORK IN PROGRESS BRANCH! SOME PATCHES ARE MISSING (tokenlogin, hideunusableemojis, plus showtag has a bug)!**
+**THIS IS A WORK IN PROGRESS BRANCH! THE PATCHES ARE INCOMPLETE!**
-
-Current state is good enough™ for an RC release, and there's currently RC releases in the repo. Update away!
 
 For status updates and support on the project, join #cutthecord on https://libera.chat. WebIRC link: https://web.libera.chat/#cutthecord
 
@@ -12,7 +10,7 @@ For status updates and support on the project, join #cutthecord on https://liber
 
 New patch development will be done for the latest supported version.
 
-![A CutTheCord screenshot](https://elixi.re/t/m16z287iw.png)
+![A CutTheCord screenshot](https://elixi.re/t/mh3eirsy9.png)
 
 Check out [README.md in patches folder to see what patches are available and what each of them do](patches/README.md)!
 

resources/old-patches/README.md

@@ -13,5 +13,4 @@ Here's why these patches are no longer maintained in this form:
 - nonearby: Didn't add much anyways.
 - squareavatars: Moved to xml-patchs
 - betterrotation: Moved to xml-patchs
-- noblocked: Moved to xml-patchs
+- noblocked: Moved to xml-patchs
-- slashcommands: Moved to dynamic patch due to discord api supporting this now

resources/patches/betterdmheader/87202.patch

@@ -1,37 +0,0 @@
-diff -crB from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali
-*** from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali	2020-11-19 15:23:43.685245089 +0000
---- to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali	2020-11-19 15:26:07.886953277 +0000
-***************
-*** 181,187 ****
-
-      invoke-static {v3, v9}, Ld0/z/d/m;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
-
-!     invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
-
-      .line 7
-      invoke-interface {p1, v8}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
---- 181,187 ----
-
-      invoke-static {v3, v9}, Ld0/z/d/m;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
-
-!     invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
-
-      .line 7
-      invoke-interface {p1, v8}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
-***************
-*** 360,366 ****
-
-      invoke-static {v3, v9}, Ld0/z/d/m;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
-
-!     invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
-
-      .line 19
-      invoke-interface {p1, v6}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
---- 360,366 ----
-
-      invoke-static {v3, v9}, Ld0/z/d/m;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
-
-!     invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
-
-      .line 19
-      invoke-interface {p1, v6}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;

resources/patches/branding/customdynamicicon.sh

@@ -1,3 +1,7 @@
+\cp res/mipmap-xxxhdpi/ic_launcher_background.png res/mipmap-hdpi/ic_launcher_background.png
+\cp res/mipmap-xxxhdpi/ic_launcher_background.png res/mipmap-xhdpi/ic_launcher_background.png
+\cp res/mipmap-xxxhdpi/ic_launcher_background.png res/mipmap-xxhdpi/ic_launcher_background.png
+
 \cp res/mipmap-xxxhdpi/ic_launcher_foreground.png res/mipmap-hdpi/ic_launcher_foreground.png
 \cp res/mipmap-xxxhdpi/ic_launcher_foreground.png res/mipmap-xhdpi/ic_launcher_foreground.png
 \cp res/mipmap-xxxhdpi/ic_launcher_foreground.png res/mipmap-xxhdpi/ic_launcher_foreground.png

resources/patches/customtheme/fixsplash.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-\cp "$1" res/drawable-xxxhdpi/img_logo.png
+\cp "$1" res/drawable-xxxhdpi/img_loading_logo.png

resources/patches/disable-mobileindicator/87202.patch

@@ -1,4 +1,29 @@
 diff -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
+*** from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali   2021-08-04 19:46:28.632872300 +0100
+--- to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali     2021-08-04 21:06:15.420553000 +0100
+***************
+*** 181,187 ****
+
+      invoke-static {v3, v9}, Ld0/z/d/m;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+!     invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
+
+      .line 7
+      invoke-interface {p1, v8}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
+--- 181,187 ----
+
+      invoke-static {v3, v9}, Ld0/z/d/m;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+!     invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
+
+      .line 7
+      invoke-interface {p1, v8}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
+clienthax@DESKTOP-KM4G6JD:/mnt/c/Users/clienthax/Documents/Projects/cutthecord/ugh$
+clienthax@DESKTOP-KM4G6JD:/mnt/c/Users/clienthax/Documents/Projects/cutthecord/ugh$
+clienthax@DESKTOP-KM4G6JD:/mnt/c/Users/clienthax/Documents/Projects/cutthecord/ugh$
+clienthax@DESKTOP-KM4G6JD:/mnt/c/Users/clienthax/Documents/Projects/cutthecord/ugh$
+clienthax@DESKTOP-KM4G6JD:/mnt/c/Users/clienthax/Documents/Projects/cutthecord/ugh$
+clienthax@DESKTOP-KM4G6JD:/mnt/c/Users/clienthax/Documents/Projects/cutthecord/ugh$ 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    2021-08-04 19:45:49.058376400 +0100
 --- to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali      2021-08-04 21:13:23.168882700 +0100
 ***************

resources/patches/nocamerabutton/87202.patch

@@ -1,23 +1,8 @@
-diff --color -crB com.discord-87202-base/smali_classes3/com/lytefast/flexinput/fragment/FlexInputFragment$d.smali com.discord-87202/smali_classes3/com/lytefast/flexinput/fragment/FlexInputFragment$d.smali
+Binary files com.discord-base/build/apk/classes3.dex and com.discord/build/apk/classes3.dex differ
-*** com.discord-87202-base/smali_classes3/com/lytefast/flexinput/fragment/FlexInputFragment$d.smali	2021-08-22 22:08:14.202391194 +0300
+Binary files com.discord-base/dist/com.discord-78204.apk and com.discord/dist/com.discord-78204.apk differ
---- com.discord-87202/smali_classes3/com/lytefast/flexinput/fragment/FlexInputFragment$d.smali	2021-08-22 22:14:01.302308963 +0300
+diff -crB com.discord-base/smali_classes3/com/lytefast/flexinput/fragment/FlexInputFragment$d.smali com.discord/smali_classes3/com/lytefast/flexinput/fragment/FlexInputFragment$d.smali
-***************
+*** com.discord-base/smali_classes3/com/lytefast/flexinput/fragment/FlexInputFragment$d.smali	2021-05-31 14:05:59.000000000 +0300
-*** 183,189 ****
+--- com.discord/smali_classes3/com/lytefast/flexinput/fragment/FlexInputFragment$d.smali	2021-05-31 16:02:21.000000000 +0300
-  
-      if-nez v4, :cond_5
-  
-!     const/4 v9, 0x0
-  
-      goto :goto_0
-  
---- 183,189 ----
-  
-      if-nez v4, :cond_5
-  
-!     const/16 v9, 0x8
-  
-      goto :goto_0
-  
 ***************
 *** 206,212 ****
   
@@ -35,20 +20,3 @@ diff --color -crB com.discord-87202-base/smali_classes3/com/lytefast/flexinput/f
   
       goto :goto_1
   
-***************
-*** 234,240 ****
-      goto :goto_2
-  
-      :cond_7
-!     const/16 v4, 0x8
-  
-      :goto_2
-      invoke-virtual {v5, v4}, Landroid/widget/ImageButton;->setVisibility(I)V
---- 234,240 ----
-      goto :goto_2
-  
-      :cond_7
-!     const/16 v4, 0x0
-  
-      :goto_2
-      invoke-virtual {v5, v4}, Landroid/widget/ImageButton;->setVisibility(I)V

resources/patches/notrack/87202-post.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-mv smali/com/airbnb smali_classes2/com/