From 51f1e9079ba78b87f129148ab9001decb48c6b35 Mon Sep 17 00:00:00 2001 From: Ave Ozkal Date: Fri, 13 Dec 2019 12:26:27 +0300 Subject: [PATCH] 10.0.6 smalltime is gone. --- README.md | 2 +- old-patches/README.md | 1 + .../smalltime/1006.patch-failed | 0 {patches => old-patches}/smalltime/835.patch | 0 {patches => old-patches}/smalltime/836.patch | 0 {patches => old-patches}/smalltime/839.patch | 0 {patches => old-patches}/smalltime/841.patch | 0 {patches => old-patches}/smalltime/842.patch | 0 {patches => old-patches}/smalltime/843.patch | 0 {patches => old-patches}/smalltime/844.patch | 0 {patches => old-patches}/smalltime/845.patch | 0 {patches => old-patches}/smalltime/848.patch | 0 {patches => old-patches}/smalltime/850.patch | 0 {patches => old-patches}/smalltime/851.patch | 0 {patches => old-patches}/smalltime/853.patch | 0 {patches => old-patches}/smalltime/854.patch | 0 {patches => old-patches}/smalltime/855.patch | 0 {patches => old-patches}/smalltime/856.patch | 0 {patches => old-patches}/smalltime/876.patch | 0 {patches => old-patches}/smalltime/884.patch | 0 {patches => old-patches}/smalltime/888.patch | 0 .../smalltime/896.patch | 0 .../smalltime/897.patch | 0 .../smalltime/898.patch | 0 .../smalltime/899.patch | 0 .../smalltime/900.patch | 0 .../smalltime/901.patch | 0 .../smalltime/902.patch | 0 .../smalltime/903.patch | 0 .../smalltime/904.patch | 0 .../smalltime/906.patch | 0 .../smalltime/909.patch | 0 .../smalltime/910.patch | 0 .../smalltime/938.patch | 0 .../smalltime/939.patch | 0 .../smalltime/940.patch | 0 .../smalltime/942.patch | 0 .../smalltime/943.patch | 0 .../smalltime/945.patch | 0 .../smalltime/946.patch | 0 .../smalltime/947.patch | 0 .../smalltime/948.patch | 0 .../smalltime/963.patch | 0 .../smalltime/964.patch | 0 .../smalltime/965.patch | 0 .../smalltime/966.patch | 0 .../smalltime/967.patch | 0 .../smalltime/968.patch | 0 .../smalltime/970.patch | 0 .../smalltime/980.patch | 0 .../smalltime/984.patch | 0 .../smalltime/986.patch | 0 .../smalltime/991.patch | 0 .../smalltime/992.patch | 0 .../smalltime/993.patch | 0 .../smalltime/994.patch | 0 old-patches/smalltime/996.patch | 190 + old-patches/smalltime/998.patch-failed | 190 + {patches => old-patches}/smalltime/README.md | 1 + patches/branding/1006.patch | 230 + patches/branding/README.md | 1 + patches/customdefaultemoji/1006.patch | 43 + patches/customdefaultemoji/README.md | 1 + patches/customtheme/1006.patch | 280 + patches/customtheme/README.md | 1 + patches/customversion/1006.patch | 20 + patches/customversion/README.md | 1 + patches/disable-mobileindicator/1006.patch | 23 + patches/disable-mobileindicator/README.md | 2 + patches/experiments/1006.patch | 199 + patches/experiments/README.md | 1 + patches/litecord/1006.patch | 296 + patches/litecord/README.md | 3 +- patches/mutant/1006.patch | 52096 ++++++++++++++++ patches/mutant/README.md | 1 + patches/necessary/1006.patch | 14 + patches/noblocked/1006.patch | 18 + patches/noblocked/README.md | 1 + patches/nonearby/1006.patch | 86 + patches/nonearby/README.md | 1 + patches/noprofilestrip/1006.patch | 52 + patches/noprofilestrip/README.md | 1 + patches/nospoiler/1006.patch | 74 + patches/nospoiler/README.md | 1 + patches/notrack/1006.patch | 1557 + patches/notrack/README.md | 1 + patches/nozlib/1006.patch | 38 + patches/nozlib/README.md | 4 +- patches/slashcommands/1006.patch | 2794 + patches/slashcommands/README.md | 1 + patches/squareavatars/1006.patch | 21 + patches/squareavatars/README.md | 1 + patches/supplemental/1006.patch | 432 + patches/supplemental/README.md | 1 + patches/tokenlogin/1006.patch | 33 + patches/tokenlogin/README.md | 1 + patchport-state.json | 2 +- 97 files changed, 58710 insertions(+), 6 deletions(-) rename patches/smalltime/896.patch => old-patches/smalltime/1006.patch-failed (100%) rename {patches => old-patches}/smalltime/835.patch (100%) rename {patches => old-patches}/smalltime/836.patch (100%) rename {patches => old-patches}/smalltime/839.patch (100%) rename {patches => old-patches}/smalltime/841.patch (100%) rename {patches => old-patches}/smalltime/842.patch (100%) rename {patches => old-patches}/smalltime/843.patch (100%) rename {patches => old-patches}/smalltime/844.patch (100%) rename {patches => old-patches}/smalltime/845.patch (100%) rename {patches => old-patches}/smalltime/848.patch (100%) rename {patches => old-patches}/smalltime/850.patch (100%) rename {patches => old-patches}/smalltime/851.patch (100%) rename {patches => old-patches}/smalltime/853.patch (100%) rename {patches => old-patches}/smalltime/854.patch (100%) rename {patches => old-patches}/smalltime/855.patch (100%) rename {patches => old-patches}/smalltime/856.patch (100%) rename {patches => old-patches}/smalltime/876.patch (100%) rename {patches => old-patches}/smalltime/884.patch (100%) rename {patches => old-patches}/smalltime/888.patch (100%) rename patches/smalltime/897.patch => old-patches/smalltime/896.patch (100%) rename patches/smalltime/898.patch => old-patches/smalltime/897.patch (100%) rename patches/smalltime/899.patch => old-patches/smalltime/898.patch (100%) rename patches/smalltime/900.patch => old-patches/smalltime/899.patch (100%) rename patches/smalltime/901.patch => old-patches/smalltime/900.patch (100%) rename patches/smalltime/902.patch => old-patches/smalltime/901.patch (100%) rename patches/smalltime/903.patch => old-patches/smalltime/902.patch (100%) rename patches/smalltime/904.patch => old-patches/smalltime/903.patch (100%) rename patches/smalltime/906.patch => old-patches/smalltime/904.patch (100%) rename patches/smalltime/909.patch => old-patches/smalltime/906.patch (100%) rename patches/smalltime/910.patch => old-patches/smalltime/909.patch (100%) rename patches/smalltime/938.patch => old-patches/smalltime/910.patch (100%) rename patches/smalltime/939.patch => old-patches/smalltime/938.patch (100%) rename patches/smalltime/940.patch => old-patches/smalltime/939.patch (100%) rename patches/smalltime/942.patch => old-patches/smalltime/940.patch (100%) rename patches/smalltime/943.patch => old-patches/smalltime/942.patch (100%) rename patches/smalltime/945.patch => old-patches/smalltime/943.patch (100%) rename patches/smalltime/946.patch => old-patches/smalltime/945.patch (100%) rename patches/smalltime/947.patch => old-patches/smalltime/946.patch (100%) rename patches/smalltime/948.patch => old-patches/smalltime/947.patch (100%) rename patches/smalltime/963.patch => old-patches/smalltime/948.patch (100%) rename patches/smalltime/964.patch => old-patches/smalltime/963.patch (100%) rename patches/smalltime/965.patch => old-patches/smalltime/964.patch (100%) rename patches/smalltime/966.patch => old-patches/smalltime/965.patch (100%) rename patches/smalltime/967.patch => old-patches/smalltime/966.patch (100%) rename patches/smalltime/968.patch => old-patches/smalltime/967.patch (100%) rename patches/smalltime/970.patch => old-patches/smalltime/968.patch (100%) rename patches/smalltime/980.patch => old-patches/smalltime/970.patch (100%) rename patches/smalltime/984.patch => old-patches/smalltime/980.patch (100%) rename patches/smalltime/986.patch => old-patches/smalltime/984.patch (100%) rename patches/smalltime/991.patch => old-patches/smalltime/986.patch (100%) rename patches/smalltime/992.patch => old-patches/smalltime/991.patch (100%) rename patches/smalltime/993.patch => old-patches/smalltime/992.patch (100%) rename patches/smalltime/994.patch => old-patches/smalltime/993.patch (100%) rename patches/smalltime/996.patch => old-patches/smalltime/994.patch (100%) create mode 100644 old-patches/smalltime/996.patch create mode 100644 old-patches/smalltime/998.patch-failed rename {patches => old-patches}/smalltime/README.md (98%) create mode 100644 patches/branding/1006.patch create mode 100644 patches/customdefaultemoji/1006.patch create mode 100644 patches/customtheme/1006.patch create mode 100644 patches/customversion/1006.patch create mode 100644 patches/disable-mobileindicator/1006.patch create mode 100644 patches/experiments/1006.patch create mode 100644 patches/litecord/1006.patch create mode 100644 patches/mutant/1006.patch create mode 100644 patches/necessary/1006.patch create mode 100644 patches/noblocked/1006.patch create mode 100644 patches/nonearby/1006.patch create mode 100644 patches/noprofilestrip/1006.patch create mode 100644 patches/nospoiler/1006.patch create mode 100644 patches/notrack/1006.patch create mode 100644 patches/nozlib/1006.patch create mode 100644 patches/slashcommands/1006.patch create mode 100644 patches/squareavatars/1006.patch create mode 100644 patches/supplemental/1006.patch create mode 100644 patches/tokenlogin/1006.patch diff --git a/README.md b/README.md index 93835c9..d7eced6 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Modular Client Mod for Discord's Android app. -**Latest supported Discord Android version:** 9.9.6 (996), released on 2019-12-05. +**Latest supported Discord Android version:** 10.0.6 (1006), released on 2019-12-13. New patch development will be done for the latest supported version. diff --git a/old-patches/README.md b/old-patches/README.md index bd6a6c3..9ac89c5 100644 --- a/old-patches/README.md +++ b/old-patches/README.md @@ -7,3 +7,4 @@ 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. diff --git a/patches/smalltime/896.patch b/old-patches/smalltime/1006.patch-failed similarity index 100% rename from patches/smalltime/896.patch rename to old-patches/smalltime/1006.patch-failed diff --git a/patches/smalltime/835.patch b/old-patches/smalltime/835.patch similarity index 100% rename from patches/smalltime/835.patch rename to old-patches/smalltime/835.patch diff --git a/patches/smalltime/836.patch b/old-patches/smalltime/836.patch similarity index 100% rename from patches/smalltime/836.patch rename to old-patches/smalltime/836.patch diff --git a/patches/smalltime/839.patch b/old-patches/smalltime/839.patch similarity index 100% rename from patches/smalltime/839.patch rename to old-patches/smalltime/839.patch diff --git a/patches/smalltime/841.patch b/old-patches/smalltime/841.patch similarity index 100% rename from patches/smalltime/841.patch rename to old-patches/smalltime/841.patch diff --git a/patches/smalltime/842.patch b/old-patches/smalltime/842.patch similarity index 100% rename from patches/smalltime/842.patch rename to old-patches/smalltime/842.patch diff --git a/patches/smalltime/843.patch b/old-patches/smalltime/843.patch similarity index 100% rename from patches/smalltime/843.patch rename to old-patches/smalltime/843.patch diff --git a/patches/smalltime/844.patch b/old-patches/smalltime/844.patch similarity index 100% rename from patches/smalltime/844.patch rename to old-patches/smalltime/844.patch diff --git a/patches/smalltime/845.patch b/old-patches/smalltime/845.patch similarity index 100% rename from patches/smalltime/845.patch rename to old-patches/smalltime/845.patch diff --git a/patches/smalltime/848.patch b/old-patches/smalltime/848.patch similarity index 100% rename from patches/smalltime/848.patch rename to old-patches/smalltime/848.patch diff --git a/patches/smalltime/850.patch b/old-patches/smalltime/850.patch similarity index 100% rename from patches/smalltime/850.patch rename to old-patches/smalltime/850.patch diff --git a/patches/smalltime/851.patch b/old-patches/smalltime/851.patch similarity index 100% rename from patches/smalltime/851.patch rename to old-patches/smalltime/851.patch diff --git a/patches/smalltime/853.patch b/old-patches/smalltime/853.patch similarity index 100% rename from patches/smalltime/853.patch rename to old-patches/smalltime/853.patch diff --git a/patches/smalltime/854.patch b/old-patches/smalltime/854.patch similarity index 100% rename from patches/smalltime/854.patch rename to old-patches/smalltime/854.patch diff --git a/patches/smalltime/855.patch b/old-patches/smalltime/855.patch similarity index 100% rename from patches/smalltime/855.patch rename to old-patches/smalltime/855.patch diff --git a/patches/smalltime/856.patch b/old-patches/smalltime/856.patch similarity index 100% rename from patches/smalltime/856.patch rename to old-patches/smalltime/856.patch diff --git a/patches/smalltime/876.patch b/old-patches/smalltime/876.patch similarity index 100% rename from patches/smalltime/876.patch rename to old-patches/smalltime/876.patch diff --git a/patches/smalltime/884.patch b/old-patches/smalltime/884.patch similarity index 100% rename from patches/smalltime/884.patch rename to old-patches/smalltime/884.patch diff --git a/patches/smalltime/888.patch b/old-patches/smalltime/888.patch similarity index 100% rename from patches/smalltime/888.patch rename to old-patches/smalltime/888.patch diff --git a/patches/smalltime/897.patch b/old-patches/smalltime/896.patch similarity index 100% rename from patches/smalltime/897.patch rename to old-patches/smalltime/896.patch diff --git a/patches/smalltime/898.patch b/old-patches/smalltime/897.patch similarity index 100% rename from patches/smalltime/898.patch rename to old-patches/smalltime/897.patch diff --git a/patches/smalltime/899.patch b/old-patches/smalltime/898.patch similarity index 100% rename from patches/smalltime/899.patch rename to old-patches/smalltime/898.patch diff --git a/patches/smalltime/900.patch b/old-patches/smalltime/899.patch similarity index 100% rename from patches/smalltime/900.patch rename to old-patches/smalltime/899.patch diff --git a/patches/smalltime/901.patch b/old-patches/smalltime/900.patch similarity index 100% rename from patches/smalltime/901.patch rename to old-patches/smalltime/900.patch diff --git a/patches/smalltime/902.patch b/old-patches/smalltime/901.patch similarity index 100% rename from patches/smalltime/902.patch rename to old-patches/smalltime/901.patch diff --git a/patches/smalltime/903.patch b/old-patches/smalltime/902.patch similarity index 100% rename from patches/smalltime/903.patch rename to old-patches/smalltime/902.patch diff --git a/patches/smalltime/904.patch b/old-patches/smalltime/903.patch similarity index 100% rename from patches/smalltime/904.patch rename to old-patches/smalltime/903.patch diff --git a/patches/smalltime/906.patch b/old-patches/smalltime/904.patch similarity index 100% rename from patches/smalltime/906.patch rename to old-patches/smalltime/904.patch diff --git a/patches/smalltime/909.patch b/old-patches/smalltime/906.patch similarity index 100% rename from patches/smalltime/909.patch rename to old-patches/smalltime/906.patch diff --git a/patches/smalltime/910.patch b/old-patches/smalltime/909.patch similarity index 100% rename from patches/smalltime/910.patch rename to old-patches/smalltime/909.patch diff --git a/patches/smalltime/938.patch b/old-patches/smalltime/910.patch similarity index 100% rename from patches/smalltime/938.patch rename to old-patches/smalltime/910.patch diff --git a/patches/smalltime/939.patch b/old-patches/smalltime/938.patch similarity index 100% rename from patches/smalltime/939.patch rename to old-patches/smalltime/938.patch diff --git a/patches/smalltime/940.patch b/old-patches/smalltime/939.patch similarity index 100% rename from patches/smalltime/940.patch rename to old-patches/smalltime/939.patch diff --git a/patches/smalltime/942.patch b/old-patches/smalltime/940.patch similarity index 100% rename from patches/smalltime/942.patch rename to old-patches/smalltime/940.patch diff --git a/patches/smalltime/943.patch b/old-patches/smalltime/942.patch similarity index 100% rename from patches/smalltime/943.patch rename to old-patches/smalltime/942.patch diff --git a/patches/smalltime/945.patch b/old-patches/smalltime/943.patch similarity index 100% rename from patches/smalltime/945.patch rename to old-patches/smalltime/943.patch diff --git a/patches/smalltime/946.patch b/old-patches/smalltime/945.patch similarity index 100% rename from patches/smalltime/946.patch rename to old-patches/smalltime/945.patch diff --git a/patches/smalltime/947.patch b/old-patches/smalltime/946.patch similarity index 100% rename from patches/smalltime/947.patch rename to old-patches/smalltime/946.patch diff --git a/patches/smalltime/948.patch b/old-patches/smalltime/947.patch similarity index 100% rename from patches/smalltime/948.patch rename to old-patches/smalltime/947.patch diff --git a/patches/smalltime/963.patch b/old-patches/smalltime/948.patch similarity index 100% rename from patches/smalltime/963.patch rename to old-patches/smalltime/948.patch diff --git a/patches/smalltime/964.patch b/old-patches/smalltime/963.patch similarity index 100% rename from patches/smalltime/964.patch rename to old-patches/smalltime/963.patch diff --git a/patches/smalltime/965.patch b/old-patches/smalltime/964.patch similarity index 100% rename from patches/smalltime/965.patch rename to old-patches/smalltime/964.patch diff --git a/patches/smalltime/966.patch b/old-patches/smalltime/965.patch similarity index 100% rename from patches/smalltime/966.patch rename to old-patches/smalltime/965.patch diff --git a/patches/smalltime/967.patch b/old-patches/smalltime/966.patch similarity index 100% rename from patches/smalltime/967.patch rename to old-patches/smalltime/966.patch diff --git a/patches/smalltime/968.patch b/old-patches/smalltime/967.patch similarity index 100% rename from patches/smalltime/968.patch rename to old-patches/smalltime/967.patch diff --git a/patches/smalltime/970.patch b/old-patches/smalltime/968.patch similarity index 100% rename from patches/smalltime/970.patch rename to old-patches/smalltime/968.patch diff --git a/patches/smalltime/980.patch b/old-patches/smalltime/970.patch similarity index 100% rename from patches/smalltime/980.patch rename to old-patches/smalltime/970.patch diff --git a/patches/smalltime/984.patch b/old-patches/smalltime/980.patch similarity index 100% rename from patches/smalltime/984.patch rename to old-patches/smalltime/980.patch diff --git a/patches/smalltime/986.patch b/old-patches/smalltime/984.patch similarity index 100% rename from patches/smalltime/986.patch rename to old-patches/smalltime/984.patch diff --git a/patches/smalltime/991.patch b/old-patches/smalltime/986.patch similarity index 100% rename from patches/smalltime/991.patch rename to old-patches/smalltime/986.patch diff --git a/patches/smalltime/992.patch b/old-patches/smalltime/991.patch similarity index 100% rename from patches/smalltime/992.patch rename to old-patches/smalltime/991.patch diff --git a/patches/smalltime/993.patch b/old-patches/smalltime/992.patch similarity index 100% rename from patches/smalltime/993.patch rename to old-patches/smalltime/992.patch diff --git a/patches/smalltime/994.patch b/old-patches/smalltime/993.patch similarity index 100% rename from patches/smalltime/994.patch rename to old-patches/smalltime/993.patch diff --git a/patches/smalltime/996.patch b/old-patches/smalltime/994.patch similarity index 100% rename from patches/smalltime/996.patch rename to old-patches/smalltime/994.patch diff --git a/old-patches/smalltime/996.patch b/old-patches/smalltime/996.patch new file mode 100644 index 0000000..417c8d6 --- /dev/null +++ b/old-patches/smalltime/996.patch @@ -0,0 +1,190 @@ +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 new file mode 100644 index 0000000..417c8d6 --- /dev/null +++ b/old-patches/smalltime/998.patch-failed @@ -0,0 +1,190 @@ +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/smalltime/README.md b/old-patches/smalltime/README.md similarity index 98% rename from patches/smalltime/README.md rename to old-patches/smalltime/README.md index 3ecee58..721faf0 100644 --- a/patches/smalltime/README.md +++ b/old-patches/smalltime/README.md @@ -57,4 +57,5 @@ This patch replaces the long time string with just a simple time string. This is - 9.9.3 - 9.9.4 - 9.9.6 +- 10.0.6 diff --git a/patches/branding/1006.patch b/patches/branding/1006.patch new file mode 100644 index 0000000..646c97e --- /dev/null +++ b/patches/branding/1006.patch @@ -0,0 +1,230 @@ +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 11:36:54.065993910 +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 ---- + + + +! +! +! + + + +\ No newline at end of file +Only in com.discord-1006: AndroidManifest.xml.orig +Only in com.discord-1006: AndroidManifest.xml.rej +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 11:35:25.605520577 +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 +Only in com.discord-1006: apktool.yml.orig +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 11:35:25.608853928 +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." +Only in com.discord-1006/res/values: strings.xml.orig +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 11:35:25.608853928 +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; +Only in com.discord-1006/smali/com/discord/utilities/captcha: CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali.orig + diff --git a/patches/branding/README.md b/patches/branding/README.md index 40e4b88..2d3a264 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -75,4 +75,5 @@ You can use the following line to patch authorities: - 9.9.3 - 9.9.4 - 9.9.6 +- 10.0.6 diff --git a/patches/customdefaultemoji/1006.patch b/patches/customdefaultemoji/1006.patch new file mode 100644 index 0000000..242a1ad --- /dev/null +++ b/patches/customdefaultemoji/1006.patch @@ -0,0 +1,43 @@ +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/patches/customdefaultemoji/README.md b/patches/customdefaultemoji/README.md index 2fa1cc9..7f413ce 100644 --- a/patches/customdefaultemoji/README.md +++ b/patches/customdefaultemoji/README.md @@ -41,4 +41,5 @@ This patch changes default list of custom emojis. - 9.9.3 - 9.9.4 - 9.9.6 +- 10.0.6 diff --git a/patches/customtheme/1006.patch b/patches/customtheme/1006.patch new file mode 100644 index 0000000..d9d54b7 --- /dev/null +++ b/patches/customtheme/1006.patch @@ -0,0 +1,280 @@ +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 + + + + + + +