Changes of com.discord v1280
This commit is contained in:
root
parent
d85ec4ac24
commit
0698471595
35 changed files with 1199 additions and 531 deletions
|
|
@ -1930,7 +1930,7 @@
|
|||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
const-string v0, " - 41.10 (1279)"
|
||||
const-string v0, " - 41.11 (1280)"
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
|
|
|
|||
|
|
@ -2686,29 +2686,7 @@
|
|||
:goto_c
|
||||
invoke-virtual {v9, v14}, Landroid/view/View;->setVisibility(I)V
|
||||
|
||||
if-eqz v2, :cond_d
|
||||
|
||||
invoke-virtual {v2}, Lcom/discord/models/domain/billing/ModelInvoicePreview;->getTotal()I
|
||||
|
||||
move-result v2
|
||||
|
||||
goto :goto_d
|
||||
|
||||
:cond_d
|
||||
const/4 v2, 0x0
|
||||
|
||||
:goto_d
|
||||
invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
|
||||
|
||||
move-result-object v9
|
||||
|
||||
invoke-static {v9, v12}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
invoke-static {v2, v9}, Lcom/discord/utilities/billing/PremiumUtilsKt;->getFormattedPrice(ILandroid/content/Context;)Ljava/lang/CharSequence;
|
||||
|
||||
move-result-object v2
|
||||
|
||||
if-eqz v1, :cond_12
|
||||
if-eqz v1, :cond_11
|
||||
|
||||
invoke-static {v1}, Lcom/discord/views/ActiveSubscriptionView;->c(Lcom/discord/models/domain/ModelSubscription;)Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;
|
||||
|
||||
|
|
@ -2720,34 +2698,34 @@
|
|||
|
||||
invoke-interface {v10, v14}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
|
||||
|
||||
move-result-object v10
|
||||
move-result-object v14
|
||||
|
||||
check-cast v10, Lcom/android/billingclient/api/SkuDetails;
|
||||
check-cast v14, Lcom/android/billingclient/api/SkuDetails;
|
||||
|
||||
if-eqz v10, :cond_e
|
||||
if-eqz v14, :cond_d
|
||||
|
||||
invoke-virtual {v10}, Lcom/android/billingclient/api/SkuDetails;->a()Ljava/lang/String;
|
||||
invoke-virtual {v14}, Lcom/android/billingclient/api/SkuDetails;->a()Ljava/lang/String;
|
||||
|
||||
move-result-object v10
|
||||
move-result-object v14
|
||||
|
||||
goto :goto_e
|
||||
goto :goto_d
|
||||
|
||||
:cond_d
|
||||
const/4 v14, 0x0
|
||||
|
||||
:goto_d
|
||||
if-eqz v7, :cond_e
|
||||
|
||||
if-eqz v14, :cond_e
|
||||
|
||||
move-object v13, v14
|
||||
|
||||
goto :goto_f
|
||||
|
||||
:cond_e
|
||||
const/4 v10, 0x0
|
||||
sget-object v14, Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;->PREMIUM:Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;
|
||||
|
||||
:goto_e
|
||||
if-eqz v7, :cond_f
|
||||
|
||||
if-eqz v10, :cond_f
|
||||
|
||||
move-object v13, v10
|
||||
|
||||
goto :goto_10
|
||||
|
||||
:cond_f
|
||||
sget-object v10, Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;->PREMIUM:Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;
|
||||
|
||||
if-ne v9, v10, :cond_10
|
||||
if-ne v9, v14, :cond_f
|
||||
|
||||
const v9, 0x7f12131b
|
||||
|
||||
|
|
@ -2755,19 +2733,19 @@
|
|||
|
||||
move-result-object v9
|
||||
|
||||
const-string v10, "getString(R.string.premium_tier_2)"
|
||||
const-string v13, "getString(R.string.premium_tier_2)"
|
||||
|
||||
invoke-static {v9, v10}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
invoke-static {v9, v13}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
:goto_f
|
||||
:goto_e
|
||||
move-object v13, v9
|
||||
|
||||
goto :goto_10
|
||||
goto :goto_f
|
||||
|
||||
:cond_10
|
||||
sget-object v10, Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;->PREMIUM_CLASSIC:Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;
|
||||
:cond_f
|
||||
sget-object v14, Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;->PREMIUM_CLASSIC:Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;
|
||||
|
||||
if-ne v9, v10, :cond_11
|
||||
if-ne v9, v14, :cond_10
|
||||
|
||||
const v9, 0x7f12131a
|
||||
|
||||
|
|
@ -2775,16 +2753,16 @@
|
|||
|
||||
move-result-object v9
|
||||
|
||||
const-string v10, "getString(R.string.premium_tier_1)"
|
||||
const-string v13, "getString(R.string.premium_tier_1)"
|
||||
|
||||
invoke-static {v9, v10}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
invoke-static {v9, v13}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
goto :goto_f
|
||||
goto :goto_e
|
||||
|
||||
:cond_11
|
||||
sget-object v10, Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;->PREMIUM_GUILD:Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;
|
||||
:cond_10
|
||||
sget-object v14, Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;->PREMIUM_GUILD:Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;
|
||||
|
||||
if-ne v9, v10, :cond_12
|
||||
if-ne v9, v14, :cond_11
|
||||
|
||||
const v9, 0x7f12129f
|
||||
|
||||
|
|
@ -2792,15 +2770,15 @@
|
|||
|
||||
move-result-object v9
|
||||
|
||||
const-string v10, "getString(R.string.premi\u2026guild_subscription_title)"
|
||||
const-string v13, "getString(R.string.premi\u2026guild_subscription_title)"
|
||||
|
||||
invoke-static {v9, v10}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
invoke-static {v9, v13}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
goto :goto_f
|
||||
goto :goto_e
|
||||
|
||||
:cond_12
|
||||
:goto_10
|
||||
if-eqz v6, :cond_13
|
||||
:cond_11
|
||||
:goto_f
|
||||
if-eqz v6, :cond_12
|
||||
|
||||
const v2, 0x7f1202e7
|
||||
|
||||
|
|
@ -2808,68 +2786,68 @@
|
|||
|
||||
move-result-object v2
|
||||
|
||||
const/4 v10, 0x0
|
||||
const/4 v11, 0x0
|
||||
|
||||
goto :goto_14
|
||||
goto :goto_15
|
||||
|
||||
:cond_13
|
||||
if-eqz v5, :cond_19
|
||||
:cond_12
|
||||
if-eqz v5, :cond_1a
|
||||
|
||||
if-eqz v1, :cond_14
|
||||
if-eqz v1, :cond_13
|
||||
|
||||
invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscription;->getStatus()Lcom/discord/models/domain/ModelSubscription$Status;
|
||||
|
||||
move-result-object v5
|
||||
|
||||
goto :goto_10
|
||||
|
||||
:cond_13
|
||||
const/4 v5, 0x0
|
||||
|
||||
:goto_10
|
||||
if-nez v5, :cond_14
|
||||
|
||||
goto :goto_11
|
||||
|
||||
:cond_14
|
||||
const/4 v5, 0x0
|
||||
|
||||
:goto_11
|
||||
if-nez v5, :cond_15
|
||||
|
||||
goto :goto_12
|
||||
|
||||
:cond_15
|
||||
invoke-virtual {v5}, Ljava/lang/Enum;->ordinal()I
|
||||
|
||||
move-result v5
|
||||
|
||||
const/4 v9, 0x2
|
||||
|
||||
if-eq v5, v3, :cond_18
|
||||
if-eq v5, v3, :cond_17
|
||||
|
||||
if-eq v5, v9, :cond_17
|
||||
if-eq v5, v9, :cond_16
|
||||
|
||||
if-eq v5, v11, :cond_16
|
||||
if-eq v5, v11, :cond_15
|
||||
|
||||
:goto_12
|
||||
goto :goto_13
|
||||
:goto_11
|
||||
goto :goto_14
|
||||
|
||||
:cond_16
|
||||
:cond_15
|
||||
const v2, 0x7f1212ec
|
||||
|
||||
new-array v5, v3, [Ljava/lang/Object;
|
||||
|
||||
const/4 v10, 0x0
|
||||
const/4 v11, 0x0
|
||||
|
||||
aput-object v4, v5, v10
|
||||
aput-object v4, v5, v11
|
||||
|
||||
invoke-virtual {v0, v2, v5}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
|
||||
|
||||
move-result-object v2
|
||||
|
||||
goto :goto_14
|
||||
goto :goto_15
|
||||
|
||||
:cond_17
|
||||
const/4 v10, 0x0
|
||||
:cond_16
|
||||
const/4 v11, 0x0
|
||||
|
||||
const v2, 0x7f1212ef
|
||||
|
||||
new-array v5, v9, [Ljava/lang/Object;
|
||||
|
||||
aput-object v13, v5, v10
|
||||
aput-object v13, v5, v11
|
||||
|
||||
aput-object v4, v5, v3
|
||||
|
||||
|
|
@ -2877,59 +2855,91 @@
|
|||
|
||||
move-result-object v2
|
||||
|
||||
goto :goto_14
|
||||
goto :goto_15
|
||||
|
||||
:cond_18
|
||||
const/4 v10, 0x0
|
||||
:cond_17
|
||||
const/4 v11, 0x0
|
||||
|
||||
const v5, 0x7f1212f1
|
||||
|
||||
new-array v9, v9, [Ljava/lang/Object;
|
||||
|
||||
aput-object v4, v9, v10
|
||||
aput-object v4, v9, v11
|
||||
|
||||
aput-object v2, v9, v3
|
||||
invoke-direct {v0, v1, v10}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getGoogleSubscriptionRenewalPrice(Lcom/discord/models/domain/ModelSubscription;Ljava/util/Map;)Ljava/lang/String;
|
||||
|
||||
move-result-object v4
|
||||
|
||||
if-eqz v4, :cond_18
|
||||
|
||||
goto :goto_13
|
||||
|
||||
:cond_18
|
||||
if-eqz v2, :cond_19
|
||||
|
||||
invoke-virtual {v2}, Lcom/discord/models/domain/billing/ModelInvoicePreview;->getTotal()I
|
||||
|
||||
move-result v2
|
||||
|
||||
goto :goto_12
|
||||
|
||||
:cond_19
|
||||
const/4 v2, 0x0
|
||||
|
||||
:goto_12
|
||||
invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
|
||||
|
||||
move-result-object v4
|
||||
|
||||
invoke-static {v4, v12}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
invoke-static {v2, v4}, Lcom/discord/utilities/billing/PremiumUtilsKt;->getFormattedPrice(ILandroid/content/Context;)Ljava/lang/CharSequence;
|
||||
|
||||
move-result-object v4
|
||||
|
||||
:goto_13
|
||||
aput-object v4, v9, v3
|
||||
|
||||
invoke-virtual {v0, v5, v9}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
|
||||
|
||||
move-result-object v2
|
||||
|
||||
goto :goto_14
|
||||
goto :goto_15
|
||||
|
||||
:cond_19
|
||||
:goto_13
|
||||
const/4 v10, 0x0
|
||||
:cond_1a
|
||||
:goto_14
|
||||
const/4 v11, 0x0
|
||||
|
||||
const/4 v2, 0x0
|
||||
|
||||
:goto_14
|
||||
:goto_15
|
||||
move-object v15, v2
|
||||
|
||||
invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBillingInfoTv()Landroid/widget/TextView;
|
||||
|
||||
move-result-object v2
|
||||
|
||||
if-eqz v15, :cond_1a
|
||||
|
||||
goto :goto_15
|
||||
|
||||
:cond_1a
|
||||
const/4 v3, 0x0
|
||||
|
||||
:goto_15
|
||||
if-eqz v3, :cond_1b
|
||||
|
||||
const/4 v3, 0x0
|
||||
if-eqz v15, :cond_1b
|
||||
|
||||
goto :goto_16
|
||||
|
||||
:cond_1b
|
||||
const/16 v3, 0x8
|
||||
const/4 v3, 0x0
|
||||
|
||||
:goto_16
|
||||
if-eqz v3, :cond_1c
|
||||
|
||||
const/4 v3, 0x0
|
||||
|
||||
goto :goto_17
|
||||
|
||||
:cond_1c
|
||||
const/16 v3, 0x8
|
||||
|
||||
:goto_17
|
||||
invoke-virtual {v2, v3}, Landroid/view/View;->setVisibility(I)V
|
||||
|
||||
if-eqz v15, :cond_1c
|
||||
if-eqz v15, :cond_1d
|
||||
|
||||
invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBillingInfoTv()Landroid/widget/TextView;
|
||||
|
||||
|
|
@ -2959,12 +2969,12 @@
|
|||
|
||||
invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
|
||||
|
||||
:cond_1c
|
||||
:cond_1d
|
||||
invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBillingBtn()Landroid/widget/Button;
|
||||
|
||||
move-result-object v2
|
||||
|
||||
if-eqz v6, :cond_1d
|
||||
if-eqz v6, :cond_1e
|
||||
|
||||
const v3, 0x7f1202e6
|
||||
|
||||
|
|
@ -2972,12 +2982,12 @@
|
|||
|
||||
move-result-object v3
|
||||
|
||||
goto :goto_17
|
||||
goto :goto_18
|
||||
|
||||
:cond_1d
|
||||
:cond_1e
|
||||
const/4 v3, 0x0
|
||||
|
||||
:goto_17
|
||||
:goto_18
|
||||
invoke-static {v2, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
|
||||
|
||||
invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBillingBtn()Landroid/widget/Button;
|
||||
|
|
@ -2994,32 +3004,32 @@
|
|||
|
||||
move-result-object v2
|
||||
|
||||
if-eqz v8, :cond_1e
|
||||
if-eqz v8, :cond_1f
|
||||
|
||||
const/4 v3, 0x0
|
||||
|
||||
goto :goto_18
|
||||
goto :goto_19
|
||||
|
||||
:cond_1e
|
||||
:cond_1f
|
||||
const/16 v3, 0x8
|
||||
|
||||
:goto_18
|
||||
:goto_19
|
||||
invoke-virtual {v2, v3}, Landroid/view/View;->setVisibility(I)V
|
||||
|
||||
invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBillingGooglePlayManage()Landroid/widget/TextView;
|
||||
|
||||
move-result-object v2
|
||||
|
||||
if-eqz v7, :cond_1f
|
||||
if-eqz v7, :cond_20
|
||||
|
||||
const/4 v4, 0x0
|
||||
|
||||
goto :goto_19
|
||||
goto :goto_1a
|
||||
|
||||
:cond_1f
|
||||
:cond_20
|
||||
const/16 v4, 0x8
|
||||
|
||||
:goto_19
|
||||
:goto_1a
|
||||
invoke-virtual {v2, v4}, Landroid/view/View;->setVisibility(I)V
|
||||
|
||||
invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBillingGooglePlayManage()Landroid/widget/TextView;
|
||||
|
|
@ -3641,6 +3651,96 @@
|
|||
return-object v0
|
||||
.end method
|
||||
|
||||
.method private final getGoogleSubscriptionRenewalPrice(Lcom/discord/models/domain/ModelSubscription;Ljava/util/Map;)Ljava/lang/String;
|
||||
.locals 3
|
||||
.annotation system Ldalvik/annotation/Signature;
|
||||
value = {
|
||||
"(",
|
||||
"Lcom/discord/models/domain/ModelSubscription;",
|
||||
"Ljava/util/Map<",
|
||||
"Ljava/lang/String;",
|
||||
"+",
|
||||
"Lcom/android/billingclient/api/SkuDetails;",
|
||||
">;)",
|
||||
"Ljava/lang/String;"
|
||||
}
|
||||
.end annotation
|
||||
|
||||
invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscription;->isGoogleSubscription()Z
|
||||
|
||||
move-result v0
|
||||
|
||||
const/4 v1, 0x0
|
||||
|
||||
if-nez v0, :cond_0
|
||||
|
||||
return-object v1
|
||||
|
||||
:cond_0
|
||||
invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscription;->getPaymentGatewayPlanId()Ljava/lang/String;
|
||||
|
||||
move-result-object v0
|
||||
|
||||
invoke-interface {p2, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
|
||||
|
||||
move-result-object v0
|
||||
|
||||
check-cast v0, Lcom/android/billingclient/api/SkuDetails;
|
||||
|
||||
invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscription;->getRenewalMutations()Lcom/discord/models/domain/ModelSubscription$SubscriptionRenewalMutations;
|
||||
|
||||
move-result-object v2
|
||||
|
||||
if-eqz v2, :cond_1
|
||||
|
||||
invoke-virtual {v2}, Lcom/discord/models/domain/ModelSubscription$SubscriptionRenewalMutations;->getPaymentGatewayPlanId()Ljava/lang/String;
|
||||
|
||||
move-result-object v2
|
||||
|
||||
goto :goto_0
|
||||
|
||||
:cond_1
|
||||
move-object v2, v1
|
||||
|
||||
:goto_0
|
||||
invoke-interface {p2, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
|
||||
|
||||
move-result-object p2
|
||||
|
||||
check-cast p2, Lcom/android/billingclient/api/SkuDetails;
|
||||
|
||||
invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscription;->getRenewalMutations()Lcom/discord/models/domain/ModelSubscription$SubscriptionRenewalMutations;
|
||||
|
||||
move-result-object v2
|
||||
|
||||
if-eqz v2, :cond_2
|
||||
|
||||
if-eqz p2, :cond_2
|
||||
|
||||
invoke-virtual {p2}, Lcom/android/billingclient/api/SkuDetails;->b()Ljava/lang/String;
|
||||
|
||||
move-result-object v1
|
||||
|
||||
goto :goto_1
|
||||
|
||||
:cond_2
|
||||
invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscription;->getRenewalMutations()Lcom/discord/models/domain/ModelSubscription$SubscriptionRenewalMutations;
|
||||
|
||||
move-result-object p1
|
||||
|
||||
if-nez p1, :cond_3
|
||||
|
||||
if-eqz v0, :cond_3
|
||||
|
||||
invoke-virtual {v0}, Lcom/android/billingclient/api/SkuDetails;->b()Ljava/lang/String;
|
||||
|
||||
move-result-object v1
|
||||
|
||||
:cond_3
|
||||
:goto_1
|
||||
return-object v1
|
||||
.end method
|
||||
|
||||
.method private final getGrandfathered()Landroid/widget/TextView;
|
||||
.locals 3
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue