diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index a2e9d28a49..cd55a8edbe 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-866.apk +apkFileName: com.discord-867.apk compressionType: false doNotCompress: - arsc @@ -469,5 +469,5 @@ usesFramework: tag: null version: 2.4.1-cc194d-SNAPSHOT versionInfo: - versionCode: '866' - versionName: 8.6.6 + versionCode: '867' + versionName: 8.6.7 diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties index 54f24d83e9..dcf927ad1a 100644 --- a/com.discord/assets/crashlytics-build.properties +++ b/com.discord/assets/crashlytics-build.properties @@ -3,9 +3,9 @@ # #Do NOT modify, delete, or commit to source control! # -#Tue Mar 26 23:54:18 UTC 2019 -version_name=8.6.6 +#Wed Mar 27 00:41:00 UTC 2019 +version_name=8.6.7 package_name=com.discord -build_id=671801b2-1a32-48f5-aacb-290d26418580 -version_code=866 +build_id=7289bfde-43b1-4441-a606-756039a6f7cc +version_code=867 app_name=com.discord diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index 13a0032cd7..3a44e6d4c9 100644 Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ diff --git a/com.discord/res/layout-v17/widget_payment_source_edit_dialog.xml b/com.discord/res/layout-v17/widget_payment_source_edit_dialog.xml index 727e42e467..fe2a94ccec 100644 --- a/com.discord/res/layout-v17/widget_payment_source_edit_dialog.xml +++ b/com.discord/res/layout-v17/widget_payment_source_edit_dialog.xml @@ -2,7 +2,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/com.discord/res/layout-v22/widget_payment_source_edit_dialog.xml b/com.discord/res/layout-v22/widget_payment_source_edit_dialog.xml index ffa978ef7f..4758f8ead3 100644 --- a/com.discord/res/layout-v22/widget_payment_source_edit_dialog.xml +++ b/com.discord/res/layout-v22/widget_payment_source_edit_dialog.xml @@ -2,7 +2,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/com.discord/res/layout/widget_payment_source_edit_dialog.xml b/com.discord/res/layout/widget_payment_source_edit_dialog.xml index ea28312153..f2384cafde 100644 --- a/com.discord/res/layout/widget_payment_source_edit_dialog.xml +++ b/com.discord/res/layout/widget_payment_source_edit_dialog.xml @@ -2,7 +2,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index 4cd31540a5..84cae60442 100644 --- a/com.discord/res/values/strings.xml +++ b/com.discord/res/values/strings.xml @@ -966,7 +966,7 @@ HERE ARE MORE THINGS {progress} Unable to sync cloud saves OR Collapse Category - 671801b2-1a32-48f5-aacb-290d26418580 + 7289bfde-43b1-4441-a606-756039a6f7cc Coming Soon Granular notification control only works on desktop apps at the moment. For now use the iOS notification settings. COMING SOON! diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali index 2a5200861f..40adec2fdb 100644 --- a/com.discord/smali/com/discord/BuildConfig.smali +++ b/com.discord/smali/com/discord/BuildConfig.smali @@ -30,11 +30,11 @@ .field public static final LOCAL_VOICE:Ljava/lang/String; = "" -.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/866" +.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/867" -.field public static final VERSION_CODE:I = 0x362 +.field public static final VERSION_CODE:I = 0x363 -.field public static final VERSION_NAME:Ljava/lang/String; = "8.6.6" +.field public static final VERSION_NAME:Ljava/lang/String; = "8.6.7" # direct methods diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali index f774e187a2..179d982757 100644 --- a/com.discord/smali/com/discord/stores/StoreClientVersion.smali +++ b/com.discord/smali/com/discord/stores/StoreClientVersion.smali @@ -28,7 +28,7 @@ invoke-direct {p0}, Lcom/discord/stores/Store;->()V - const/16 v0, 0x362 + const/16 v0, 0x363 iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali index e52d45bbe3..34b2b5fb27 100644 --- a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali +++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali @@ -181,7 +181,7 @@ const-string v1, "browser_user_agent" - const-string v2, "Discord-Android/866" + const-string v2, "Discord-Android/867" invoke-static {v1, v2}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; @@ -193,7 +193,7 @@ const-string v1, "client_build_number" - const/16 v2, 0x362 + const/16 v2, 0x363 invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -209,7 +209,7 @@ const-string v1, "client_version" - const-string v2, "8.6.6" + const-string v2, "8.6.7" invoke-static {v1, v2}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali index 6db65d76d4..01e3927c44 100644 --- a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali +++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali @@ -167,7 +167,7 @@ .method public final getUserAgent()Ljava/lang/String; .locals 1 - const-string v0, "Discord-Android/866" + const-string v0, "Discord-Android/867" return-object v0 .end method diff --git a/com.discord/smali/com/discord/utilities/view/validators/BasicTextInputValidator$Companion$createMinCharactersRequiredInputValidator$1.smali b/com.discord/smali/com/discord/utilities/view/validators/BasicTextInputValidator$Companion$createMinCharactersRequiredInputValidator$1.smali deleted file mode 100644 index f63c5a730d..0000000000 --- a/com.discord/smali/com/discord/utilities/view/validators/BasicTextInputValidator$Companion$createMinCharactersRequiredInputValidator$1.smali +++ /dev/null @@ -1,88 +0,0 @@ -.class final Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion$createMinCharactersRequiredInputValidator$1; -.super Lkotlin/jvm/internal/k; -.source "BasicTextInputValidator.kt" - -# interfaces -.implements Lkotlin/jvm/functions/Function1; - - -# annotations -.annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createMinCharactersRequiredInputValidator(II)Lcom/discord/utilities/view/validators/BasicTextInputValidator; -.end annotation - -.annotation system Ldalvik/annotation/InnerClass; - accessFlags = 0x18 - name = null -.end annotation - -.annotation system Ldalvik/annotation/Signature; - value = { - "Lkotlin/jvm/internal/k;", - "Lkotlin/jvm/functions/Function1<", - "Ljava/lang/String;", - "Ljava/lang/Boolean;", - ">;" - } -.end annotation - - -# instance fields -.field final synthetic $minCharCount:I - - -# direct methods -.method constructor (I)V - .locals 0 - - iput p1, p0, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion$createMinCharactersRequiredInputValidator$1;->$minCharCount:I - - const/4 p1, 0x1 - - invoke-direct {p0, p1}, Lkotlin/jvm/internal/k;->(I)V - - return-void -.end method - - -# virtual methods -.method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; - .locals 0 - - check-cast p1, Ljava/lang/String; - - invoke-virtual {p0, p1}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion$createMinCharactersRequiredInputValidator$1;->invoke(Ljava/lang/String;)Z - - move-result p1 - - invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean; - - move-result-object p1 - - return-object p1 -.end method - -.method public final invoke(Ljava/lang/String;)Z - .locals 1 - - const-string v0, "it" - - invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-virtual {p1}, Ljava/lang/String;->length()I - - move-result p1 - - iget v0, p0, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion$createMinCharactersRequiredInputValidator$1;->$minCharCount:I - - if-gt p1, v0, :cond_0 - - const/4 p1, 0x1 - - return p1 - - :cond_0 - const/4 p1, 0x0 - - return p1 -.end method diff --git a/com.discord/smali/com/discord/utilities/view/validators/BasicTextInputValidator$Companion.smali b/com.discord/smali/com/discord/utilities/view/validators/BasicTextInputValidator$Companion.smali index 22da7f24f7..e6efcb2814 100644 --- a/com.discord/smali/com/discord/utilities/view/validators/BasicTextInputValidator$Companion.smali +++ b/com.discord/smali/com/discord/utilities/view/validators/BasicTextInputValidator$Companion.smali @@ -33,26 +33,6 @@ # virtual methods -.method public final createMinCharactersRequiredInputValidator(II)Lcom/discord/utilities/view/validators/BasicTextInputValidator; - .locals 2 - .param p2 # I - .annotation build Landroidx/annotation/StringRes; - .end annotation - .end param - - new-instance v0, Lcom/discord/utilities/view/validators/BasicTextInputValidator; - - new-instance v1, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion$createMinCharactersRequiredInputValidator$1; - - invoke-direct {v1, p1}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion$createMinCharactersRequiredInputValidator$1;->(I)V - - check-cast v1, Lkotlin/jvm/functions/Function1; - - invoke-direct {v0, p2, v1}, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->(ILkotlin/jvm/functions/Function1;)V - - return-object v0 -.end method - .method public final createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator; .locals 2 .param p1 # I diff --git a/com.discord/smali/com/discord/views/LoadingButton.smali b/com.discord/smali/com/discord/views/LoadingButton.smali index 0a7c7ee551..a115cd172c 100644 --- a/com.discord/smali/com/discord/views/LoadingButton.smali +++ b/com.discord/smali/com/discord/views/LoadingButton.smali @@ -311,6 +311,8 @@ if-eqz p1, :cond_0 + invoke-virtual {p0, v0}, Lcom/discord/views/LoadingButton;->setClickable(Z)V + invoke-direct {p0}, Lcom/discord/views/LoadingButton;->getTextView()Landroid/widget/TextView; move-result-object p1 @@ -328,6 +330,10 @@ return-void :cond_0 + const/4 p1, 0x1 + + invoke-virtual {p0, p1}, Lcom/discord/views/LoadingButton;->setClickable(Z)V + invoke-direct {p0}, Lcom/discord/views/LoadingButton;->getTextView()Landroid/widget/TextView; move-result-object p1 diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali index 4b0f3205f8..2db7c4da35 100644 --- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali +++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali @@ -512,7 +512,7 @@ new-array v2, v0, [Ljava/lang/Object; - const-string v4, "8.6.6" + const-string v4, "8.6.7" aput-object v4, v2, v3 diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali index 9bb487949c..486f6eefde 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali @@ -1424,7 +1424,7 @@ invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v2, " - 8.6.6 (866)" + const-string v2, " - 8.6.7 (867)" invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.smali index 0649b11a21..9afe3dbc9a 100644 --- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.smali +++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.smali @@ -1646,7 +1646,7 @@ .end method .method private final initValidator(Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItem;)V - .locals 12 + .locals 10 invoke-virtual {p1}, Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItem;->component1()Lcom/discord/models/domain/ModelPaymentSource; @@ -1666,7 +1666,7 @@ move-result-object v4 - const/4 v5, 0x2 + const/4 v5, 0x1 new-array v6, v5, [Lcom/discord/utilities/view/validators/InputValidator; @@ -1684,22 +1684,6 @@ aput-object v7, v6, v8 - sget-object v7, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion; - - const/4 v9, 0x3 - - const v10, 0x7f12052e - - invoke-virtual {v7, v9, v10}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createMinCharactersRequiredInputValidator(II)Lcom/discord/utilities/view/validators/BasicTextInputValidator; - - move-result-object v7 - - check-cast v7, Lcom/discord/utilities/view/validators/InputValidator; - - const/4 v10, 0x1 - - aput-object v7, v6, v10 - invoke-direct {v2, v3, v4, v6}, Lcom/discord/utilities/view/validators/Input$TextInputLayoutInput;->(Ljava/lang/String;Lcom/google/android/material/textfield/TextInputLayout;[Lcom/discord/utilities/view/validators/InputValidator;)V check-cast v2, Lcom/discord/utilities/view/validators/Input; @@ -1714,41 +1698,13 @@ move-result-object v4 - new-array v6, v10, [Lcom/discord/utilities/view/validators/InputValidator; + new-array v6, v5, [Lcom/discord/utilities/view/validators/InputValidator; sget-object v7, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion; - const v11, 0x7f1202a6 + const v9, 0x7f1202a6 - invoke-virtual {v7, v11}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator; - - move-result-object v7 - - check-cast v7, Lcom/discord/utilities/view/validators/InputValidator; - - aput-object v7, v6, v8 - - invoke-direct {v2, v3, v4, v6}, Lcom/discord/utilities/view/validators/Input$TextInputLayoutInput;->(Ljava/lang/String;Lcom/google/android/material/textfield/TextInputLayout;[Lcom/discord/utilities/view/validators/InputValidator;)V - - check-cast v2, Lcom/discord/utilities/view/validators/Input; - - aput-object v2, v1, v10 - - new-instance v2, Lcom/discord/utilities/view/validators/Input$TextInputLayoutInput; - - const-string v3, "city" - - invoke-direct {p0}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getCityInput()Lcom/google/android/material/textfield/TextInputLayout; - - move-result-object v4 - - new-array v6, v10, [Lcom/discord/utilities/view/validators/InputValidator; - - sget-object v7, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion; - - const v11, 0x7f1202a9 - - invoke-virtual {v7, v11}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator; + invoke-virtual {v7, v9}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator; move-result-object v7 @@ -1764,15 +1720,45 @@ new-instance v2, Lcom/discord/utilities/view/validators/Input$TextInputLayoutInput; + const-string v3, "city" + + invoke-direct {p0}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getCityInput()Lcom/google/android/material/textfield/TextInputLayout; + + move-result-object v4 + + new-array v6, v5, [Lcom/discord/utilities/view/validators/InputValidator; + + sget-object v7, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion; + + const v9, 0x7f1202a9 + + invoke-virtual {v7, v9}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator; + + move-result-object v7 + + check-cast v7, Lcom/discord/utilities/view/validators/InputValidator; + + aput-object v7, v6, v8 + + invoke-direct {v2, v3, v4, v6}, Lcom/discord/utilities/view/validators/Input$TextInputLayoutInput;->(Ljava/lang/String;Lcom/google/android/material/textfield/TextInputLayout;[Lcom/discord/utilities/view/validators/InputValidator;)V + + check-cast v2, Lcom/discord/utilities/view/validators/Input; + + const/4 v3, 0x2 + + aput-object v2, v1, v3 + + new-instance v2, Lcom/discord/utilities/view/validators/Input$TextInputLayoutInput; + const-string v3, "state" invoke-direct {p0}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getStateInput()Lcom/google/android/material/textfield/TextInputLayout; move-result-object v4 - new-array v5, v10, [Lcom/discord/utilities/view/validators/InputValidator; + new-array v6, v5, [Lcom/discord/utilities/view/validators/InputValidator; - sget-object v6, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion; + sget-object v7, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion; invoke-virtual {p1}, Lcom/discord/models/domain/ModelPaymentSource;->getBillingAddress()Lcom/discord/models/domain/ModelBillingAddress; @@ -1782,9 +1768,9 @@ move-result-object p1 - const-string v7, "CA" + const-string v9, "CA" - invoke-static {p1, v7}, Lkotlin/jvm/internal/j;->n(Ljava/lang/Object;Ljava/lang/Object;)Z + invoke-static {p1, v9}, Lkotlin/jvm/internal/j;->n(Ljava/lang/Object;Ljava/lang/Object;)Z move-result p1 @@ -1798,19 +1784,21 @@ const p1, 0x7f1202b6 :goto_0 - invoke-virtual {v6, p1}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator; + invoke-virtual {v7, p1}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator; move-result-object p1 check-cast p1, Lcom/discord/utilities/view/validators/InputValidator; - aput-object p1, v5, v8 + aput-object p1, v6, v8 - invoke-direct {v2, v3, v4, v5}, Lcom/discord/utilities/view/validators/Input$TextInputLayoutInput;->(Ljava/lang/String;Lcom/google/android/material/textfield/TextInputLayout;[Lcom/discord/utilities/view/validators/InputValidator;)V + invoke-direct {v2, v3, v4, v6}, Lcom/discord/utilities/view/validators/Input$TextInputLayoutInput;->(Ljava/lang/String;Lcom/google/android/material/textfield/TextInputLayout;[Lcom/discord/utilities/view/validators/InputValidator;)V check-cast v2, Lcom/discord/utilities/view/validators/Input; - aput-object v2, v1, v9 + const/4 p1, 0x3 + + aput-object v2, v1, p1 const/4 p1, 0x4 @@ -1822,7 +1810,7 @@ move-result-object v4 - new-array v5, v10, [Lcom/discord/utilities/view/validators/InputValidator; + new-array v5, v5, [Lcom/discord/utilities/view/validators/InputValidator; sget-object v6, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;