Merge pull request '87202 patches' (#127) from clienthax/cutthecord:2021-05-31 into 2021-05-31

Reviewed-on: #127

.gitattributes

@@ -0,0 +1,2 @@
+* text=auto eol=lf
+

.gitignore

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

Dockerfile

@@ -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

README.md

@@ -6,7 +6,7 @@ Modular Client Mod for Discord's Android app.
 
 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.
 

patchport-state.json

@@ -1 +0,0 @@
-{"versionname": "78.4 - Alpha", "versioncode": "78204"}

resources/distok/android/.gitignore

@@ -0,0 +1,2 @@
+*.apk
+

resources/old-patches/README.md

@@ -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?
 - noprofilestrip: UI changes removed the profile strip.
 - 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

resources/old-patches/betterrotation/87202.patch

@@ -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"/>