diff --git a/README.md b/README.md index 3d65e8953..59c6e2a99 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Modular Client Mod for Discord's Android app. -**Latest supported Discord Android version:** 10.2.9 (1029), released on 2020-01-28. +**Latest supported Discord Android version:** 9.9.2 (992), released on 2019-11-26. New patch development will be done for the latest supported version. diff --git a/ctcci/ctcci.py b/ctcci/ctcci.py index e69296f86..b2c2c5cf6 100644 --- a/ctcci/ctcci.py +++ b/ctcci/ctcci.py @@ -2,7 +2,6 @@ import os import sys import shutil -import requests import json import subprocess from ctcconfig import * @@ -232,9 +231,9 @@ APK_PATH = os.path.join(WORK_FOLDER, "discord", # Sign the APK if DO_APKSIGNER: - subprocess.run(f"apksigner sign --ks {KEYSTORE_FILE} " + subprocess.run(f"apksigner sign --ks {KEYSTORE_FILE}" f"--ks-key-alias {KEYSTORE_ALIAS} " - f"--ks-pass pass:{KEYSTORE_PASS} " + f"--ks-pass pass:{KEYSTORE_PASS}" f"{APK_PATH}", shell=True, cwd=WORK_FOLDER) diff --git a/old-patches/README.md b/old-patches/README.md index bd297791c..bd6a6c3da 100644 --- a/old-patches/README.md +++ b/old-patches/README.md @@ -7,5 +7,3 @@ Here's why these patches are no longer maintained in this form: - notyping: Moved into slashcommands as a slash command - pureevil: It's now upstream (yay.) - compact: It's just a pain to maintain. -- smalltime: It's just a pain to maintain. -- customdefaultemoji: There doesn't seem to be default emojis anymore? diff --git a/old-patches/customdefaultemoji/1006.patch b/old-patches/customdefaultemoji/1006.patch deleted file mode 100644 index 242a1ad5f..000000000 --- a/old-patches/customdefaultemoji/1006.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -crB com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali com.discord-992/smali/com/discord/stores/StoreEmoji.smali -*** com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 10:48:46.036158964 +0300 ---- com.discord-992/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 12:08:01.403160008 +0300 -*************** -*** 97,113 **** - - sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion; - -! const-string v2, "thinking" - -! const-string v3, "ok_hand" - -! const-string v4, "eyes" - -! const-string v5, "sweat_drops" - -! const-string v6, "joy" - -! const-string v7, "pig" - - .line 350 - filled-new-array/range {v2 .. v7}, [Ljava/lang/String; ---- 97,113 ---- - - sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion; - -! const-string v2, "star" - -! const-string v3, "thinking" - -! const-string v4, "ok_hand" - -! const-string v5, "eyes" - -! const-string v6, "sweat_drops" - -! const-string v7, "joy" - - .line 350 - filled-new-array/range {v2 .. v7}, [Ljava/lang/String; -Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.orig -Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.rej - diff --git a/old-patches/customdefaultemoji/1007.patch b/old-patches/customdefaultemoji/1007.patch deleted file mode 100644 index 242a1ad5f..000000000 --- a/old-patches/customdefaultemoji/1007.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -crB com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali com.discord-992/smali/com/discord/stores/StoreEmoji.smali -*** com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 10:48:46.036158964 +0300 ---- com.discord-992/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 12:08:01.403160008 +0300 -*************** -*** 97,113 **** - - sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion; - -! const-string v2, "thinking" - -! const-string v3, "ok_hand" - -! const-string v4, "eyes" - -! const-string v5, "sweat_drops" - -! const-string v6, "joy" - -! const-string v7, "pig" - - .line 350 - filled-new-array/range {v2 .. v7}, [Ljava/lang/String; ---- 97,113 ---- - - sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion; - -! const-string v2, "star" - -! const-string v3, "thinking" - -! const-string v4, "ok_hand" - -! const-string v5, "eyes" - -! const-string v6, "sweat_drops" - -! const-string v7, "joy" - - .line 350 - filled-new-array/range {v2 .. v7}, [Ljava/lang/String; -Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.orig -Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.rej - diff --git a/old-patches/customdefaultemoji/1011.patch b/old-patches/customdefaultemoji/1011.patch deleted file mode 100644 index 242a1ad5f..000000000 --- a/old-patches/customdefaultemoji/1011.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -crB com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali com.discord-992/smali/com/discord/stores/StoreEmoji.smali -*** com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 10:48:46.036158964 +0300 ---- com.discord-992/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 12:08:01.403160008 +0300 -*************** -*** 97,113 **** - - sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion; - -! const-string v2, "thinking" - -! const-string v3, "ok_hand" - -! const-string v4, "eyes" - -! const-string v5, "sweat_drops" - -! const-string v6, "joy" - -! const-string v7, "pig" - - .line 350 - filled-new-array/range {v2 .. v7}, [Ljava/lang/String; ---- 97,113 ---- - - sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion; - -! const-string v2, "star" - -! const-string v3, "thinking" - -! const-string v4, "ok_hand" - -! const-string v5, "eyes" - -! const-string v6, "sweat_drops" - -! const-string v7, "joy" - - .line 350 - filled-new-array/range {v2 .. v7}, [Ljava/lang/String; -Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.orig -Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.rej - diff --git a/old-patches/customdefaultemoji/1012.patch b/old-patches/customdefaultemoji/1012.patch deleted file mode 100644 index 242a1ad5f..000000000 --- a/old-patches/customdefaultemoji/1012.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -crB com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali com.discord-992/smali/com/discord/stores/StoreEmoji.smali -*** com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 10:48:46.036158964 +0300 ---- com.discord-992/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 12:08:01.403160008 +0300 -*************** -*** 97,113 **** - - sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion; - -! const-string v2, "thinking" - -! const-string v3, "ok_hand" - -! const-string v4, "eyes" - -! const-string v5, "sweat_drops" - -! const-string v6, "joy" - -! const-string v7, "pig" - - .line 350 - filled-new-array/range {v2 .. v7}, [Ljava/lang/String; ---- 97,113 ---- - - sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion; - -! const-string v2, "star" - -! const-string v3, "thinking" - -! const-string v4, "ok_hand" - -! const-string v5, "eyes" - -! const-string v6, "sweat_drops" - -! const-string v7, "joy" - - .line 350 - filled-new-array/range {v2 .. v7}, [Ljava/lang/String; -Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.orig -Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.rej - diff --git a/old-patches/customdefaultemoji/1013.patch-failed b/old-patches/customdefaultemoji/1013.patch-failed deleted file mode 100644 index 242a1ad5f..000000000 --- a/old-patches/customdefaultemoji/1013.patch-failed +++ /dev/null @@ -1,43 +0,0 @@ -diff -crB com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali com.discord-992/smali/com/discord/stores/StoreEmoji.smali -*** com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 10:48:46.036158964 +0300 ---- com.discord-992/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 12:08:01.403160008 +0300 -*************** -*** 97,113 **** - - sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion; - -! const-string v2, "thinking" - -! const-string v3, "ok_hand" - -! const-string v4, "eyes" - -! const-string v5, "sweat_drops" - -! const-string v6, "joy" - -! const-string v7, "pig" - - .line 350 - filled-new-array/range {v2 .. v7}, [Ljava/lang/String; ---- 97,113 ---- - - sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion; - -! const-string v2, "star" - -! const-string v3, "thinking" - -! const-string v4, "ok_hand" - -! const-string v5, "eyes" - -! const-string v6, "sweat_drops" - -! const-string v7, "joy" - - .line 350 - filled-new-array/range {v2 .. v7}, [Ljava/lang/String; -Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.orig -Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.rej - diff --git a/old-patches/customdefaultemoji/991.patch-failed b/old-patches/customdefaultemoji/991.patch-failed deleted file mode 100644 index eed3df5e8..000000000 --- a/old-patches/customdefaultemoji/991.patch-failed +++ /dev/null @@ -1,80 +0,0 @@ -diff -crB from/smali/com/discord/stores/StoreEmoji.smali to/smali/com/discord/stores/StoreEmoji.smali -*** from/smali/com/discord/stores/StoreEmoji.smali 2019-11-14 22:32:21.079850865 +0300 ---- to/smali/com/discord/stores/StoreEmoji.smali 2019-11-14 22:33:18.846833515 +0300 -*************** -*** 103,139 **** - - const/4 v1, 0x0 - -! const-string v2, "thinking" - - aput-object v2, v0, v1 - - const/4 v1, 0x1 - -! const-string v2, "ok_hand" - - aput-object v2, v0, v1 - - const/4 v1, 0x2 - -! const-string v2, "eyes" - - aput-object v2, v0, v1 - - const/4 v1, 0x3 - -! const-string v2, "sweat_drops" - - aput-object v2, v0, v1 - - const/4 v1, 0x4 - -! const-string v2, "joy" - - aput-object v2, v0, v1 - - const/4 v1, 0x5 - -! const-string v2, "pig" - - aput-object v2, v0, v1 - ---- 103,139 ---- - - const/4 v1, 0x0 - -! const-string v2, "star" - - aput-object v2, v0, v1 - - const/4 v1, 0x1 - -! const-string v2, "thinking" - - aput-object v2, v0, v1 - - const/4 v1, 0x2 - -! const-string v2, "ok_hand" - - aput-object v2, v0, v1 - - const/4 v1, 0x3 - -! const-string v2, "eyes" - - aput-object v2, v0, v1 - - const/4 v1, 0x4 - -! const-string v2, "sweat_drops" - - aput-object v2, v0, v1 - - const/4 v1, 0x5 - -! const-string v2, "joy" - - aput-object v2, v0, v1 - diff --git a/old-patches/customdefaultemoji/993.patch b/old-patches/customdefaultemoji/993.patch deleted file mode 100644 index 242a1ad5f..000000000 --- a/old-patches/customdefaultemoji/993.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -crB com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali com.discord-992/smali/com/discord/stores/StoreEmoji.smali -*** com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 10:48:46.036158964 +0300 ---- com.discord-992/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 12:08:01.403160008 +0300 -*************** -*** 97,113 **** - - sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion; - -! const-string v2, "thinking" - -! const-string v3, "ok_hand" - -! const-string v4, "eyes" - -! const-string v5, "sweat_drops" - -! const-string v6, "joy" - -! const-string v7, "pig" - - .line 350 - filled-new-array/range {v2 .. v7}, [Ljava/lang/String; ---- 97,113 ---- - - sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion; - -! const-string v2, "star" - -! const-string v3, "thinking" - -! const-string v4, "ok_hand" - -! const-string v5, "eyes" - -! const-string v6, "sweat_drops" - -! const-string v7, "joy" - - .line 350 - filled-new-array/range {v2 .. v7}, [Ljava/lang/String; -Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.orig -Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.rej - diff --git a/old-patches/customdefaultemoji/994.patch b/old-patches/customdefaultemoji/994.patch deleted file mode 100644 index 242a1ad5f..000000000 --- a/old-patches/customdefaultemoji/994.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -crB com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali com.discord-992/smali/com/discord/stores/StoreEmoji.smali -*** com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 10:48:46.036158964 +0300 ---- com.discord-992/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 12:08:01.403160008 +0300 -*************** -*** 97,113 **** - - sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion; - -! const-string v2, "thinking" - -! const-string v3, "ok_hand" - -! const-string v4, "eyes" - -! const-string v5, "sweat_drops" - -! const-string v6, "joy" - -! const-string v7, "pig" - - .line 350 - filled-new-array/range {v2 .. v7}, [Ljava/lang/String; ---- 97,113 ---- - - sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion; - -! const-string v2, "star" - -! const-string v3, "thinking" - -! const-string v4, "ok_hand" - -! const-string v5, "eyes" - -! const-string v6, "sweat_drops" - -! const-string v7, "joy" - - .line 350 - filled-new-array/range {v2 .. v7}, [Ljava/lang/String; -Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.orig -Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.rej - diff --git a/old-patches/customdefaultemoji/996.patch b/old-patches/customdefaultemoji/996.patch deleted file mode 100644 index 242a1ad5f..000000000 --- a/old-patches/customdefaultemoji/996.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -crB com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali com.discord-992/smali/com/discord/stores/StoreEmoji.smali -*** com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 10:48:46.036158964 +0300 ---- com.discord-992/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 12:08:01.403160008 +0300 -*************** -*** 97,113 **** - - sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion; - -! const-string v2, "thinking" - -! const-string v3, "ok_hand" - -! const-string v4, "eyes" - -! const-string v5, "sweat_drops" - -! const-string v6, "joy" - -! const-string v7, "pig" - - .line 350 - filled-new-array/range {v2 .. v7}, [Ljava/lang/String; ---- 97,113 ---- - - sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion; - -! const-string v2, "star" - -! const-string v3, "thinking" - -! const-string v4, "ok_hand" - -! const-string v5, "eyes" - -! const-string v6, "sweat_drops" - -! const-string v7, "joy" - - .line 350 - filled-new-array/range {v2 .. v7}, [Ljava/lang/String; -Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.orig -Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.rej - diff --git a/old-patches/smalltime/1006.patch-failed b/old-patches/smalltime/1006.patch-failed deleted file mode 100644 index 417c8d6c7..000000000 --- a/old-patches/smalltime/1006.patch-failed +++ /dev/null @@ -1,190 +0,0 @@ -diff -crB from/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali to/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali -*** from/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali 2019-05-12 12:13:48.187878981 +0300 ---- to/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali 2019-05-12 12:15:32.663889927 +0300 -*************** -*** 239,411 **** - .end method - - .method public toReadableTimeString(Ljava/lang/Long;)Ljava/lang/String; -! .locals 6 -! -! .line 126 -! invoke-virtual {p0}, Lcom/miguelgaeta/simple_time/SimpleTime;->currentTimeMillis()J -! -! move-result-wide v0 -! -! invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; -! -! move-result-object v0 -! -! invoke-virtual {p0, v0}, Lcom/miguelgaeta/simple_time/SimpleTime;->toCalendar(Ljava/lang/Long;)Ljava/util/Calendar; -! -! move-result-object v0 -! -! const/4 v1, 0x0 -! -! const/16 v2, 0xb -! -! .line 128 -! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V -! -! const/16 v2, 0xc -! -! .line 129 -! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V -! -! const/16 v2, 0xd -! -! .line 130 -! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V -! -! const/16 v2, 0xe -! -! .line 131 -! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V -! -! .line 133 -! iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->locale:Ljava/util/Locale; -! -! invoke-virtual {v1}, Ljava/util/Locale;->getLanguage()Ljava/lang/String; -! -! move-result-object v1 -! -! const-string v2, "en" -! -! invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z -! -! move-result v1 -! -! if-nez v1, :cond_1 -! -! .line 136 -! invoke-virtual {p1}, Ljava/lang/Long;->longValue()J -! -! move-result-wide v1 -! -! invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J -! -! move-result-wide v3 -! -! cmp-long v0, v1, v3 -! -! if-lez v0, :cond_0 -! -! .line 137 - iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat; - - invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; - -- move-result-object p1 -- -- return-object p1 -- -- .line 139 -- :cond_0 -- iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterDateTime:Ljava/text/DateFormat; -- -- invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; -- -- move-result-object p1 -- -- return-object p1 -- -- .line 143 -- :cond_1 -- invoke-virtual {p1}, Ljava/lang/Long;->longValue()J -- -- move-result-wide v1 -- -- invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J -- -- move-result-wide v3 -- -- cmp-long v5, v1, v3 -- -- if-lez v5, :cond_2 -- -- .line 144 -- new-instance v0, Ljava/lang/StringBuilder; -- -- const-string v1, "Today at " -- -- invoke-direct {v0, v1}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V -- -- iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat; -- -- invoke-virtual {v1, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; -- -- move-result-object p1 -- -- invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; -- -- invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; -- -- move-result-object p1 -- -- return-object p1 -- -- :cond_2 -- const/4 v1, 0x5 -- -- const/4 v2, -0x1 -- -- .line 147 -- invoke-virtual {v0, v1, v2}, Ljava/util/Calendar;->add(II)V -- -- .line 149 -- invoke-virtual {p1}, Ljava/lang/Long;->longValue()J -- -- move-result-wide v1 -- -- invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J -- -- move-result-wide v3 -- -- cmp-long v0, v1, v3 -- -- if-lez v0, :cond_3 -- -- .line 150 -- new-instance v0, Ljava/lang/StringBuilder; -- -- const-string v1, "Yesterday at " -- -- invoke-direct {v0, v1}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V -- -- iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat; -- -- invoke-virtual {v1, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; -- -- move-result-object p1 -- -- invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; -- -- invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; -- -- move-result-object p1 -- -- return-object p1 -- -- .line 153 -- :cond_3 -- iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterDateTime:Ljava/text/DateFormat; -- -- invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; -- - move-result-object p1 - - return-object p1 ---- 239,249 ---- - .end method - - .method public toReadableTimeString(Ljava/lang/Long;)Ljava/lang/String; -! .locals 1 - iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat; - - invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; - - move-result-object p1 - - return-object p1 diff --git a/old-patches/smalltime/993.patch b/old-patches/smalltime/993.patch deleted file mode 100644 index 417c8d6c7..000000000 --- a/old-patches/smalltime/993.patch +++ /dev/null @@ -1,190 +0,0 @@ -diff -crB from/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali to/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali -*** from/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali 2019-05-12 12:13:48.187878981 +0300 ---- to/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali 2019-05-12 12:15:32.663889927 +0300 -*************** -*** 239,411 **** - .end method - - .method public toReadableTimeString(Ljava/lang/Long;)Ljava/lang/String; -! .locals 6 -! -! .line 126 -! invoke-virtual {p0}, Lcom/miguelgaeta/simple_time/SimpleTime;->currentTimeMillis()J -! -! move-result-wide v0 -! -! invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; -! -! move-result-object v0 -! -! invoke-virtual {p0, v0}, Lcom/miguelgaeta/simple_time/SimpleTime;->toCalendar(Ljava/lang/Long;)Ljava/util/Calendar; -! -! move-result-object v0 -! -! const/4 v1, 0x0 -! -! const/16 v2, 0xb -! -! .line 128 -! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V -! -! const/16 v2, 0xc -! -! .line 129 -! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V -! -! const/16 v2, 0xd -! -! .line 130 -! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V -! -! const/16 v2, 0xe -! -! .line 131 -! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V -! -! .line 133 -! iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->locale:Ljava/util/Locale; -! -! invoke-virtual {v1}, Ljava/util/Locale;->getLanguage()Ljava/lang/String; -! -! move-result-object v1 -! -! const-string v2, "en" -! -! invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z -! -! move-result v1 -! -! if-nez v1, :cond_1 -! -! .line 136 -! invoke-virtual {p1}, Ljava/lang/Long;->longValue()J -! -! move-result-wide v1 -! -! invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J -! -! move-result-wide v3 -! -! cmp-long v0, v1, v3 -! -! if-lez v0, :cond_0 -! -! .line 137 - iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat; - - invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; - -- move-result-object p1 -- -- return-object p1 -- -- .line 139 -- :cond_0 -- iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterDateTime:Ljava/text/DateFormat; -- -- invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; -- -- move-result-object p1 -- -- return-object p1 -- -- .line 143 -- :cond_1 -- invoke-virtual {p1}, Ljava/lang/Long;->longValue()J -- -- move-result-wide v1 -- -- invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J -- -- move-result-wide v3 -- -- cmp-long v5, v1, v3 -- -- if-lez v5, :cond_2 -- -- .line 144 -- new-instance v0, Ljava/lang/StringBuilder; -- -- const-string v1, "Today at " -- -- invoke-direct {v0, v1}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V -- -- iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat; -- -- invoke-virtual {v1, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; -- -- move-result-object p1 -- -- invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; -- -- invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; -- -- move-result-object p1 -- -- return-object p1 -- -- :cond_2 -- const/4 v1, 0x5 -- -- const/4 v2, -0x1 -- -- .line 147 -- invoke-virtual {v0, v1, v2}, Ljava/util/Calendar;->add(II)V -- -- .line 149 -- invoke-virtual {p1}, Ljava/lang/Long;->longValue()J -- -- move-result-wide v1 -- -- invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J -- -- move-result-wide v3 -- -- cmp-long v0, v1, v3 -- -- if-lez v0, :cond_3 -- -- .line 150 -- new-instance v0, Ljava/lang/StringBuilder; -- -- const-string v1, "Yesterday at " -- -- invoke-direct {v0, v1}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V -- -- iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat; -- -- invoke-virtual {v1, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; -- -- move-result-object p1 -- -- invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; -- -- invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; -- -- move-result-object p1 -- -- return-object p1 -- -- .line 153 -- :cond_3 -- iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterDateTime:Ljava/text/DateFormat; -- -- invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; -- - move-result-object p1 - - return-object p1 ---- 239,249 ---- - .end method - - .method public toReadableTimeString(Ljava/lang/Long;)Ljava/lang/String; -! .locals 1 - iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat; - - invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; - - move-result-object p1 - - return-object p1 diff --git a/old-patches/smalltime/994.patch b/old-patches/smalltime/994.patch deleted file mode 100644 index 417c8d6c7..000000000 --- a/old-patches/smalltime/994.patch +++ /dev/null @@ -1,190 +0,0 @@ -diff -crB from/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali to/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali -*** from/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali 2019-05-12 12:13:48.187878981 +0300 ---- to/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali 2019-05-12 12:15:32.663889927 +0300 -*************** -*** 239,411 **** - .end method - - .method public toReadableTimeString(Ljava/lang/Long;)Ljava/lang/String; -! .locals 6 -! -! .line 126 -! invoke-virtual {p0}, Lcom/miguelgaeta/simple_time/SimpleTime;->currentTimeMillis()J -! -! move-result-wide v0 -! -! invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; -! -! move-result-object v0 -! -! invoke-virtual {p0, v0}, Lcom/miguelgaeta/simple_time/SimpleTime;->toCalendar(Ljava/lang/Long;)Ljava/util/Calendar; -! -! move-result-object v0 -! -! const/4 v1, 0x0 -! -! const/16 v2, 0xb -! -! .line 128 -! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V -! -! const/16 v2, 0xc -! -! .line 129 -! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V -! -! const/16 v2, 0xd -! -! .line 130 -! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V -! -! const/16 v2, 0xe -! -! .line 131 -! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V -! -! .line 133 -! iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->locale:Ljava/util/Locale; -! -! invoke-virtual {v1}, Ljava/util/Locale;->getLanguage()Ljava/lang/String; -! -! move-result-object v1 -! -! const-string v2, "en" -! -! invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z -! -! move-result v1 -! -! if-nez v1, :cond_1 -! -! .line 136 -! invoke-virtual {p1}, Ljava/lang/Long;->longValue()J -! -! move-result-wide v1 -! -! invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J -! -! move-result-wide v3 -! -! cmp-long v0, v1, v3 -! -! if-lez v0, :cond_0 -! -! .line 137 - iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat; - - invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; - -- move-result-object p1 -- -- return-object p1 -- -- .line 139 -- :cond_0 -- iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterDateTime:Ljava/text/DateFormat; -- -- invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; -- -- move-result-object p1 -- -- return-object p1 -- -- .line 143 -- :cond_1 -- invoke-virtual {p1}, Ljava/lang/Long;->longValue()J -- -- move-result-wide v1 -- -- invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J -- -- move-result-wide v3 -- -- cmp-long v5, v1, v3 -- -- if-lez v5, :cond_2 -- -- .line 144 -- new-instance v0, Ljava/lang/StringBuilder; -- -- const-string v1, "Today at " -- -- invoke-direct {v0, v1}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V -- -- iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat; -- -- invoke-virtual {v1, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; -- -- move-result-object p1 -- -- invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; -- -- invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; -- -- move-result-object p1 -- -- return-object p1 -- -- :cond_2 -- const/4 v1, 0x5 -- -- const/4 v2, -0x1 -- -- .line 147 -- invoke-virtual {v0, v1, v2}, Ljava/util/Calendar;->add(II)V -- -- .line 149 -- invoke-virtual {p1}, Ljava/lang/Long;->longValue()J -- -- move-result-wide v1 -- -- invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J -- -- move-result-wide v3 -- -- cmp-long v0, v1, v3 -- -- if-lez v0, :cond_3 -- -- .line 150 -- new-instance v0, Ljava/lang/StringBuilder; -- -- const-string v1, "Yesterday at " -- -- invoke-direct {v0, v1}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V -- -- iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat; -- -- invoke-virtual {v1, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; -- -- move-result-object p1 -- -- invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; -- -- invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; -- -- move-result-object p1 -- -- return-object p1 -- -- .line 153 -- :cond_3 -- iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterDateTime:Ljava/text/DateFormat; -- -- invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; -- - move-result-object p1 - - return-object p1 ---- 239,249 ---- - .end method - - .method public toReadableTimeString(Ljava/lang/Long;)Ljava/lang/String; -! .locals 1 - iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat; - - invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; - - move-result-object p1 - - return-object p1 diff --git a/old-patches/smalltime/996.patch b/old-patches/smalltime/996.patch deleted file mode 100644 index 417c8d6c7..000000000 --- a/old-patches/smalltime/996.patch +++ /dev/null @@ -1,190 +0,0 @@ -diff -crB from/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali to/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali -*** from/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali 2019-05-12 12:13:48.187878981 +0300 ---- to/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali 2019-05-12 12:15:32.663889927 +0300 -*************** -*** 239,411 **** - .end method - - .method public toReadableTimeString(Ljava/lang/Long;)Ljava/lang/String; -! .locals 6 -! -! .line 126 -! invoke-virtual {p0}, Lcom/miguelgaeta/simple_time/SimpleTime;->currentTimeMillis()J -! -! move-result-wide v0 -! -! invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; -! -! move-result-object v0 -! -! invoke-virtual {p0, v0}, Lcom/miguelgaeta/simple_time/SimpleTime;->toCalendar(Ljava/lang/Long;)Ljava/util/Calendar; -! -! move-result-object v0 -! -! const/4 v1, 0x0 -! -! const/16 v2, 0xb -! -! .line 128 -! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V -! -! const/16 v2, 0xc -! -! .line 129 -! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V -! -! const/16 v2, 0xd -! -! .line 130 -! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V -! -! const/16 v2, 0xe -! -! .line 131 -! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V -! -! .line 133 -! iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->locale:Ljava/util/Locale; -! -! invoke-virtual {v1}, Ljava/util/Locale;->getLanguage()Ljava/lang/String; -! -! move-result-object v1 -! -! const-string v2, "en" -! -! invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z -! -! move-result v1 -! -! if-nez v1, :cond_1 -! -! .line 136 -! invoke-virtual {p1}, Ljava/lang/Long;->longValue()J -! -! move-result-wide v1 -! -! invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J -! -! move-result-wide v3 -! -! cmp-long v0, v1, v3 -! -! if-lez v0, :cond_0 -! -! .line 137 - iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat; - - invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; - -- move-result-object p1 -- -- return-object p1 -- -- .line 139 -- :cond_0 -- iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterDateTime:Ljava/text/DateFormat; -- -- invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; -- -- move-result-object p1 -- -- return-object p1 -- -- .line 143 -- :cond_1 -- invoke-virtual {p1}, Ljava/lang/Long;->longValue()J -- -- move-result-wide v1 -- -- invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J -- -- move-result-wide v3 -- -- cmp-long v5, v1, v3 -- -- if-lez v5, :cond_2 -- -- .line 144 -- new-instance v0, Ljava/lang/StringBuilder; -- -- const-string v1, "Today at " -- -- invoke-direct {v0, v1}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V -- -- iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat; -- -- invoke-virtual {v1, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; -- -- move-result-object p1 -- -- invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; -- -- invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; -- -- move-result-object p1 -- -- return-object p1 -- -- :cond_2 -- const/4 v1, 0x5 -- -- const/4 v2, -0x1 -- -- .line 147 -- invoke-virtual {v0, v1, v2}, Ljava/util/Calendar;->add(II)V -- -- .line 149 -- invoke-virtual {p1}, Ljava/lang/Long;->longValue()J -- -- move-result-wide v1 -- -- invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J -- -- move-result-wide v3 -- -- cmp-long v0, v1, v3 -- -- if-lez v0, :cond_3 -- -- .line 150 -- new-instance v0, Ljava/lang/StringBuilder; -- -- const-string v1, "Yesterday at " -- -- invoke-direct {v0, v1}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V -- -- iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat; -- -- invoke-virtual {v1, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; -- -- move-result-object p1 -- -- invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; -- -- invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; -- -- move-result-object p1 -- -- return-object p1 -- -- .line 153 -- :cond_3 -- iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterDateTime:Ljava/text/DateFormat; -- -- invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; -- - move-result-object p1 - - return-object p1 ---- 239,249 ---- - .end method - - .method public toReadableTimeString(Ljava/lang/Long;)Ljava/lang/String; -! .locals 1 - iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat; - - invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; - - move-result-object p1 - - return-object p1 diff --git a/old-patches/smalltime/998.patch-failed b/old-patches/smalltime/998.patch-failed deleted file mode 100644 index 417c8d6c7..000000000 --- a/old-patches/smalltime/998.patch-failed +++ /dev/null @@ -1,190 +0,0 @@ -diff -crB from/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali to/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali -*** from/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali 2019-05-12 12:13:48.187878981 +0300 ---- to/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali 2019-05-12 12:15:32.663889927 +0300 -*************** -*** 239,411 **** - .end method - - .method public toReadableTimeString(Ljava/lang/Long;)Ljava/lang/String; -! .locals 6 -! -! .line 126 -! invoke-virtual {p0}, Lcom/miguelgaeta/simple_time/SimpleTime;->currentTimeMillis()J -! -! move-result-wide v0 -! -! invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; -! -! move-result-object v0 -! -! invoke-virtual {p0, v0}, Lcom/miguelgaeta/simple_time/SimpleTime;->toCalendar(Ljava/lang/Long;)Ljava/util/Calendar; -! -! move-result-object v0 -! -! const/4 v1, 0x0 -! -! const/16 v2, 0xb -! -! .line 128 -! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V -! -! const/16 v2, 0xc -! -! .line 129 -! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V -! -! const/16 v2, 0xd -! -! .line 130 -! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V -! -! const/16 v2, 0xe -! -! .line 131 -! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V -! -! .line 133 -! iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->locale:Ljava/util/Locale; -! -! invoke-virtual {v1}, Ljava/util/Locale;->getLanguage()Ljava/lang/String; -! -! move-result-object v1 -! -! const-string v2, "en" -! -! invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z -! -! move-result v1 -! -! if-nez v1, :cond_1 -! -! .line 136 -! invoke-virtual {p1}, Ljava/lang/Long;->longValue()J -! -! move-result-wide v1 -! -! invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J -! -! move-result-wide v3 -! -! cmp-long v0, v1, v3 -! -! if-lez v0, :cond_0 -! -! .line 137 - iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat; - - invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; - -- move-result-object p1 -- -- return-object p1 -- -- .line 139 -- :cond_0 -- iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterDateTime:Ljava/text/DateFormat; -- -- invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; -- -- move-result-object p1 -- -- return-object p1 -- -- .line 143 -- :cond_1 -- invoke-virtual {p1}, Ljava/lang/Long;->longValue()J -- -- move-result-wide v1 -- -- invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J -- -- move-result-wide v3 -- -- cmp-long v5, v1, v3 -- -- if-lez v5, :cond_2 -- -- .line 144 -- new-instance v0, Ljava/lang/StringBuilder; -- -- const-string v1, "Today at " -- -- invoke-direct {v0, v1}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V -- -- iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat; -- -- invoke-virtual {v1, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; -- -- move-result-object p1 -- -- invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; -- -- invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; -- -- move-result-object p1 -- -- return-object p1 -- -- :cond_2 -- const/4 v1, 0x5 -- -- const/4 v2, -0x1 -- -- .line 147 -- invoke-virtual {v0, v1, v2}, Ljava/util/Calendar;->add(II)V -- -- .line 149 -- invoke-virtual {p1}, Ljava/lang/Long;->longValue()J -- -- move-result-wide v1 -- -- invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J -- -- move-result-wide v3 -- -- cmp-long v0, v1, v3 -- -- if-lez v0, :cond_3 -- -- .line 150 -- new-instance v0, Ljava/lang/StringBuilder; -- -- const-string v1, "Yesterday at " -- -- invoke-direct {v0, v1}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V -- -- iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat; -- -- invoke-virtual {v1, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; -- -- move-result-object p1 -- -- invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; -- -- invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; -- -- move-result-object p1 -- -- return-object p1 -- -- .line 153 -- :cond_3 -- iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterDateTime:Ljava/text/DateFormat; -- -- invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; -- - move-result-object p1 - - return-object p1 ---- 239,249 ---- - .end method - - .method public toReadableTimeString(Ljava/lang/Long;)Ljava/lang/String; -! .locals 1 - iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat; - - invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String; - - move-result-object p1 - - return-object p1 diff --git a/patches/bettertm/bettertm.sh b/patches/bettertm/bettertm.sh index d53eff9a4..3c1284813 100644 --- a/patches/bettertm/bettertm.sh +++ b/patches/bettertm/bettertm.sh @@ -1,3 +1,3 @@ #!/bin/bash -\cp "$1/emoji_2122_fe0f.png" res/raw/ -\cp "$1/emoji_ae_fe0f.png" res/raw/ +\cp "$1/emoji_2122.png" res/raw/ +\cp "$1/emoji_ae.png" res/raw/ diff --git a/patches/bettertm/emoji_2122_fe0f.png b/patches/bettertm/emoji_2122.png similarity index 100% rename from patches/bettertm/emoji_2122_fe0f.png rename to patches/bettertm/emoji_2122.png diff --git a/patches/bettertm/emoji_2122_fe0f.xcf b/patches/bettertm/emoji_2122.xcf similarity index 100% rename from patches/bettertm/emoji_2122_fe0f.xcf rename to patches/bettertm/emoji_2122.xcf diff --git a/patches/bettertm/emoji_ae_fe0f.png b/patches/bettertm/emoji_ae.png similarity index 100% rename from patches/bettertm/emoji_ae_fe0f.png rename to patches/bettertm/emoji_ae.png diff --git a/patches/bettertm/emoji_ae_fe0f.xcf b/patches/bettertm/emoji_ae.xcf similarity index 100% rename from patches/bettertm/emoji_ae_fe0f.xcf rename to patches/bettertm/emoji_ae.xcf diff --git a/patches/bettertmlight/emoji_2122_fe0f.png b/patches/bettertmlight/emoji_2122.png similarity index 100% rename from patches/bettertmlight/emoji_2122_fe0f.png rename to patches/bettertmlight/emoji_2122.png diff --git a/patches/bettertmlight/emoji_2122_fe0f.xcf b/patches/bettertmlight/emoji_2122.xcf similarity index 100% rename from patches/bettertmlight/emoji_2122_fe0f.xcf rename to patches/bettertmlight/emoji_2122.xcf diff --git a/patches/bettertmlight/emoji_ae_fe0f.png b/patches/bettertmlight/emoji_ae.png similarity index 100% rename from patches/bettertmlight/emoji_ae_fe0f.png rename to patches/bettertmlight/emoji_ae.png diff --git a/patches/bettertmlight/emoji_ae_fe0f.xcf b/patches/bettertmlight/emoji_ae.xcf similarity index 100% rename from patches/bettertmlight/emoji_ae_fe0f.xcf rename to patches/bettertmlight/emoji_ae.xcf diff --git a/patches/branding/1006.patch b/patches/branding/1006.patch deleted file mode 100644 index d97642906..000000000 --- a/patches/branding/1006.patch +++ /dev/null @@ -1,224 +0,0 @@ -diff -crB com.discord-1006-base/AndroidManifest.xml com.discord-1006/AndroidManifest.xml -*** com.discord-1006-base/AndroidManifest.xml 2019-12-13 11:13:00.644825664 +0300 ---- com.discord-1006/AndroidManifest.xml 2019-12-13 12:51:55.270389347 +0300 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 19,31 **** - - - -! - - - - - -! - - - ---- 19,31 ---- - - - -! - - - - - -! - - - -*************** -*** 88,94 **** - - - -! - - - ---- 88,94 ---- - - - -! - - - -*************** -*** 118,124 **** - - - -! - - - ---- 118,124 ---- - - - -! - - - -*************** -*** 148,154 **** - - - -! - - - ---- 148,154 ---- - - - -! - - - -*************** -*** 158,164 **** - - - -! - - - ---- 158,164 ---- - - - -! - - - -*************** -*** 198,206 **** - - - -! -! -! - - -! -\ No newline at end of file ---- 198,206 ---- - - - -! -! -! - - -! -diff -crB com.discord-1006-base/apktool.yml com.discord-1006/apktool.yml -*** com.discord-1006-base/apktool.yml 2019-12-13 11:10:59.767472683 +0300 ---- com.discord-1006/apktool.yml 2019-12-13 12:51:42.946967805 +0300 -*************** -*** 184,188 **** - tag: null - version: 2.4.1-197d46-SNAPSHOT - versionInfo: -! versionCode: '1006' -! versionName: 10.0.6 ---- 184,188 ---- - tag: null - version: 2.4.1-197d46-SNAPSHOT - versionInfo: -! versionCode: '1006CTCBUILD' -! versionName: 10.0.6-cutthecord-CTCBUILD -diff -crB com.discord-1006-base/res/values/strings.xml com.discord-1006/res/values/strings.xml -*** com.discord-1006-base/res/values/strings.xml 2019-12-13 11:10:55.310779623 +0300 ---- com.discord-1006/res/values/strings.xml 2019-12-13 12:51:42.953634519 +0300 -*************** -*** 1325,1331 **** - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! Discord - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ ---- 1325,1331 ---- - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! CTCNAME - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ -*************** -*** 3263,3269 **** - 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. ---- 3263,3269 ---- - 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. -*************** -*** 4483,4489 **** - Subscriptions - Suggestions - %1$s, %2$s -! Support - Remove all embeds - Suppressed - "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." ---- 4483,4489 ---- - Subscriptions - Suggestions - %1$s, %2$s -! CutTheCord Repo - Remove all embeds - Suppressed - "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." -diff -crB com.discord-1006-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali com.discord-1006/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali -*** com.discord-1006-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-13 11:10:57.307458114 +0300 ---- com.discord-1006/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-13 12:51:42.953634519 +0300 -*************** -*** 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 --git a/patches/branding/1007.patch b/patches/branding/1007.patch deleted file mode 100644 index 274c9142e..000000000 --- a/patches/branding/1007.patch +++ /dev/null @@ -1,241 +0,0 @@ -diff -crB com.discord-1007-base/AndroidManifest.xml com.discord-1007/AndroidManifest.xml -*** com.discord-1007-base/AndroidManifest.xml 2019-12-15 13:40:47.516522153 +0300 ---- com.discord-1007/AndroidManifest.xml 2019-12-15 13:43:20.197380493 +0300 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 19,31 **** - - - -! - - - - - -! - - - ---- 19,31 ---- - - - -! - - - - - -! - - - -*************** -*** 88,94 **** - - - -! - - - ---- 88,94 ---- - - - -! - - - -*************** -*** 118,124 **** - - - -! - - - ---- 118,124 ---- - - - -! - - - -*************** -*** 133,139 **** - - - -! - - - ---- 133,139 ---- - - - -! - - - -*************** -*** 148,154 **** - - - -! - - - ---- 148,154 ---- - - - -! - - - -*************** -*** 158,164 **** - - - -! - - - ---- 158,164 ---- - - - -! - - - -*************** -*** 198,206 **** - - - -! -! -! - - -! -\ No newline at end of file ---- 198,206 ---- - - - -! -! -! - - -! -diff -crB com.discord-1007-base/apktool.yml com.discord-1007/apktool.yml -*** com.discord-1007-base/apktool.yml 2019-12-15 13:40:27.489742899 +0300 ---- com.discord-1007/apktool.yml 2019-12-15 13:41:49.826872449 +0300 -*************** -*** 184,188 **** - tag: null - version: 2.4.1-197d46-SNAPSHOT - versionInfo: -! versionCode: '1007' -! versionName: 10.0.7 ---- 184,188 ---- - tag: null - version: 2.4.1-197d46-SNAPSHOT - versionInfo: -! versionCode: '1007CTCBUILD' -! versionName: 10.0.7-cutthecord-CTCBUILD -diff -crB com.discord-1007-base/res/values/strings.xml com.discord-1007/res/values/strings.xml -*** com.discord-1007-base/res/values/strings.xml 2019-12-15 13:40:23.369719738 +0300 ---- com.discord-1007/res/values/strings.xml 2019-12-15 13:41:49.830205801 +0300 -*************** -*** 1325,1331 **** - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! Discord - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ ---- 1325,1331 ---- - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! CTCNAME - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ -*************** -*** 3257,3263 **** - 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. ---- 3257,3263 ---- - 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. -*************** -*** 4477,4483 **** - Subscriptions - Suggestions - %1$s, %2$s -! Support - Remove all embeds - Suppressed - "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." ---- 4477,4483 ---- - Subscriptions - Suggestions - %1$s, %2$s -! CutTheCord Repo - Remove all embeds - Suppressed - "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." -diff -crB com.discord-1007-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali com.discord-1007/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali -*** com.discord-1007-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-15 13:40:24.949728621 +0300 ---- com.discord-1007/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-15 13:41:49.830205801 +0300 -*************** -*** 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 --git a/patches/branding/1011.patch b/patches/branding/1011.patch deleted file mode 100644 index 96a3c1168..000000000 --- a/patches/branding/1011.patch +++ /dev/null @@ -1,240 +0,0 @@ -diff -crB from/AndroidManifest.xml to/AndroidManifest.xml -*** from/AndroidManifest.xml 2019-12-19 01:48:39.861161627 +0300 ---- to/AndroidManifest.xml 2019-12-19 01:48:42.061174985 +0300 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 19,31 **** - - - -! - - - - - -! - - - ---- 19,31 ---- - - - -! - - - - - -! - - - -*************** -*** 88,94 **** - - - -! - - - ---- 88,94 ---- - - - -! - - - -*************** -*** 118,124 **** - - - -! - - - ---- 118,124 ---- - - - -! - - - -*************** -*** 133,139 **** - - - -! - - - ---- 133,139 ---- - - - -! - - - -*************** -*** 148,154 **** - - - -! - - - ---- 148,154 ---- - - - -! - - - -*************** -*** 158,164 **** - - - -! - - - ---- 158,164 ---- - - - -! - - - -*************** -*** 198,206 **** - - - -! -! -! - - -! -\ No newline at end of file ---- 198,206 ---- - - - -! -! -! - - -! -diff -crB from/apktool.yml to/apktool.yml -*** from/apktool.yml 2019-12-19 01:48:26.887749524 +0300 ---- to/apktool.yml 2019-12-19 01:48:42.061174985 +0300 -*************** -*** 184,188 **** - tag: null - version: 2.4.1-197d46-SNAPSHOT - versionInfo: -! versionCode: '1011' -! versionName: 10.1.1 ---- 184,188 ---- - tag: null - version: 2.4.1-197d46-SNAPSHOT - versionInfo: -! versionCode: '1011CTCBUILD' -! versionName: 10.1.1-cutthecord-CTCBUILD -diff -crB from/res/values/strings.xml to/res/values/strings.xml -*** from/res/values/strings.xml 2019-12-19 01:48:18.651032846 +0300 ---- to/res/values/strings.xml 2019-12-19 01:48:42.064508338 +0300 -*************** -*** 1320,1326 **** - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! Discord - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ ---- 1320,1326 ---- - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! CTCNAME - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ -*************** -*** 3259,3265 **** - 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. ---- 3259,3265 ---- - 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. -*************** -*** 4486,4492 **** - Subscriptions - Suggestions - %1$s, %2$s -! Support - Remove all embeds - Suppressed - "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." ---- 4486,4492 ---- - Subscriptions - Suggestions - %1$s, %2$s -! CutTheCord Repo - Remove all embeds - Suppressed - "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." -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 2019-12-19 01:48:22.364388726 +0300 ---- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-19 01:48:42.064508338 +0300 -*************** -*** 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 --git a/patches/branding/1012.patch b/patches/branding/1012.patch deleted file mode 100644 index 3b07e0070..000000000 --- a/patches/branding/1012.patch +++ /dev/null @@ -1,240 +0,0 @@ -diff -crB from/AndroidManifest.xml to/AndroidManifest.xml -*** from/AndroidManifest.xml 2019-12-20 16:43:27.540506983 +0200 ---- to/AndroidManifest.xml 2019-12-20 16:43:30.127152569 +0200 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 19,31 **** - - - -! - - - - - -! - - - ---- 19,31 ---- - - - -! - - - - - -! - - - -*************** -*** 88,94 **** - - - -! - - - ---- 88,94 ---- - - - -! - - - -*************** -*** 118,124 **** - - - -! - - - ---- 118,124 ---- - - - -! - - - -*************** -*** 133,139 **** - - - -! - - - ---- 133,139 ---- - - - -! - - - -*************** -*** 148,154 **** - - - -! - - - ---- 148,154 ---- - - - -! - - - -*************** -*** 158,164 **** - - - -! - - - ---- 158,164 ---- - - - -! - - - -*************** -*** 198,206 **** - - - -! -! -! - - -! -\ No newline at end of file ---- 198,206 ---- - - - -! -! -! - - -! -diff -crB from/apktool.yml to/apktool.yml -*** from/apktool.yml 2019-12-20 16:42:32.254312584 +0200 ---- to/apktool.yml 2019-12-20 16:43:30.127152569 +0200 -*************** -*** 184,188 **** - tag: null - version: 2.4.2-0143dc-SNAPSHOT - versionInfo: -! versionCode: '1012' -! versionName: 10.1.2 ---- 184,188 ---- - tag: null - version: 2.4.2-0143dc-SNAPSHOT - versionInfo: -! versionCode: '1012CTCBUILD' -! versionName: 10.1.2-cutthecord-CTCBUILD -diff -crB from/res/values/strings.xml to/res/values/strings.xml -*** from/res/values/strings.xml 2019-12-20 16:42:25.147709762 +0200 ---- to/res/values/strings.xml 2019-12-20 16:43:30.127152569 +0200 -*************** -*** 1319,1325 **** - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! Discord - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ ---- 1319,1325 ---- - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! CTCNAME - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ -*************** -*** 3252,3258 **** - 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. ---- 3252,3258 ---- - 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. -*************** -*** 4473,4479 **** - Subscriptions - Suggestions - %1$s, %2$s -! Support - Remove all embeds - Suppressed - "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." ---- 4473,4479 ---- - Subscriptions - Suggestions - %1$s, %2$s -! CutTheCord Repo - Remove all embeds - Suppressed - "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." -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 2019-12-20 16:42:28.281014855 +0200 ---- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-20 16:43:30.127152569 +0200 -*************** -*** 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 --git a/patches/branding/1013.patch b/patches/branding/1013.patch deleted file mode 100644 index 6b10cd67d..000000000 --- a/patches/branding/1013.patch +++ /dev/null @@ -1,243 +0,0 @@ -diff -crB com.discord-1013-base/AndroidManifest.xml com.discord-1013/AndroidManifest.xml -*** com.discord-1013-base/AndroidManifest.xml 2019-12-21 21:31:39.126821471 +0300 ---- com.discord-1013/AndroidManifest.xml 2019-12-21 21:38:27.075863549 +0300 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 19,30 **** - - - -! - - - - -! - - - ---- 19,30 ---- - - - -! - - - - -! - - - -*************** -*** 87,93 **** - - - -! - - - ---- 87,93 ---- - - - -! - - - -*************** -*** 117,123 **** - - - -! - - - ---- 117,123 ---- - - - -! - - - -*************** -*** 132,138 **** - - - -! - - - ---- 132,138 ---- - - - -! - - - -*************** -*** 147,153 **** - - - -! - - - ---- 147,153 ---- - - - -! - - - -*************** -*** 157,163 **** - - - -! - - - ---- 157,163 ---- - - - -! - - - -*************** -*** 197,205 **** - - - -! -! -! - - -! -\ No newline at end of file ---- 197,205 ---- - - - -! -! -! - - -! -Only in com.discord-1013: AndroidManifest.xml.orig -Only in com.discord-1013: AndroidManifest.xml.rej -diff -crB com.discord-1013-base/apktool.yml com.discord-1013/apktool.yml -*** com.discord-1013-base/apktool.yml 2019-12-21 21:31:19.773375445 +0300 ---- com.discord-1013/apktool.yml 2019-12-21 21:37:33.032215527 +0300 -*************** -*** 184,188 **** - tag: null - version: 2.4.1-197d46-SNAPSHOT - versionInfo: -! versionCode: '1013' -! versionName: 10.1.3 ---- 184,188 ---- - tag: null - version: 2.4.1-197d46-SNAPSHOT - versionInfo: -! versionCode: '1013CTCBUILD' -! versionName: 10.1.3-cutthecord-CTCBUILD -Only in com.discord-1013: apktool.yml.orig -diff -crB com.discord-1013-base/res/values/strings.xml com.discord-1013/res/values/strings.xml -*** com.discord-1013-base/res/values/strings.xml 2019-12-21 21:31:15.933353085 +0300 ---- com.discord-1013/res/values/strings.xml 2019-12-21 21:37:33.035548879 +0300 -*************** -*** 1347,1353 **** - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! Discord - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ ---- 1347,1353 ---- - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! CTCNAME - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ -*************** -*** 3296,3302 **** - 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. ---- 3296,3302 ---- - 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. -*************** -*** 4523,4529 **** - Subscriptions - Suggestions - %1$s, %2$s -! Support - Remove all embeds - Suppressed - "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." ---- 4523,4529 ---- - Subscriptions - Suggestions - %1$s, %2$s -! CutTheCord Repo - Remove all embeds - Suppressed - "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." -Only in com.discord-1013/res/values: strings.xml.orig -diff -crB com.discord-1013-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali com.discord-1013/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali -*** com.discord-1013-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-21 21:31:17.590029398 +0300 ---- com.discord-1013/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-21 21:37:33.035548879 +0300 -*************** -*** 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 --git a/patches/branding/1015.patch b/patches/branding/1015.patch deleted file mode 100644 index 1fc801b48..000000000 --- a/patches/branding/1015.patch +++ /dev/null @@ -1,238 +0,0 @@ -diff -crB from/AndroidManifest.xml to/AndroidManifest.xml -*** from/AndroidManifest.xml 2019-12-29 13:09:26.716115553 +0200 ---- to/AndroidManifest.xml 2019-12-29 13:09:29.146120111 +0200 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 19,30 **** - - - -! - - - - -! - - - ---- 19,30 ---- - - - -! - - - - -! - - - -*************** -*** 87,93 **** - - - -! - - - ---- 87,93 ---- - - - -! - - - -*************** -*** 117,123 **** - - - -! - - - ---- 117,123 ---- - - - -! - - - -*************** -*** 132,138 **** - - - -! - - - ---- 132,138 ---- - - - -! - - - -*************** -*** 147,153 **** - - - -! - - - ---- 147,153 ---- - - - -! - - - -*************** -*** 157,163 **** - - - -! - - - ---- 157,163 ---- - - - -! - - - -*************** -*** 197,205 **** - - - -! -! -! - - -! -\ No newline at end of file ---- 197,205 ---- - - - -! -! -! - - -! -diff -crB from/apktool.yml to/apktool.yml -*** from/apktool.yml 2019-12-29 13:09:13.709455599 +0200 ---- to/apktool.yml 2019-12-29 13:09:29.146120111 +0200 -*************** -*** 184,188 **** - tag: null - version: 2.4.2-0143dc-SNAPSHOT - versionInfo: -! versionCode: '1015' -! versionName: 10.1.5 ---- 184,188 ---- - tag: null - version: 2.4.2-0143dc-SNAPSHOT - versionInfo: -! versionCode: '1015CTCBUILD' -! versionName: 10.1.5-cutthecord-CTCBUILD -diff -crB from/res/values/strings.xml to/res/values/strings.xml -*** from/res/values/strings.xml 2019-12-29 13:09:08.146150435 +0200 ---- to/res/values/strings.xml 2019-12-29 13:09:29.146120111 +0200 -*************** -*** 1347,1353 **** - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! Discord - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ ---- 1347,1353 ---- - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! CTCNAME - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ -*************** -*** 3316,3322 **** - 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. ---- 3316,3322 ---- - 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. -*************** -*** 4547,4553 **** - Subscriptions - Suggestions - %1$s, %2$s -! Support - Remove all embeds - Suppressed - "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." ---- 4547,4553 ---- - Subscriptions - Suggestions - %1$s, %2$s -! CutTheCord Repo - Remove all embeds - Suppressed - "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." -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 2019-12-29 13:09:10.552802384 +0200 ---- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-29 13:09:29.149453451 +0200 -*************** -*** 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 --git a/patches/branding/1016.patch b/patches/branding/1016.patch deleted file mode 100644 index 7a2e1e75f..000000000 --- a/patches/branding/1016.patch +++ /dev/null @@ -1,238 +0,0 @@ -diff -crB from/AndroidManifest.xml to/AndroidManifest.xml -*** from/AndroidManifest.xml 2020-01-03 17:09:20.264791973 +0200 ---- to/AndroidManifest.xml 2020-01-03 17:09:22.576488246 +0200 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 19,30 **** - - - -! - - - - -! - - - ---- 19,30 ---- - - - -! - - - - -! - - - -*************** -*** 87,93 **** - - - -! - - - ---- 87,93 ---- - - - -! - - - -*************** -*** 117,123 **** - - - -! - - - ---- 117,123 ---- - - - -! - - - -*************** -*** 132,138 **** - - - -! - - - ---- 132,138 ---- - - - -! - - - -*************** -*** 147,153 **** - - - -! - - - ---- 147,153 ---- - - - -! - - - -*************** -*** 157,163 **** - - - -! - - - ---- 157,163 ---- - - - -! - - - -*************** -*** 197,205 **** - - - -! -! -! - - -! -\ No newline at end of file ---- 197,205 ---- - - - -! -! -! - - -! -diff -crB from/apktool.yml to/apktool.yml -*** from/apktool.yml 2020-01-03 17:09:09.228553656 +0200 ---- to/apktool.yml 2020-01-03 17:09:22.576488246 +0200 -*************** -*** 184,188 **** - tag: null - version: 2.4.2-0143dc-SNAPSHOT - versionInfo: -! versionCode: '1016' -! versionName: 10.1.6 ---- 184,188 ---- - tag: null - version: 2.4.2-0143dc-SNAPSHOT - versionInfo: -! versionCode: '1016CTCBUILD' -! versionName: 10.1.6-cutthecord-CTCBUILD -diff -crB from/res/values/strings.xml to/res/values/strings.xml -*** from/res/values/strings.xml 2020-01-03 17:08:57.124745448 +0200 ---- to/res/values/strings.xml 2020-01-03 17:09:22.576488246 +0200 -*************** -*** 1347,1353 **** - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! Discord - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ ---- 1347,1353 ---- - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! CTCNAME - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ -*************** -*** 3319,3325 **** - 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. ---- 3319,3325 ---- - 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. -*************** -*** 4568,4574 **** - Subscriptions - Suggestions - %1$s, %2$s -! Support - Remove all embeds - Suppressed - "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." ---- 4568,4574 ---- - Subscriptions - Suggestions - %1$s, %2$s -! CutTheCord Repo - Remove all embeds - Suppressed - "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." -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-01-03 17:09:02.367309052 +0200 ---- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-03 17:09:22.576488246 +0200 -*************** -*** 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 --git a/patches/branding/1019.patch b/patches/branding/1019.patch deleted file mode 100644 index 634beeff5..000000000 --- a/patches/branding/1019.patch +++ /dev/null @@ -1,238 +0,0 @@ -diff -crB from/AndroidManifest.xml to/AndroidManifest.xml -*** from/AndroidManifest.xml 2020-01-10 14:33:58.469432489 +0300 ---- to/AndroidManifest.xml 2020-01-10 14:34:05.016131990 +0300 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 19,30 **** - - - -! - - - - -! - - - ---- 19,30 ---- - - - -! - - - - -! - - - -*************** -*** 87,93 **** - - - -! - - - ---- 87,93 ---- - - - -! - - - -*************** -*** 117,123 **** - - - -! - - - ---- 117,123 ---- - - - -! - - - -*************** -*** 132,138 **** - - - -! - - - ---- 132,138 ---- - - - -! - - - -*************** -*** 147,153 **** - - - -! - - - ---- 147,153 ---- - - - -! - - - -*************** -*** 157,163 **** - - - -! - - - ---- 157,163 ---- - - - -! - - - -*************** -*** 197,205 **** - - - -! -! -! - - -! -\ No newline at end of file ---- 197,205 ---- - - - -! -! -! - - -! -diff -crB from/apktool.yml to/apktool.yml -*** from/apktool.yml 2020-01-10 14:08:32.545012974 +0300 ---- to/apktool.yml 2020-01-10 14:34:05.016131990 +0300 -*************** -*** 184,188 **** - tag: null - version: 2.4.1-197d46-SNAPSHOT - versionInfo: -! versionCode: '1019' -! versionName: 10.1.9 ---- 184,188 ---- - tag: null - version: 2.4.1-197d46-SNAPSHOT - versionInfo: -! versionCode: '1019CTCBUILD' -! versionName: 10.1.9-cutthecord-CTCBUILD -diff -crB from/res/values/strings.xml to/res/values/strings.xml -*** from/res/values/strings.xml 2020-01-10 14:08:27.964989874 +0300 ---- to/res/values/strings.xml 2020-01-10 14:34:05.016131990 +0300 -*************** -*** 1353,1359 **** - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! Discord - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ ---- 1353,1359 ---- - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! CTCNAME - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ -*************** -*** 3374,3380 **** - 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. ---- 3374,3380 ---- - 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. -*************** -*** 4625,4631 **** - Subscriptions - Suggestions - %1$s, %2$s -! Support - Remove all embeds - Suppressed - "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." ---- 4625,4631 ---- - Subscriptions - Suggestions - %1$s, %2$s -! CutTheCord Repo - Remove all embeds - Suppressed - "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." -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-01-10 14:08:30.145000870 +0300 ---- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-10 14:34:05.016131990 +0300 -*************** -*** 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 --git a/patches/branding/1020.patch b/patches/branding/1020.patch deleted file mode 100644 index 9f5d30696..000000000 --- a/patches/branding/1020.patch +++ /dev/null @@ -1,238 +0,0 @@ -diff -crB from/AndroidManifest.xml to/AndroidManifest.xml -*** from/AndroidManifest.xml 2020-01-11 15:50:08.021076672 +0000 ---- to/AndroidManifest.xml 2020-01-11 15:50:09.517740237 +0000 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 20,31 **** - - - -! - - - - -! - - - ---- 20,31 ---- - - - -! - - - - -! - - - -*************** -*** 90,96 **** - - - -! - - - ---- 90,96 ---- - - - -! - - - -*************** -*** 120,126 **** - - - -! - - - ---- 120,126 ---- - - - -! - - - -*************** -*** 135,141 **** - - - -! - - - ---- 135,141 ---- - - - -! - - - -*************** -*** 150,156 **** - - - -! - - - ---- 150,156 ---- - - - -! - - - -*************** -*** 160,166 **** - - - -! - - - ---- 160,166 ---- - - - -! - - - -*************** -*** 200,208 **** - - - -! -! -! - - -! -\ No newline at end of file ---- 200,208 ---- - - - -! -! -! - - -! -diff -crB from/apktool.yml to/apktool.yml -*** from/apktool.yml 2020-01-11 15:47:46.884702594 +0000 ---- to/apktool.yml 2020-01-11 15:50:09.517740237 +0000 -*************** -*** 184,188 **** - tag: null - version: 2.4.2-0143dc-SNAPSHOT - versionInfo: -! versionCode: '1020' -! versionName: 10.2.0 ---- 184,188 ---- - tag: null - version: 2.4.2-0143dc-SNAPSHOT - versionInfo: -! versionCode: '1020CTCBUILD' -! versionName: 10.2.0-cutthecord-CTCBUILD -diff -crB from/res/values/strings.xml to/res/values/strings.xml -*** from/res/values/strings.xml 2020-01-11 15:47:41.754713225 +0000 ---- to/res/values/strings.xml 2020-01-11 15:50:09.517740237 +0000 -*************** -*** 1354,1360 **** - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! Discord - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ ---- 1354,1360 ---- - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! CTCNAME - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ -*************** -*** 3379,3385 **** - 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. ---- 3379,3385 ---- - 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. -*************** -*** 4630,4636 **** - Subscriptions - Suggestions - %1$s, %2$s -! Support - Remove all embeds - Muted by you - Suppressed ---- 4630,4636 ---- - Subscriptions - Suggestions - %1$s, %2$s -! CutTheCord Repo - Remove all embeds - Muted by you - Suppressed -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-01-11 15:47:44.101375029 +0000 ---- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-11 15:50:09.517740237 +0000 -*************** -*** 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 --git a/patches/branding/1021.patch b/patches/branding/1021.patch deleted file mode 100644 index ae49aedf6..000000000 --- a/patches/branding/1021.patch +++ /dev/null @@ -1,238 +0,0 @@ -diff -crB from/AndroidManifest.xml to/AndroidManifest.xml -*** from/AndroidManifest.xml 2020-01-11 15:50:08.021076672 +0000 ---- to/AndroidManifest.xml 2020-01-11 15:50:09.517740237 +0000 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 20,31 **** - - - -! - - - - -! - - - ---- 20,31 ---- - - - -! - - - - -! - - - -*************** -*** 90,96 **** - - - -! - - - ---- 90,96 ---- - - - -! - - - -*************** -*** 120,126 **** - - - -! - - - ---- 120,126 ---- - - - -! - - - -*************** -*** 135,141 **** - - - -! - - - ---- 135,141 ---- - - - -! - - - -*************** -*** 150,156 **** - - - -! - - - ---- 150,156 ---- - - - -! - - - -*************** -*** 160,166 **** - - - -! - - - ---- 160,166 ---- - - - -! - - - -*************** -*** 200,208 **** - - - -! -! -! - - -! -\ No newline at end of file ---- 200,208 ---- - - - -! -! -! - - -! -diff -crB from/apktool.yml to/apktool.yml -*** from/apktool.yml 2020-01-11 15:47:46.884702594 +0000 ---- to/apktool.yml 2020-01-11 15:50:09.517740237 +0000 -*************** -*** 184,188 **** - tag: null - version: 2.4.2-0143dc-SNAPSHOT - versionInfo: -! versionCode: '1021' -! versionName: 10.2.1 ---- 184,188 ---- - tag: null - version: 2.4.2-0143dc-SNAPSHOT - versionInfo: -! versionCode: '1021CTCBUILD' -! versionName: 10.2.1-cutthecord-CTCBUILD -diff -crB from/res/values/strings.xml to/res/values/strings.xml -*** from/res/values/strings.xml 2020-01-11 15:47:41.754713225 +0000 ---- to/res/values/strings.xml 2020-01-11 15:50:09.517740237 +0000 -*************** -*** 1354,1360 **** - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! Discord - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ ---- 1354,1360 ---- - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! CTCNAME - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ -*************** -*** 3379,3385 **** - 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. ---- 3379,3385 ---- - 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. -*************** -*** 4630,4636 **** - Subscriptions - Suggestions - %1$s, %2$s -! Support - Remove all embeds - Muted by you - Suppressed ---- 4630,4636 ---- - Subscriptions - Suggestions - %1$s, %2$s -! CutTheCord Repo - Remove all embeds - Muted by you - Suppressed -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-01-11 15:47:44.101375029 +0000 ---- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-11 15:50:09.517740237 +0000 -*************** -*** 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 --git a/patches/branding/1022.patch b/patches/branding/1022.patch deleted file mode 100644 index 9faffebed..000000000 --- a/patches/branding/1022.patch +++ /dev/null @@ -1,238 +0,0 @@ -diff -crB from/AndroidManifest.xml to/AndroidManifest.xml -*** from/AndroidManifest.xml 2020-01-16 10:47:29.620232342 +0300 ---- to/AndroidManifest.xml 2020-01-16 10:47:31.316908381 +0300 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 20,31 **** - - - -! - - - - -! - - - ---- 20,31 ---- - - - -! - - - - -! - - - -*************** -*** 90,96 **** - - - -! - - - ---- 90,96 ---- - - - -! - - - -*************** -*** 120,126 **** - - - -! - - - ---- 120,126 ---- - - - -! - - - -*************** -*** 135,141 **** - - - -! - - - ---- 135,141 ---- - - - -! - - - -*************** -*** 150,156 **** - - - -! - - - ---- 150,156 ---- - - - -! - - - -*************** -*** 160,166 **** - - - -! - - - ---- 160,166 ---- - - - -! - - - -*************** -*** 200,208 **** - - - -! -! -! - - -! -\ No newline at end of file ---- 200,208 ---- - - - -! -! -! - - -! -diff -crB from/apktool.yml to/apktool.yml -*** from/apktool.yml 2020-01-16 10:47:13.890145453 +0300 ---- to/apktool.yml 2020-01-16 10:47:31.316908381 +0300 -*************** -*** 184,188 **** - tag: null - version: 2.4.1-197d46-SNAPSHOT - versionInfo: -! versionCode: '1022' -! versionName: 10.2.2 ---- 184,188 ---- - tag: null - version: 2.4.1-197d46-SNAPSHOT - versionInfo: -! versionCode: '1022CTCBUILD' -! versionName: 10.2.2-cutthecord-CTCBUILD -diff -crB from/res/values/strings.xml to/res/values/strings.xml -*** from/res/values/strings.xml 2020-01-16 10:47:09.946790338 +0300 ---- to/res/values/strings.xml 2020-01-16 10:47:31.316908381 +0300 -*************** -*** 1354,1360 **** - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! Discord - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ ---- 1354,1360 ---- - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! CTCNAME - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ -*************** -*** 3390,3396 **** - 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. ---- 3390,3396 ---- - 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. -*************** -*** 4640,4646 **** - Subscriptions - Suggestions - %1$s, %2$s -! Support - Remove all embeds - Muted by you - Suppressed ---- 4640,4646 ---- - Subscriptions - Suggestions - %1$s, %2$s -! CutTheCord Repo - Remove all embeds - Muted by you - Suppressed -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-01-16 10:47:11.766800391 +0300 ---- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-16 10:47:31.316908381 +0300 -*************** -*** 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 --git a/patches/branding/1023.patch b/patches/branding/1023.patch deleted file mode 100644 index bb6ab78d6..000000000 --- a/patches/branding/1023.patch +++ /dev/null @@ -1,238 +0,0 @@ -diff -crB from/AndroidManifest.xml to/AndroidManifest.xml -*** from/AndroidManifest.xml 2020-01-16 10:47:29.620232342 +0300 ---- to/AndroidManifest.xml 2020-01-16 10:47:31.316908381 +0300 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 20,31 **** - - - -! - - - - -! - - - ---- 20,31 ---- - - - -! - - - - -! - - - -*************** -*** 90,96 **** - - - -! - - - ---- 90,96 ---- - - - -! - - - -*************** -*** 120,126 **** - - - -! - - - ---- 120,126 ---- - - - -! - - - -*************** -*** 135,141 **** - - - -! - - - ---- 135,141 ---- - - - -! - - - -*************** -*** 150,156 **** - - - -! - - - ---- 150,156 ---- - - - -! - - - -*************** -*** 160,166 **** - - - -! - - - ---- 160,166 ---- - - - -! - - - -*************** -*** 200,208 **** - - - -! -! -! - - -! -\ No newline at end of file ---- 200,208 ---- - - - -! -! -! - - -! -diff -crB from/apktool.yml to/apktool.yml -*** from/apktool.yml 2020-01-16 10:47:13.890145453 +0300 ---- to/apktool.yml 2020-01-16 10:47:31.316908381 +0300 -*************** -*** 184,188 **** - tag: null - version: 2.4.1-197d46-SNAPSHOT - versionInfo: -! versionCode: '1023' -! versionName: 10.2.3 ---- 184,188 ---- - tag: null - version: 2.4.1-197d46-SNAPSHOT - versionInfo: -! versionCode: '1023CTCBUILD' -! versionName: 10.2.3-cutthecord-CTCBUILD -diff -crB from/res/values/strings.xml to/res/values/strings.xml -*** from/res/values/strings.xml 2020-01-16 10:47:09.946790338 +0300 ---- to/res/values/strings.xml 2020-01-16 10:47:31.316908381 +0300 -*************** -*** 1354,1360 **** - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! Discord - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ ---- 1354,1360 ---- - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! CTCNAME - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ -*************** -*** 3390,3396 **** - 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. ---- 3390,3396 ---- - 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. -*************** -*** 4640,4646 **** - Subscriptions - Suggestions - %1$s, %2$s -! Support - Remove all embeds - Muted by you - Suppressed ---- 4640,4646 ---- - Subscriptions - Suggestions - %1$s, %2$s -! CutTheCord Repo - Remove all embeds - Muted by you - Suppressed -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-01-16 10:47:11.766800391 +0300 ---- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-16 10:47:31.316908381 +0300 -*************** -*** 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 --git a/patches/branding/1024.patch b/patches/branding/1024.patch deleted file mode 100644 index 89fd064e0..000000000 --- a/patches/branding/1024.patch +++ /dev/null @@ -1,238 +0,0 @@ -diff -crB from/AndroidManifest.xml to/AndroidManifest.xml -*** from/AndroidManifest.xml 2020-01-18 14:21:47.436105598 +0000 ---- to/AndroidManifest.xml 2020-01-18 14:21:48.916070161 +0000 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 20,31 **** - - - -! - - - - -! - - - ---- 20,31 ---- - - - -! - - - - -! - - - -*************** -*** 92,98 **** - - - -! - - - ---- 92,98 ---- - - - -! - - - -*************** -*** 122,128 **** - - - -! - - - ---- 122,128 ---- - - - -! - - - -*************** -*** 137,143 **** - - - -! - - - ---- 137,143 ---- - - - -! - - - -*************** -*** 152,158 **** - - - -! - - - ---- 152,158 ---- - - - -! - - - -*************** -*** 162,168 **** - - - -! - - - ---- 162,168 ---- - - - -! - - - -*************** -*** 202,210 **** - - - -! -! -! - - -! -\ No newline at end of file ---- 202,210 ---- - - - -! -! -! - - -! -diff -crB from/apktool.yml to/apktool.yml -*** from/apktool.yml 2020-01-18 14:21:34.713140148 +0000 ---- to/apktool.yml 2020-01-18 14:21:48.916070161 +0000 -*************** -*** 184,188 **** - tag: null - version: 2.4.2-0143dc-SNAPSHOT - versionInfo: -! versionCode: '1024' -! versionName: 10.2.4 ---- 184,188 ---- - tag: null - version: 2.4.2-0143dc-SNAPSHOT - versionInfo: -! versionCode: '1024CTCBUILD' -! versionName: 10.2.4-cutthecord-CTCBUILD -diff -crB from/res/values/strings.xml to/res/values/strings.xml -*** from/res/values/strings.xml 2020-01-18 14:21:29.369999066 +0000 ---- to/res/values/strings.xml 2020-01-18 14:21:48.916070161 +0000 -*************** -*** 1354,1360 **** - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! Discord - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ ---- 1354,1360 ---- - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! CTCNAME - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ -*************** -*** 3390,3396 **** - 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. ---- 3390,3396 ---- - 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. -*************** -*** 4640,4646 **** - Subscriptions - Suggestions - %1$s, %2$s -! Support - Remove all embeds - Muted by you - Suppressed ---- 4640,4646 ---- - Subscriptions - Suggestions - %1$s, %2$s -! CutTheCord Repo - Remove all embeds - Muted by you - Suppressed -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-01-18 14:21:31.523252021 +0000 ---- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-18 14:21:48.919403414 +0000 -*************** -*** 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 --git a/patches/branding/1025.patch b/patches/branding/1025.patch deleted file mode 100644 index 7cff04029..000000000 --- a/patches/branding/1025.patch +++ /dev/null @@ -1,238 +0,0 @@ -diff -crB from/AndroidManifest.xml to/AndroidManifest.xml -*** from/AndroidManifest.xml 2020-01-22 15:07:32.859884935 +0000 ---- to/AndroidManifest.xml 2020-01-22 15:07:34.469944086 +0000 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 20,31 **** - - - -! - - - - -! - - - ---- 20,31 ---- - - - -! - - - - -! - - - -*************** -*** 92,98 **** - - - -! - - - ---- 92,98 ---- - - - -! - - - -*************** -*** 122,128 **** - - - -! - - - ---- 122,128 ---- - - - -! - - - -*************** -*** 137,143 **** - - - -! - - - ---- 137,143 ---- - - - -! - - - -*************** -*** 152,158 **** - - - -! - - - ---- 152,158 ---- - - - -! - - - -*************** -*** 162,168 **** - - - -! - - - ---- 162,168 ---- - - - -! - - - -*************** -*** 202,210 **** - - - -! -! -! - - -! -\ No newline at end of file ---- 202,210 ---- - - - -! -! -! - - -! -diff -crB from/apktool.yml to/apktool.yml -*** from/apktool.yml 2020-01-22 15:07:25.909629598 +0000 ---- to/apktool.yml 2020-01-22 15:07:34.469944086 +0000 -*************** -*** 184,188 **** - tag: null - version: 2.4.2-0143dc-SNAPSHOT - versionInfo: -! versionCode: '1025' -! versionName: 10.2.5 ---- 184,188 ---- - tag: null - version: 2.4.2-0143dc-SNAPSHOT - versionInfo: -! versionCode: '1025CTCBUILD' -! versionName: 10.2.5-cutthecord-CTCBUILD -diff -crB from/res/values/strings.xml to/res/values/strings.xml -*** from/res/values/strings.xml 2020-01-22 15:07:20.422761361 +0000 ---- to/res/values/strings.xml 2020-01-22 15:07:34.469944086 +0000 -*************** -*** 1354,1360 **** - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! Discord - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ ---- 1354,1360 ---- - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! CTCNAME - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ -*************** -*** 3392,3398 **** - 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. ---- 3392,3398 ---- - 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. -*************** -*** 4642,4648 **** - Subscriptions - Suggestions - %1$s, %2$s -! Support - Remove all embeds - Muted by you - Suppressed ---- 4642,4648 ---- - Subscriptions - Suggestions - %1$s, %2$s -! CutTheCord Repo - Remove all embeds - Muted by you - Suppressed -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-01-22 15:07:22.862851001 +0000 ---- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-22 15:07:34.469944086 +0000 -*************** -*** 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 --git a/patches/branding/1026.patch b/patches/branding/1026.patch deleted file mode 100644 index c628f27ec..000000000 --- a/patches/branding/1026.patch +++ /dev/null @@ -1,238 +0,0 @@ -diff -crB from/AndroidManifest.xml to/AndroidManifest.xml -*** from/AndroidManifest.xml 2020-01-23 00:10:35.583772364 +0000 ---- to/AndroidManifest.xml 2020-01-23 00:10:37.143768795 +0000 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 20,31 **** - - - -! - - - - -! - - - ---- 20,31 ---- - - - -! - - - - -! - - - -*************** -*** 92,98 **** - - - -! - - - ---- 92,98 ---- - - - -! - - - -*************** -*** 122,128 **** - - - -! - - - ---- 122,128 ---- - - - -! - - - -*************** -*** 137,143 **** - - - -! - - - ---- 137,143 ---- - - - -! - - - -*************** -*** 152,158 **** - - - -! - - - ---- 152,158 ---- - - - -! - - - -*************** -*** 162,168 **** - - - -! - - - ---- 162,168 ---- - - - -! - - - -*************** -*** 202,210 **** - - - -! -! -! - - -! -\ No newline at end of file ---- 202,210 ---- - - - -! -! -! - - -! -diff -crB from/apktool.yml to/apktool.yml -*** from/apktool.yml 2020-01-23 00:10:24.933796725 +0000 ---- to/apktool.yml 2020-01-23 00:10:37.143768795 +0000 -*************** -*** 184,188 **** - tag: null - version: 2.4.2-0143dc-SNAPSHOT - versionInfo: -! versionCode: '1026' -! versionName: 10.2.6 ---- 184,188 ---- - tag: null - version: 2.4.2-0143dc-SNAPSHOT - versionInfo: -! versionCode: '1026CTCBUILD' -! versionName: 10.2.6-cutthecord-CTCBUILD -diff -crB from/res/values/strings.xml to/res/values/strings.xml -*** from/res/values/strings.xml 2020-01-23 00:10:21.503804571 +0000 ---- to/res/values/strings.xml 2020-01-23 00:10:37.143768795 +0000 -*************** -*** 1363,1369 **** - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! Discord - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ ---- 1363,1369 ---- - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! CTCNAME - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ -*************** -*** 3399,3405 **** - 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. ---- 3399,3405 ---- - 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. -*************** -*** 4650,4656 **** - Subscriptions - Suggestions - %1$s, %2$s -! Support - Remove all embeds - Muted by you - Suppressed ---- 4650,4656 ---- - Subscriptions - Suggestions - %1$s, %2$s -! CutTheCord Repo - Remove all embeds - Muted by you - Suppressed -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-01-23 00:10:23.073800980 +0000 ---- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-23 00:10:37.143768795 +0000 -*************** -*** 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 --git a/patches/branding/1029.patch b/patches/branding/1029.patch deleted file mode 100644 index 716e57528..000000000 --- a/patches/branding/1029.patch +++ /dev/null @@ -1,238 +0,0 @@ -diff -crB from/AndroidManifest.xml to/AndroidManifest.xml -*** from/AndroidManifest.xml 2020-01-28 12:44:58.650355155 +0000 ---- to/AndroidManifest.xml 2020-01-28 12:45:00.940365683 +0000 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 20,31 **** - - - -! - - - - -! - - - ---- 20,31 ---- - - - -! - - - - -! - - - -*************** -*** 92,98 **** - - - -! - - - ---- 92,98 ---- - - - -! - - - -*************** -*** 122,128 **** - - - -! - - - ---- 122,128 ---- - - - -! - - - -*************** -*** 137,143 **** - - - -! - - - ---- 137,143 ---- - - - -! - - - -*************** -*** 152,158 **** - - - -! - - - ---- 152,158 ---- - - - -! - - - -*************** -*** 162,168 **** - - - -! - - - ---- 162,168 ---- - - - -! - - - -*************** -*** 202,210 **** - - - -! -! -! - - -! -\ No newline at end of file ---- 202,210 ---- - - - -! -! -! - - -! -diff -crB from/apktool.yml to/apktool.yml -*** from/apktool.yml 2020-01-28 12:44:34.333575756 +0000 ---- to/apktool.yml 2020-01-28 12:45:00.940365683 +0000 -*************** -*** 184,188 **** - tag: null - version: 2.4.2-0143dc-SNAPSHOT - versionInfo: -! versionCode: '1029' -! versionName: 10.2.9 ---- 184,188 ---- - tag: null - version: 2.4.2-0143dc-SNAPSHOT - versionInfo: -! versionCode: '1029CTCBUILD' -! versionName: 10.2.9-cutthecord-CTCBUILD -diff -crB from/res/values/strings.xml to/res/values/strings.xml -*** from/res/values/strings.xml 2020-01-28 12:44:28.786883130 +0000 ---- to/res/values/strings.xml 2020-01-28 12:45:00.943699031 +0000 -*************** -*** 1373,1379 **** - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! Discord - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ ---- 1373,1379 ---- - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! CTCNAME - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ -*************** -*** 3411,3417 **** - 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. ---- 3411,3417 ---- - 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. -*************** -*** 4665,4671 **** - Subscriptions - Suggestions - %1$s, %2$s -! Support - Remove all embeds - Suppressed - "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." ---- 4665,4671 ---- - Subscriptions - Suggestions - %1$s, %2$s -! CutTheCord Repo - Remove all embeds - Suppressed - "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." -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-01-28 12:44:31.366895216 +0000 ---- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-28 12:45:00.943699031 +0000 -*************** -*** 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 --git a/patches/branding/993.patch b/patches/branding/993.patch deleted file mode 100644 index 5bc8b94fc..000000000 --- a/patches/branding/993.patch +++ /dev/null @@ -1,242 +0,0 @@ -diff -crB from/AndroidManifest.xml to/AndroidManifest.xml -*** from/AndroidManifest.xml 2019-11-27 13:17:41.862287805 +0300 ---- to/AndroidManifest.xml 2019-11-27 13:17:44.972284722 +0300 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 19,30 **** - - - -! - - - - -! - - - ---- 19,30 ---- - - - -! - - - - -! - - - -*************** -*** 85,91 **** - - - -! - - - ---- 85,91 ---- - - - -! - - - -*************** -*** 115,121 **** - - - -! - - - ---- 115,121 ---- - - - -! - - - -*************** -*** 141,147 **** - - - -! - - - ---- 141,147 ---- - - - -! - - - -*************** -*** 151,157 **** - - - -! - - - ---- 151,157 ---- - - - -! - - - -*************** -*** 191,199 **** - - - -! -! -! - - - -\ No newline at end of file ---- 191,199 ---- - - - -! -! -! - - - -\ No newline at end of file -diff -crB from/apktool.yml to/apktool.yml -*** from/apktool.yml 2019-11-27 13:15:18.949285901 +0300 ---- to/apktool.yml 2019-11-27 13:17:44.972284722 +0300 -*************** -*** 179,183 **** - tag: null - version: 2.4.1-197d46-SNAPSHOT - versionInfo: -! versionCode: '993' -! versionName: 9.9.3 ---- 179,183 ---- - tag: null - version: 2.4.1-197d46-SNAPSHOT - versionInfo: -! versionCode: '993CTCBUILD' -! versionName: 9.9.3-cutthecord-CTCBUILD -diff -crB from/res/values/strings.xml to/res/values/strings.xml -*** from/res/values/strings.xml 2019-11-27 13:15:10.329376584 +0300 ---- to/res/values/strings.xml 2019-11-27 13:17:44.972284722 +0300 -*************** -*** 1296,1302 **** - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! Discord - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ ---- 1296,1302 ---- - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! CTCNAME - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ -*************** -*** 3193,3199 **** - 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. ---- 3193,3199 ---- - 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. -*************** -*** 4401,4407 **** - Subscriptions - Suggestions - %1$s, %2$s -! Support - Remove all embeds - Suppressed - "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." ---- 4401,4407 ---- - Subscriptions - Suggestions - %1$s, %2$s -! CutTheCord Repo - Remove all embeds - Suppressed - "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." -diff -crB from/smali/com/discord/app/e.smali to/smali/com/discord/app/e.smali -*** from/smali/com/discord/app/e.smali 2019-11-27 13:15:13.996004677 +0300 ---- to/smali/com/discord/app/e.smali 2019-11-27 13:17:44.972284722 +0300 -*************** -*** 56,62 **** - .line 16 - sput-object v0, Lcom/discord/app/e;->uZ:Ljava/lang/String; - -! const-string v0, "https://support.discordapp.com" - - .line 18 - sput-object v0, Lcom/discord/app/e;->va:Ljava/lang/String; ---- 56,62 ---- - .line 16 - sput-object v0, Lcom/discord/app/e;->uZ:Ljava/lang/String; - -! const-string v0, "https://gitdab.com/distok/cutthecord" - - .line 18 - sput-object v0, Lcom/discord/app/e;->va:Ljava/lang/String; -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 2019-11-27 13:15:14.649331138 +0300 ---- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-11-27 13:17:44.975618052 +0300 -*************** -*** 78,84 **** - .line 65 - new-instance v0, Landroid/content/Intent; - -! const-string v1, "https://discordapp.com/app" - - .line 67 - invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; ---- 78,84 ---- - .line 65 - new-instance v0, Landroid/content/Intent; - -! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" - - .line 67 - invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; diff --git a/patches/branding/994.patch b/patches/branding/994.patch deleted file mode 100644 index b42c37c5d..000000000 --- a/patches/branding/994.patch +++ /dev/null @@ -1,242 +0,0 @@ -diff -crB from/AndroidManifest.xml to/AndroidManifest.xml -*** from/AndroidManifest.xml 2019-11-28 09:20:30.323506767 +0300 ---- to/AndroidManifest.xml 2019-11-28 09:20:34.033527192 +0300 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 19,30 **** - - - -! - - - - -! - - - ---- 19,30 ---- - - - -! - - - - -! - - - -*************** -*** 85,91 **** - - - -! - - - ---- 85,91 ---- - - - -! - - - -*************** -*** 115,121 **** - - - -! - - - ---- 115,121 ---- - - - -! - - - -*************** -*** 141,147 **** - - - -! - - - ---- 141,147 ---- - - - -! - - - -*************** -*** 151,157 **** - - - -! - - - ---- 151,157 ---- - - - -! - - - -*************** -*** 191,199 **** - - - -! -! -! - - - -\ No newline at end of file ---- 191,199 ---- - - - -! -! -! - - - -\ No newline at end of file -diff -crB from/apktool.yml to/apktool.yml -*** from/apktool.yml 2019-11-28 09:20:26.040149852 +0300 ---- to/apktool.yml 2019-11-28 09:20:34.033527192 +0300 -*************** -*** 180,184 **** - tag: null - version: 2.4.1-197d46-SNAPSHOT - versionInfo: -! versionCode: '994' -! versionName: 9.9.4 ---- 180,184 ---- - tag: null - version: 2.4.1-197d46-SNAPSHOT - versionInfo: -! versionCode: '994CTCBUILD' -! versionName: 9.9.4-cutthecord-CTCBUILD -diff -crB from/res/values/strings.xml to/res/values/strings.xml -*** from/res/values/strings.xml 2019-11-28 09:20:21.816793266 +0300 ---- to/res/values/strings.xml 2019-11-28 09:20:34.036860544 +0300 -*************** -*** 1296,1302 **** - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! Discord - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ ---- 1296,1302 ---- - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! CTCNAME - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ -*************** -*** 3197,3203 **** - 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. ---- 3197,3203 ---- - 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. -*************** -*** 4405,4411 **** - Subscriptions - Suggestions - %1$s, %2$s -! Support - Remove all embeds - Suppressed - "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." ---- 4405,4411 ---- - Subscriptions - Suggestions - %1$s, %2$s -! CutTheCord Repo - Remove all embeds - Suppressed - "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." -diff -crB from/smali/com/discord/app/e.smali to/smali/com/discord/app/e.smali -*** from/smali/com/discord/app/e.smali 2019-11-28 09:20:23.663470100 +0300 ---- to/smali/com/discord/app/e.smali 2019-11-28 09:20:34.036860544 +0300 -*************** -*** 56,62 **** - .line 16 - sput-object v0, Lcom/discord/app/e;->uZ:Ljava/lang/String; - -! const-string v0, "https://support.discordapp.com" - - .line 18 - sput-object v0, Lcom/discord/app/e;->va:Ljava/lang/String; ---- 56,62 ---- - .line 16 - sput-object v0, Lcom/discord/app/e;->uZ:Ljava/lang/String; - -! const-string v0, "https://gitdab.com/distok/cutthecord" - - .line 18 - sput-object v0, Lcom/discord/app/e;->va:Ljava/lang/String; -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 2019-11-28 09:20:23.980138510 +0300 ---- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-11-28 09:20:34.036860544 +0300 -*************** -*** 78,84 **** - .line 65 - new-instance v0, Landroid/content/Intent; - -! const-string v1, "https://discordapp.com/app" - - .line 67 - invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; ---- 78,84 ---- - .line 65 - new-instance v0, Landroid/content/Intent; - -! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" - - .line 67 - invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; diff --git a/patches/branding/996.patch b/patches/branding/996.patch deleted file mode 100644 index 7d897f811..000000000 --- a/patches/branding/996.patch +++ /dev/null @@ -1,259 +0,0 @@ -diff -crB from/AndroidManifest.xml to/AndroidManifest.xml -*** from/AndroidManifest.xml 2019-12-05 11:24:15.137500289 +0300 ---- to/AndroidManifest.xml 2019-12-05 11:24:16.764173966 +0300 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 19,30 **** - - - -! - - - - -! - - - ---- 19,30 ---- - - - -! - - - - -! - - - -*************** -*** 85,91 **** - - - -! - - - ---- 85,91 ---- - - - -! - - - -*************** -*** 115,121 **** - - - -! - - - ---- 115,121 ---- - - - -! - - - -*************** -*** 130,136 **** - - - -! - - - ---- 130,136 ---- - - - -! - - - -*************** -*** 145,151 **** - - - -! - - - ---- 145,151 ---- - - - -! - - - -*************** -*** 155,161 **** - - - -! - - - ---- 155,161 ---- - - - -! - - - -*************** -*** 195,203 **** - - - -! -! -! - - - -\ No newline at end of file ---- 195,203 ---- - - - -! -! -! - - - -\ No newline at end of file -diff -crB from/apktool.yml to/apktool.yml -*** from/apktool.yml 2019-12-05 11:22:33.230394481 +0300 ---- to/apktool.yml 2019-12-05 11:24:16.764173966 +0300 -*************** -*** 185,189 **** - tag: null - version: 2.4.1-197d46-SNAPSHOT - versionInfo: -! versionCode: '996' -! versionName: 9.9.6 ---- 185,189 ---- - tag: null - version: 2.4.1-197d46-SNAPSHOT - versionInfo: -! versionCode: '996CTCBUILD' -! versionName: 9.9.6-cutthecord-CTCBUILD -diff -crB from/res/values/strings.xml to/res/values/strings.xml -*** from/res/values/strings.xml 2019-12-05 11:22:28.590374487 +0300 ---- to/res/values/strings.xml 2019-12-05 11:24:16.764173966 +0300 -*************** -*** 1296,1302 **** - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! Discord - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ ---- 1296,1302 ---- - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! CTCNAME - Free and secure chat for gamers, works on both your desktop and your phone. - Team voice & text chat - discord.gg/ -*************** -*** 3198,3204 **** - 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. ---- 3198,3204 ---- - 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. -*************** -*** 4406,4412 **** - Subscriptions - Suggestions - %1$s, %2$s -! Support - Remove all embeds - Suppressed - "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." ---- 4406,4412 ---- - Subscriptions - Suggestions - %1$s, %2$s -! CutTheCord Repo - Remove all embeds - Suppressed - "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." -diff -crB from/smali/com/discord/app/e.smali to/smali/com/discord/app/e.smali -*** from/smali/com/discord/app/e.smali 2019-12-05 11:22:30.347048723 +0300 ---- to/smali/com/discord/app/e.smali 2019-12-05 11:24:16.764173966 +0300 -*************** -*** 56,62 **** - .line 16 - sput-object v0, Lcom/discord/app/e;->uZ:Ljava/lang/String; - -! const-string v0, "https://support.discordapp.com" - - .line 18 - sput-object v0, Lcom/discord/app/e;->va:Ljava/lang/String; ---- 56,62 ---- - .line 16 - sput-object v0, Lcom/discord/app/e;->uZ:Ljava/lang/String; - -! const-string v0, "https://gitdab.com/distok/cutthecord" - - .line 18 - sput-object v0, Lcom/discord/app/e;->va:Ljava/lang/String; -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 2019-12-05 11:22:30.653716711 +0300 ---- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-05 11:24:16.764173966 +0300 -*************** -*** 78,84 **** - .line 65 - new-instance v0, Landroid/content/Intent; - -! const-string v1, "https://discordapp.com/app" - - .line 67 - invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; ---- 78,84 ---- - .line 65 - new-instance v0, Landroid/content/Intent; - -! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" - - .line 67 - invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; diff --git a/patches/branding/README.md b/patches/branding/README.md index eea34792b..1b9c76475 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -72,23 +72,4 @@ You can use the following line to patch authorities: - 9.8.6 - 9.9.1 - 9.9.2 -- 9.9.3 -- 9.9.4 -- 9.9.6 -- 10.0.6 -- 10.0.7 -- 10.1.1 -- 10.1.2 -- 10.1.3 -- 10.1.5 -- 10.1.6 -- 10.1.9 -- 10.2.0 -- 10.2.1 -- 10.2.2 -- 10.2.3 -- 10.2.4 -- 10.2.5 -- 10.2.6 -- 10.2.9 diff --git a/old-patches/customdefaultemoji/884.patch b/patches/customdefaultemoji/884.patch similarity index 100% rename from old-patches/customdefaultemoji/884.patch rename to patches/customdefaultemoji/884.patch diff --git a/old-patches/customdefaultemoji/888.patch b/patches/customdefaultemoji/888.patch similarity index 100% rename from old-patches/customdefaultemoji/888.patch rename to patches/customdefaultemoji/888.patch diff --git a/old-patches/customdefaultemoji/896.patch b/patches/customdefaultemoji/896.patch similarity index 100% rename from old-patches/customdefaultemoji/896.patch rename to patches/customdefaultemoji/896.patch diff --git a/old-patches/customdefaultemoji/897.patch b/patches/customdefaultemoji/897.patch similarity index 100% rename from old-patches/customdefaultemoji/897.patch rename to patches/customdefaultemoji/897.patch diff --git a/old-patches/customdefaultemoji/898.patch b/patches/customdefaultemoji/898.patch similarity index 100% rename from old-patches/customdefaultemoji/898.patch rename to patches/customdefaultemoji/898.patch diff --git a/old-patches/customdefaultemoji/899.patch b/patches/customdefaultemoji/899.patch similarity index 100% rename from old-patches/customdefaultemoji/899.patch rename to patches/customdefaultemoji/899.patch diff --git a/old-patches/customdefaultemoji/900.patch b/patches/customdefaultemoji/900.patch similarity index 100% rename from old-patches/customdefaultemoji/900.patch rename to patches/customdefaultemoji/900.patch diff --git a/old-patches/customdefaultemoji/901.patch b/patches/customdefaultemoji/901.patch similarity index 100% rename from old-patches/customdefaultemoji/901.patch rename to patches/customdefaultemoji/901.patch diff --git a/old-patches/customdefaultemoji/902.patch b/patches/customdefaultemoji/902.patch similarity index 100% rename from old-patches/customdefaultemoji/902.patch rename to patches/customdefaultemoji/902.patch diff --git a/old-patches/customdefaultemoji/903.patch b/patches/customdefaultemoji/903.patch similarity index 100% rename from old-patches/customdefaultemoji/903.patch rename to patches/customdefaultemoji/903.patch diff --git a/old-patches/customdefaultemoji/904.patch b/patches/customdefaultemoji/904.patch similarity index 100% rename from old-patches/customdefaultemoji/904.patch rename to patches/customdefaultemoji/904.patch diff --git a/old-patches/customdefaultemoji/906.patch b/patches/customdefaultemoji/906.patch similarity index 100% rename from old-patches/customdefaultemoji/906.patch rename to patches/customdefaultemoji/906.patch diff --git a/old-patches/customdefaultemoji/909.patch b/patches/customdefaultemoji/909.patch similarity index 100% rename from old-patches/customdefaultemoji/909.patch rename to patches/customdefaultemoji/909.patch diff --git a/old-patches/customdefaultemoji/910.patch b/patches/customdefaultemoji/910.patch similarity index 100% rename from old-patches/customdefaultemoji/910.patch rename to patches/customdefaultemoji/910.patch diff --git a/old-patches/customdefaultemoji/938.patch b/patches/customdefaultemoji/938.patch similarity index 100% rename from old-patches/customdefaultemoji/938.patch rename to patches/customdefaultemoji/938.patch diff --git a/old-patches/customdefaultemoji/939.patch b/patches/customdefaultemoji/939.patch similarity index 100% rename from old-patches/customdefaultemoji/939.patch rename to patches/customdefaultemoji/939.patch diff --git a/old-patches/customdefaultemoji/940.patch b/patches/customdefaultemoji/940.patch similarity index 100% rename from old-patches/customdefaultemoji/940.patch rename to patches/customdefaultemoji/940.patch diff --git a/old-patches/customdefaultemoji/942.patch b/patches/customdefaultemoji/942.patch similarity index 100% rename from old-patches/customdefaultemoji/942.patch rename to patches/customdefaultemoji/942.patch diff --git a/old-patches/customdefaultemoji/943.patch b/patches/customdefaultemoji/943.patch similarity index 100% rename from old-patches/customdefaultemoji/943.patch rename to patches/customdefaultemoji/943.patch diff --git a/old-patches/customdefaultemoji/945.patch b/patches/customdefaultemoji/945.patch similarity index 100% rename from old-patches/customdefaultemoji/945.patch rename to patches/customdefaultemoji/945.patch diff --git a/old-patches/customdefaultemoji/946.patch b/patches/customdefaultemoji/946.patch similarity index 100% rename from old-patches/customdefaultemoji/946.patch rename to patches/customdefaultemoji/946.patch diff --git a/old-patches/customdefaultemoji/947.patch b/patches/customdefaultemoji/947.patch similarity index 100% rename from old-patches/customdefaultemoji/947.patch rename to patches/customdefaultemoji/947.patch diff --git a/old-patches/customdefaultemoji/948.patch b/patches/customdefaultemoji/948.patch similarity index 100% rename from old-patches/customdefaultemoji/948.patch rename to patches/customdefaultemoji/948.patch diff --git a/old-patches/customdefaultemoji/963.patch b/patches/customdefaultemoji/963.patch similarity index 100% rename from old-patches/customdefaultemoji/963.patch rename to patches/customdefaultemoji/963.patch diff --git a/old-patches/customdefaultemoji/964.patch b/patches/customdefaultemoji/964.patch similarity index 100% rename from old-patches/customdefaultemoji/964.patch rename to patches/customdefaultemoji/964.patch diff --git a/old-patches/customdefaultemoji/965.patch b/patches/customdefaultemoji/965.patch similarity index 100% rename from old-patches/customdefaultemoji/965.patch rename to patches/customdefaultemoji/965.patch diff --git a/old-patches/customdefaultemoji/966.patch b/patches/customdefaultemoji/966.patch similarity index 100% rename from old-patches/customdefaultemoji/966.patch rename to patches/customdefaultemoji/966.patch diff --git a/old-patches/customdefaultemoji/967.patch b/patches/customdefaultemoji/967.patch similarity index 100% rename from old-patches/customdefaultemoji/967.patch rename to patches/customdefaultemoji/967.patch diff --git a/old-patches/customdefaultemoji/968.patch b/patches/customdefaultemoji/968.patch similarity index 100% rename from old-patches/customdefaultemoji/968.patch rename to patches/customdefaultemoji/968.patch diff --git a/old-patches/customdefaultemoji/970.patch b/patches/customdefaultemoji/970.patch similarity index 100% rename from old-patches/customdefaultemoji/970.patch rename to patches/customdefaultemoji/970.patch diff --git a/old-patches/customdefaultemoji/980.patch b/patches/customdefaultemoji/980.patch similarity index 100% rename from old-patches/customdefaultemoji/980.patch rename to patches/customdefaultemoji/980.patch diff --git a/old-patches/customdefaultemoji/984.patch b/patches/customdefaultemoji/984.patch similarity index 100% rename from old-patches/customdefaultemoji/984.patch rename to patches/customdefaultemoji/984.patch diff --git a/old-patches/customdefaultemoji/986.patch b/patches/customdefaultemoji/986.patch similarity index 100% rename from old-patches/customdefaultemoji/986.patch rename to patches/customdefaultemoji/986.patch diff --git a/old-patches/customdefaultemoji/991.patch b/patches/customdefaultemoji/991.patch similarity index 100% rename from old-patches/customdefaultemoji/991.patch rename to patches/customdefaultemoji/991.patch diff --git a/old-patches/customdefaultemoji/992.patch b/patches/customdefaultemoji/992.patch similarity index 100% rename from old-patches/customdefaultemoji/992.patch rename to patches/customdefaultemoji/992.patch diff --git a/old-patches/customdefaultemoji/README.md b/patches/customdefaultemoji/README.md similarity index 86% rename from old-patches/customdefaultemoji/README.md rename to patches/customdefaultemoji/README.md index 8d0cac3c7..f642715a4 100644 --- a/old-patches/customdefaultemoji/README.md +++ b/patches/customdefaultemoji/README.md @@ -38,12 +38,4 @@ This patch changes default list of custom emojis. - 9.8.6 - 9.9.1 - 9.9.2 -- 9.9.3 -- 9.9.4 -- 9.9.6 -- 10.0.6 -- 10.0.7 -- 10.1.1 -- 10.1.2 -- 10.1.3 diff --git a/patches/customtheme/1006.patch b/patches/customtheme/1006.patch deleted file mode 100644 index d9d54b71b..000000000 --- a/patches/customtheme/1006.patch +++ /dev/null @@ -1,280 +0,0 @@ -diff -crB com.discord-1006-base/res/drawable/drawable_overlay_channels_active.xml com.discord-1006/res/drawable/drawable_overlay_channels_active.xml -*** com.discord-1006-base/res/drawable/drawable_overlay_channels_active.xml 2019-12-13 11:10:54.057438867 +0300 ---- com.discord-1006/res/drawable/drawable_overlay_channels_active.xml 2019-12-13 12:24:14.692722949 +0300 -*************** -*** 3,9 **** - xmlns:android="http://schemas.android.com/apk/res/android"> - - -! - - - ---- 3,9 ---- - xmlns:android="http://schemas.android.com/apk/res/android"> - - -! - - - -diff -crB com.discord-1006-base/res/values/colors.xml com.discord-1006/res/values/colors.xml -*** com.discord-1006-base/res/values/colors.xml 2019-12-13 11:10:55.210779031 +0300 ---- com.discord-1006/res/values/colors.xml 2019-12-13 12:24:14.692722949 +0300 -*************** -*** 52,58 **** - #37000000 - #ff657b83 - #ff333333 -! #ff1d1d1d - #40000000 - #40ffffff - @android:color/white ---- 52,58 ---- - #37000000 - #ff657b83 - #ff333333 -! #ff000000 - #40000000 - #40ffffff - @android:color/white -*************** -*** 63,70 **** - #1f000000 - #90000000 - #de000000 -! #ff36393e -! #ff303337 - #14000000 - #ff3f51b5 - #ff303f9f ---- 63,70 ---- - #1f000000 - #90000000 - #de000000 -! #ff000000 -! #ff000000 - #14000000 - #ff3f51b5 - #ff303f9f -*************** -*** 98,106 **** - #ff4f545c - #0d4f545c - #4d4f545c -! #ff282b30 -! #ff2e3136 -! #ff1e2124 - #ff8a8e94 - #6680cbc4 - #66009688 ---- 98,106 ---- - #ff4f545c - #0d4f545c - #4d4f545c -! #ff000000 -! #ff000000 -! #ff000000 - #ff8a8e94 - #6680cbc4 - #66009688 -*************** -*** 108,114 **** - #fff47b67 - #ff45ddc0 - #ff021f25 -! #ff00b0f4 - #ff0067e0 - #ff37474f - #ff263238 ---- 108,114 ---- - #fff47b67 - #ff45ddc0 - #ff021f25 -! #ff50f148 - #ff0067e0 - #ff37474f - #ff263238 -*************** -*** 152,169 **** - #ff72767d - #4d72767d - #9972767d -! #ff4f545c -! #4d4f545c -! #994f545c - #ff40444b -! #ff36393f -! #9936393f -! #ff2f3136 -! #992f3136 -! #e62f3136 - #ff292b2f -! #ff202225 -! #99202225 - #ff18191c - #9918191c - #e618191c ---- 152,169 ---- - #ff72767d - #4d72767d - #9972767d -! #ff0f0f0f -! #4d0f0f0f -! #99404040 - #ff40444b -! #ff000000 -! #99000000 -! #ff000000 -! #99000000 -! #e6000000 - #ff292b2f -! #ff0f0f0f -! #990f0f0f - #ff18191c - #9918191c - #e618191c -*************** -*** 194,202 **** - #de000000 - #4dffffff - #39000000 -! #ff738bd7 -! #1a738bd7 -! #ff697ec4 - #ffc9d2f0 - #ff5161ff - #4d5c6a9e ---- 194,202 ---- - #de000000 - #4dffffff - #39000000 -! #ff9c4249 -! #1a9c4249 -! #ff000000 - #ffc9d2f0 - #ff5161ff - #4d5c6a9e -*************** -*** 259,265 **** - #ffbdbdbd - #ffbdbdbd - #fff1f1f1 -! #e6616161 - #e6ffffff - @android:color/transparent - #ff593695 ---- 259,265 ---- - #ffbdbdbd - #ffbdbdbd - #fff1f1f1 -! #e6000000 - #e6ffffff - @android:color/transparent - #ff593695 -Only in com.discord-1006/res/values: colors.xml.orig -diff -crB com.discord-1006-base/res/values/styles.xml com.discord-1006/res/values/styles.xml -*** com.discord-1006-base/res/values/styles.xml 2019-12-13 11:10:55.260779327 +0300 ---- com.discord-1006/res/values/styles.xml 2019-12-13 12:24:14.692722949 +0300 -*************** -*** 381,387 **** - @color/white_alpha_40 - @drawable/ic_backspace_white_24dp - @color/primary_500 -! #ff34373c - @color/grey_unread - @color/grey_channels - @color/grey_account ---- 381,387 ---- - @color/white_alpha_40 - @drawable/ic_backspace_white_24dp - @color/primary_500 -! @color/primary_500 - @color/grey_unread - @color/grey_channels - @color/grey_account -*************** -*** 393,404 **** - @color/chat_input_button_tint_colors_dark - @drawable/drawable_rect_rounded_dark - @color/dark_grey_2_alpha_10 -! #ff3e4145 - @drawable/ic_img_selected_dark_theme - @color/white_alpha_70 - @color/white_alpha_20 - @color/white -! #1afaa61a - @drawable/drawable_bg_reaction_dark - @drawable/drawable_reaction_text_color_dark - @color/primary_700 ---- 393,404 ---- - @color/chat_input_button_tint_colors_dark - @drawable/drawable_rect_rounded_dark - @color/dark_grey_2_alpha_10 -! @color/primary_600 - @drawable/ic_img_selected_dark_theme - @color/white_alpha_70 - @color/white_alpha_20 - @color/white -! @color/purple_brand_alpha_10 - @drawable/drawable_bg_reaction_dark - @drawable/drawable_reaction_text_color_dark - @color/primary_700 -*************** -*** 461,467 **** - @color/brand_500 - @color/primary_100 - @color/primary_600 -! #ff2b2e31 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -