Compare commits
38 Commits
2021-05-31
...
2021-05-31
Author | SHA1 | Date |
---|---|---|
ave | 59c76a6506 | |
ave | a8c17e2032 | |
ave | de8cfb9a10 | |
ave | b7aa569435 | |
ave | 7e4c49becc | |
ave | f58c28410d | |
ave | 91c37ab9d0 | |
ave | 166d763792 | |
ave | 0754700d51 | |
ave | c4fd0be029 | |
ave | d139344274 | |
ave | b6f80bbee0 | |
ave | 2786de6c73 | |
ave | de992e86ea | |
ave | 78d5dea649 | |
ave | 7b77ce9eda | |
ave | f1e8382505 | |
ave | d3c51e2bef | |
ave | 4199ef9d22 | |
clienthax | e1e88773ec | |
clienthax | 015c90eb70 | |
clienthax | cdfa005d35 | |
clienthax | c17cb44eaa | |
clienthax | 4de5282bf3 | |
clienthax | a70f7395aa | |
clienthax | 1d0a8b7088 | |
clienthax | 5bd99aa8c3 | |
clienthax | 5cca5ef444 | |
clienthax | 3e0464c796 | |
clienthax | f08854f5d0 | |
clienthax | f8dbc9333c | |
clienthax | 1c6b151083 | |
clienthax | 0359f5f975 | |
clienthax | f709704fce | |
clienthax | ec47b98061 | |
clienthax | 1a7ad17c87 | |
clienthax | 55e2e94b63 | |
clienthax | 8ec2dd75c2 |
|
@ -0,0 +1,2 @@
|
||||||
|
* text=auto eol=lf
|
||||||
|
|
|
@ -1,2 +1,14 @@
|
||||||
patches/*/*-custom.patch
|
patches/*/*-custom.patch
|
||||||
patches/*/*.patch-failed
|
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
|
||||||
|
|
|
@ -0,0 +1,68 @@
|
||||||
|
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
|
||||||
|
RUN apt-get update
|
||||||
|
RUN apt-get -y install fdroidserver
|
||||||
|
|
||||||
|
# Create resources folder for tools/images etc
|
||||||
|
ENV CTC_FOLDER=/opt/ctc
|
||||||
|
RUN mkdir ${CTC_FOLDER}
|
||||||
|
|
||||||
|
# Grab modified apktool
|
||||||
|
RUN mkdir ${CTC_FOLDER}/tools
|
||||||
|
RUN wget -O ${CTC_FOLDER}/tools/apktool.jar https://f001.backblazeb2.com/file/avepub/apktool-cli-all.jar
|
||||||
|
|
||||||
|
# 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
|
||||||
|
ENV EMOJI_BLOBMOJIS_PATH=${EMOJI_PATH}/blobmojis
|
||||||
|
RUN mkdir ${EMOJI_PATH}
|
||||||
|
|
||||||
|
# Mutant emojis
|
||||||
|
RUN mkdir ${EMOJI_MUTANT_PATH}
|
||||||
|
WORKDIR ${EMOJI_MUTANT_PATH}
|
||||||
|
RUN wget https://mutant.lavatech.top/72x72.zip
|
||||||
|
RUN unzip 72x72.zip
|
||||||
|
RUN mv 72x72/*.png .
|
||||||
|
RUN rm -rf 72x72
|
||||||
|
RUN rm 72x72.zip
|
||||||
|
|
||||||
|
# Blobmojis
|
||||||
|
RUN mkdir ${EMOJI_BLOBMOJIS_PATH}
|
||||||
|
RUN mkdir /tmp/blobmoji
|
||||||
|
WORKDIR /tmp/blobmoji
|
||||||
|
RUN wget https://github.com/C1710/blobmoji/archive/refs/heads/main.zip
|
||||||
|
RUN 7za x main.zip
|
||||||
|
WORKDIR /tmp/blobmoji/blobmoji-main/svg
|
||||||
|
RUN find ./*.svg -exec mogrify -format png -resize 72x72 -path ${EMOJI_BLOBMOJIS_PATH} {} \; ; exit 0
|
||||||
|
|
||||||
|
# Generate self signed KS
|
||||||
|
RUN mkdir ${CTC_FOLDER}/keystores
|
||||||
|
WORKDIR ${CTC_FOLDER}/keystores
|
||||||
|
RUN keytool -genkey -alias test \
|
||||||
|
-keyalg RSA -keystore keystore.jks \
|
||||||
|
-dname "CN=Test, OU=Test, O=Test, L=Test, S=Test, C=Test" \
|
||||||
|
-storepass password -keypass password
|
||||||
|
|
||||||
|
# Make folder for git repo
|
||||||
|
RUN mkdir ${CTC_FOLDER}/gitrepo
|
||||||
|
WORKDIR ${CTC_FOLDER}/gitrepo
|
||||||
|
|
||||||
|
# paths in ctcconfig in docker
|
||||||
|
# container fs
|
||||||
|
# /opt/ctc/gitrepo
|
||||||
|
# /opt/ctc/keystores/keystore.jks not specified by default
|
|
@ -2,15 +2,17 @@
|
||||||
|
|
||||||
Modular Client Mod for Discord's Android app.
|
Modular Client Mod for Discord's Android app.
|
||||||
|
|
||||||
**THIS IS A WORK IN PROGRESS BRANCH! THE PATCHES ARE INCOMPLETE!**
|
**THIS IS A WORK IN PROGRESS BRANCH! SOME PATCHES ARE MISSING (tokenlogin, hideunusableemojis, plus showtag has a bug)!**
|
||||||
|
|
||||||
|
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
|
For status updates and support on the project, join #cutthecord on https://libera.chat. WebIRC link: https://web.libera.chat/#cutthecord
|
||||||
|
|
||||||
**Latest supported Discord Android version:** 78.4 - Alpha (78204), released on 2021-05-31.
|
**Latest supported Discord Android version:** 87.2 - Alpha (87202), released on 2021-08-04.
|
||||||
|
|
||||||
New patch development will be done for the latest supported version.
|
New patch development will be done for the latest supported version.
|
||||||
|
|
||||||
![A CutTheCord screenshot](https://elixi.re/t/mh3eirsy9.png)
|
![A CutTheCord screenshot](https://elixi.re/t/m16z287iw.png)
|
||||||
|
|
||||||
Check out [README.md in patches folder to see what patches are available and what each of them do](patches/README.md)!
|
Check out [README.md in patches folder to see what patches are available and what each of them do](patches/README.md)!
|
||||||
|
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
\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
|
|
Before Width: | Height: | Size: 12 KiB |
|
@ -1,2 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
\cp "$1" res/drawable-xxxhdpi/img_loading_logo.png
|
|
|
@ -1 +0,0 @@
|
||||||
{"versionname": "78.4 - Alpha", "versioncode": "78204"}
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
*.apk
|
||||||
|
|
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 48 KiB |
Before Width: | Height: | Size: 578 KiB After Width: | Height: | Size: 578 KiB |
Before Width: | Height: | Size: 638 KiB After Width: | Height: | Size: 638 KiB |
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 44 KiB |
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 8.5 KiB |
Before Width: | Height: | Size: 9.9 KiB After Width: | Height: | Size: 9.9 KiB |
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 44 KiB |
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 4.5 KiB |
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 8.5 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 44 KiB |
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 8.5 KiB |
Before Width: | Height: | Size: 9.9 KiB After Width: | Height: | Size: 9.9 KiB |
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 44 KiB |
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 4.5 KiB |
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 8.5 KiB |
Before Width: | Height: | Size: 9.7 KiB After Width: | Height: | Size: 9.7 KiB |
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 43 KiB After Width: | Height: | Size: 43 KiB |
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 4.5 KiB |
Before Width: | Height: | Size: 112 KiB After Width: | Height: | Size: 112 KiB |
Before Width: | Height: | Size: 63 KiB After Width: | Height: | Size: 63 KiB |
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 48 KiB |
Before Width: | Height: | Size: 578 KiB After Width: | Height: | Size: 578 KiB |
Before Width: | Height: | Size: 56 KiB After Width: | Height: | Size: 56 KiB |
Before Width: | Height: | Size: 591 KiB After Width: | Height: | Size: 591 KiB |
Before Width: | Height: | Size: 51 KiB After Width: | Height: | Size: 51 KiB |
|
@ -11,3 +11,7 @@ Here's why these patches are no longer maintained in this form:
|
||||||
- customdefaultemoji: There doesn't seem to be default emojis anymore?
|
- customdefaultemoji: There doesn't seem to be default emojis anymore?
|
||||||
- noprofilestrip: UI changes removed the profile strip.
|
- noprofilestrip: UI changes removed the profile strip.
|
||||||
- nonearby: Didn't add much anyways.
|
- nonearby: Didn't add much anyways.
|
||||||
|
- squareavatars: Moved to xml-patchs
|
||||||
|
- betterrotation: Moved to xml-patchs
|
||||||
|
- noblocked: Moved to xml-patchs
|
||||||
|
- slashcommands: Moved to dynamic patch due to discord api supporting this now
|
|
@ -0,0 +1,22 @@
|
||||||
|
diff -crB fromAndroidManifest.xml to/AndroidManifest.xml
|
||||||
|
*** fromAndroidManifest.xml 2021-05-31 15:40:24.000000000 +0300
|
||||||
|
--- to/AndroidManifest.xml 2021-05-31 15:40:24.000000000 +0300
|
||||||
|
***************
|
||||||
|
*** 37,44 ****
|
||||||
|
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||||
|
<application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square_canary" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:networkSecurityConfig="@xml/network_security_config" android:roundIcon="@mipmap/ic_logo_round_canary" android:supportsRtl="true" android:theme="@style/AppTheme.Dark">
|
||||||
|
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||||
|
! <activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||||
|
! <activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.intent.action.MAIN"/>
|
||||||
|
<category android:name="android.intent.category.LAUNCHER"/>
|
||||||
|
--- 37,44 ----
|
||||||
|
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||||
|
<application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square_canary" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:networkSecurityConfig="@xml/network_security_config" android:roundIcon="@mipmap/ic_logo_round_canary" android:supportsRtl="true" android:theme="@style/AppTheme.Dark">
|
||||||
|
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||||
|
! <activity android:name="com.discord.app.AppActivity" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||||
|
! <activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.intent.action.MAIN"/>
|
||||||
|
<category android:name="android.intent.category.LAUNCHER"/>
|