distok/apkfuckery
2
4
Fork 0
Code Issues Pull requests Releases Wiki Activity

Changes of com.discord v1342

Browse source
This commit is contained in:
root 2020-11-21 09:09:15 +00:00
parent 47c2a54ada
commit 68330e16d7
14 changed files with 245 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

6
com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
View file

@ -175,7 +175,7 @@
const-string v3, "browser_user_agent"
const-string v4, "Discord-Android/1340"
const-string v4, "Discord-Android/1342"
invoke-direct {v2, v3, v4}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
@ -183,7 +183,7 @@
const/4 v1, 0x2
const/16 v2, 0x53c
const/16 v2, 0x53e
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@ -203,7 +203,7 @@
const-string v3, "client_version"
const-string v4, "49.13"
const-string v4, "49.14"
invoke-direct {v2, v3, v4}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V

141
com.discord/smali/com/discord/utilities/dsti/StickerUtils.smali
View file

@ -685,53 +685,45 @@
move-result-object v7
if-eqz v7, :cond_4
if-eqz v7, :cond_5
invoke-virtual {v7}, Lcom/discord/models/sticker/dto/ModelStickerPackStoreListing;->getSku()Lcom/discord/models/domain/ModelSku;
move-result-object v7
if-eqz v7, :cond_4
if-eqz v7, :cond_5
sget-object v8, Lcom/discord/utilities/billing/GooglePlayInAppSkus;->INSTANCE:Lcom/discord/utilities/billing/GooglePlayInAppSkus;
invoke-virtual {v8, v7, v4}, Lcom/discord/utilities/billing/GooglePlayInAppSkus;->getInAppSku(Lcom/discord/models/domain/ModelSku;Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;)Lcom/discord/utilities/billing/GooglePlayInAppSku;
move-result-object v8
if-eqz v8, :cond_3
new-instance v16, Lcom/discord/utilities/analytics/Traits$StoreSku;
new-instance v15, Lcom/discord/utilities/analytics/Traits$StoreSku;
invoke-virtual {v7}, Lcom/discord/models/domain/ModelSku;->getId()J
move-result-wide v10
move-result-wide v9
invoke-virtual {v7}, Lcom/discord/models/domain/ModelSku;->getType()I
move-result v12
move-result v11
invoke-virtual {v7}, Lcom/discord/models/domain/ModelSku;->getApplicationId()J
move-result-wide v13
move-result-wide v12
invoke-virtual {v7}, Lcom/discord/models/domain/ModelSku;->getName()Ljava/lang/String;
move-result-object v15
move-result-object v14
move-object/from16 v9, v16
move-object v8, v15
invoke-direct/range {v9 .. v15}, Lcom/discord/utilities/analytics/Traits$StoreSku;-><init>(JIJLjava/lang/String;)V
invoke-direct/range {v8 .. v14}, Lcom/discord/utilities/analytics/Traits$StoreSku;-><init>(JIJLjava/lang/String;)V
invoke-direct {v6, v3, v4, v5}, Lcom/discord/utilities/dsti/StickerUtils;->getShowUpsellDialogCallback(Lcom/discord/models/sticker/dto/ModelStickerPack;Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;)Lkotlin/jvm/functions/Function3;
move-result-object v7
move-result-object v14
invoke-virtual {v6, v3, v5}, Lcom/discord/utilities/dsti/StickerUtils;->isStickerPackFreeForPremiumTier(Lcom/discord/models/sticker/dto/ModelStickerPack;Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;)Z
move-result v9
move-result v8
if-eqz v9, :cond_0
if-eqz v8, :cond_0
sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
@ -741,90 +733,133 @@
invoke-virtual {v0, v3, v5}, Lcom/discord/stores/StoreStickers;->claimFreePack(Lcom/discord/models/sticker/dto/ModelStickerPack;Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;)V
goto :goto_0
goto/16 :goto_0
:cond_0
if-eqz v7, :cond_2
const-string v8, "Google Play In-App Sku not found for sticker pack sku: "
const/4 v4, 0x1
if-eqz v14, :cond_3
invoke-direct {v6, v2, v4}, Lcom/discord/utilities/dsti/StickerUtils;->getPaymentStartedLocationTrait(Lcom/discord/utilities/analytics/Traits$Location;Z)Lcom/discord/utilities/analytics/Traits$Location;
sget-object v4, Lcom/discord/utilities/billing/GooglePlayInAppSkus;->INSTANCE:Lcom/discord/utilities/billing/GooglePlayInAppSkus;
move-result-object v13
sget-object v9, Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;->NONE:Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;
invoke-virtual {v4, v7, v9}, Lcom/discord/utilities/billing/GooglePlayInAppSkus;->getInAppSku(Lcom/discord/models/domain/ModelSku;Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;)Lcom/discord/utilities/billing/GooglePlayInAppSku;
move-result-object v4
if-eqz v4, :cond_2
const/4 v7, 0x1
invoke-direct {v6, v2, v7}, Lcom/discord/utilities/dsti/StickerUtils;->getPaymentStartedLocationTrait(Lcom/discord/utilities/analytics/Traits$Location;Z)Lcom/discord/utilities/analytics/Traits$Location;
move-result-object v12
new-instance v2, Lcom/discord/utilities/dsti/StickerUtils$claimOrPurchaseStickerPack$onContinueClickListener$1;
invoke-direct {v2, v8, v1, v3, v5}, Lcom/discord/utilities/dsti/StickerUtils$claimOrPurchaseStickerPack$onContinueClickListener$1;-><init>(Lcom/discord/utilities/billing/GooglePlayInAppSku;Landroid/app/Activity;Lcom/discord/models/sticker/dto/ModelStickerPack;Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;)V
invoke-direct {v2, v4, v1, v3, v5}, Lcom/discord/utilities/dsti/StickerUtils$claimOrPurchaseStickerPack$onContinueClickListener$1;-><init>(Lcom/discord/utilities/billing/GooglePlayInAppSku;Landroid/app/Activity;Lcom/discord/models/sticker/dto/ModelStickerPack;Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;)V
invoke-virtual/range {p3 .. p3}, Lcom/discord/models/sticker/dto/ModelStickerPack;->isPremiumPack()Z
move-result v4
move-result v5
if-eqz v4, :cond_1
if-eqz v5, :cond_1
const/4 v2, 0x0
:cond_1
new-instance v4, Lcom/discord/utilities/dsti/StickerUtils$claimOrPurchaseStickerPack$onUpgradeClickListener$1;
new-instance v5, Lcom/discord/utilities/dsti/StickerUtils$claimOrPurchaseStickerPack$onUpgradeClickListener$1;
invoke-direct {v4, v1}, Lcom/discord/utilities/dsti/StickerUtils$claimOrPurchaseStickerPack$onUpgradeClickListener$1;-><init>(Landroid/app/Activity;)V
invoke-direct {v5, v1}, Lcom/discord/utilities/dsti/StickerUtils$claimOrPurchaseStickerPack$onUpgradeClickListener$1;-><init>(Landroid/app/Activity;)V
sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getGooglePlayPurchases()Lcom/discord/stores/StoreGooglePlayPurchases;
move-result-object v8
invoke-virtual {v4}, Lcom/discord/utilities/billing/GooglePlayInAppSku;->getPaymentGatewaySkuId()Ljava/lang/String;
move-result-object v9
invoke-virtual {v8}, Lcom/discord/utilities/billing/GooglePlayInAppSku;->getPaymentGatewaySkuId()Ljava/lang/String;
move-result-object v10
invoke-virtual/range {p3 .. p3}, Lcom/discord/models/sticker/dto/ModelStickerPack;->getSkuId()J
move-result-wide v11
move-result-wide v10
const-string/jumbo v15, "sticker"
const-string/jumbo v1, "sticker"
move-object/from16 v14, v16
move-object v13, v15
invoke-virtual/range {v9 .. v15}, Lcom/discord/stores/StoreGooglePlayPurchases;->trackPaymentStarted(Ljava/lang/String;JLcom/discord/utilities/analytics/Traits$Location;Lcom/discord/utilities/analytics/Traits$StoreSku;Ljava/lang/String;)V
move-object v3, v14
invoke-interface {v7, v0, v2, v4}, Lkotlin/jvm/functions/Function3;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
move-object v14, v1
invoke-virtual/range {v8 .. v14}, Lcom/discord/stores/StoreGooglePlayPurchases;->trackPaymentStarted(Ljava/lang/String;JLcom/discord/utilities/analytics/Traits$Location;Lcom/discord/utilities/analytics/Traits$StoreSku;Ljava/lang/String;)V
invoke-interface {v3, v0, v2, v5}, Lkotlin/jvm/functions/Function3;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
goto :goto_0
:cond_2
new-instance v0, Ljava/lang/Exception;
new-instance v1, Ljava/lang/StringBuilder;
invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
invoke-virtual {v1, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
invoke-virtual {v1, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
move-result-object v1
invoke-direct {v0, v1}, Ljava/lang/Exception;-><init>(Ljava/lang/String;)V
throw v0
:cond_3
sget-object v0, Lcom/discord/utilities/billing/GooglePlayInAppSkus;->INSTANCE:Lcom/discord/utilities/billing/GooglePlayInAppSkus;
invoke-virtual {v0, v7, v4}, Lcom/discord/utilities/billing/GooglePlayInAppSkus;->getInAppSku(Lcom/discord/models/domain/ModelSku;Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;)Lcom/discord/utilities/billing/GooglePlayInAppSku;
move-result-object v16
if-eqz v16, :cond_4
const/4 v0, 0x0
invoke-direct {v6, v2, v0}, Lcom/discord/utilities/dsti/StickerUtils;->getPaymentStartedLocationTrait(Lcom/discord/utilities/analytics/Traits$Location;Z)Lcom/discord/utilities/analytics/Traits$Location;
move-result-object v13
move-result-object v12
sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getGooglePlayPurchases()Lcom/discord/stores/StoreGooglePlayPurchases;
move-result-object v8
invoke-virtual/range {v16 .. v16}, Lcom/discord/utilities/billing/GooglePlayInAppSku;->getPaymentGatewaySkuId()Ljava/lang/String;
move-result-object v9
invoke-virtual {v8}, Lcom/discord/utilities/billing/GooglePlayInAppSku;->getPaymentGatewaySkuId()Ljava/lang/String;
move-result-object v10
invoke-virtual/range {p3 .. p3}, Lcom/discord/models/sticker/dto/ModelStickerPack;->getSkuId()J
move-result-wide v11
move-result-wide v10
const-string/jumbo v15, "sticker"
const-string/jumbo v14, "sticker"
move-object/from16 v14, v16
move-object v13, v15
invoke-virtual/range {v9 .. v15}, Lcom/discord/stores/StoreGooglePlayPurchases;->trackPaymentStarted(Ljava/lang/String;JLcom/discord/utilities/analytics/Traits$Location;Lcom/discord/utilities/analytics/Traits$StoreSku;Ljava/lang/String;)V
invoke-virtual/range {v8 .. v14}, Lcom/discord/stores/StoreGooglePlayPurchases;->trackPaymentStarted(Ljava/lang/String;JLcom/discord/utilities/analytics/Traits$Location;Lcom/discord/utilities/analytics/Traits$StoreSku;Ljava/lang/String;)V
move-object/from16 v0, p0
move-object/from16 v1, p1
move-object v2, v8
move-object/from16 v2, v16
move-object/from16 v3, p3
@ -837,16 +872,14 @@
:goto_0
return-void
:cond_3
:cond_4
new-instance v0, Ljava/lang/Exception;
new-instance v1, Ljava/lang/StringBuilder;
invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
const-string v2, "Google Play In-App Sku not found for sticker pack sku: "
invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
invoke-virtual {v1, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
invoke-virtual {v1, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
@ -858,7 +891,7 @@
throw v0
:cond_4
:cond_5
new-instance v0, Ljava/lang/Exception;
new-instance v1, Ljava/lang/StringBuilder;

2
com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali
View file

@ -159,7 +159,7 @@
.method public getUserAgent()Ljava/lang/String;
.locals 1
const-string v0, "Discord-Android/1340"
const-string v0, "Discord-Android/1342"
return-object v0
.end method