diff --git a/.gitignore b/.gitignore index e1cb701..e2b49e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,2 @@ patches/*/*-custom.patch patches/*/*.patch-failed -resources/distok/versionlogs/* -!resources/distok/versionlogs/.gitkeep -resources/fdroid/repo/icons/*.xml -*.apk diff --git a/resources/patches/slashcommands/code/gradlew b/resources/patches/slashcommands/code/gradlew old mode 100755 new mode 100644 diff --git a/resources/patches/supplemental/87202.patch b/resources/patches/supplemental/87202.patch index b8d912e..9a4e77e 100644 --- a/resources/patches/supplemental/87202.patch +++ b/resources/patches/supplemental/87202.patch @@ -83,7 +83,7 @@ diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/dis + + const-string v1, "CACHE_KEY_CTC_LEAK_CHANNELS" + -+ const/4 v2, 0x0 ++ const/4 v2, 0x1 + + invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z + @@ -124,7 +124,7 @@ diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/dis + + const-string v1, "CACHE_KEY_CTC_IMAGE_SPOILER" + -+ const/4 v2, 0x0 ++ const/4 v2, 0x1 + + invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z + @@ -165,7 +165,7 @@ diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/dis + + const-string v1, "CACHE_KEY_CTC_NO_DELETE" + -+ const/4 v2, 0x0 ++ const/4 v2, 0x1 + + invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z + @@ -385,10 +385,10 @@ diff -crB from/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali to/s + + move-result-object p0 + -+ # this only works for a single image -+ const/4 v1, 0x0 ++ # I commented this out and do this in StoreMessages now as this'd only work for a single image ++ # const/4 v1, 0x0 + -+ invoke-virtual {v0, v1}, Lcom/discord/stores/StoreUserSettings;->setImageSpoiler(Z)V ++ # invoke-virtual {v0, v1}, Lcom/discord/stores/StoreUserSettings;->setImageSpoiler(Z)V + + :cond_1 + return-object p0 diff --git a/resources/scripts/ctcci/ctcci.py b/resources/scripts/ctcci/ctcci.py old mode 100755 new mode 100644