diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml
index 95c9087350..33a0fa91d8 100644
--- a/com.discord/apktool.yml
+++ b/com.discord/apktool.yml
@@ -1,5 +1,5 @@
!!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-1340.apk
+apkFileName: com.discord-1342.apk
compressionType: false
doNotCompress:
- resources.arsc
@@ -82,5 +82,5 @@ usesFramework:
tag: null
version: 2.4.2-83a459-SNAPSHOT
versionInfo:
- versionCode: '1340'
- versionName: '49.13'
+ versionCode: '1342'
+ versionName: '49.14'
diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml
index 6238c54e1b..83c1d290d1 100644
Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ
diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml
index aeffe70795..1e219c5c17 100644
--- a/com.discord/res/values/strings.xml
+++ b/com.discord/res/values/strings.xml
@@ -1207,7 +1207,7 @@ We’re here to make a good impression."
Presets
Select a color
Transparency
- 8cf0bcdc44634716a604c8a99f0cf01a
+ 3b3d252b7efd4d838d801e3ebc5919d2
Coming Soon
Search Animated GIFs on the Web
Text to search for
diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali
index 316cfb86d6..f781ba5a12 100644
--- a/com.discord/smali/com/discord/BuildConfig.smali
+++ b/com.discord/smali/com/discord/BuildConfig.smali
@@ -42,11 +42,11 @@
.field public static final SAMSUNGxDISCORD_CLIENT_ID:Ljava/lang/String; = "97t47j218f"
-.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1340"
+.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1342"
-.field public static final VERSION_CODE:I = 0x53c
+.field public static final VERSION_CODE:I = 0x53e
-.field public static final VERSION_NAME:Ljava/lang/String; = "49.13"
+.field public static final VERSION_NAME:Ljava/lang/String; = "49.14"
# direct methods
diff --git a/com.discord/smali/com/discord/app/App.smali b/com.discord/smali/com/discord/app/App.smali
index fb9e615ad4..b67038db46 100644
--- a/com.discord/smali/com/discord/app/App.smali
+++ b/com.discord/smali/com/discord/app/App.smali
@@ -81,7 +81,7 @@
sget-object v0, Lcom/discord/utilities/buildutils/BuildUtils;->INSTANCE:Lcom/discord/utilities/buildutils/BuildUtils;
- const-string v2, "49.13"
+ const-string v2, "49.14"
invoke-virtual {v0, v2}, Lcom/discord/utilities/buildutils/BuildUtils;->isValidBuildVersionName(Ljava/lang/String;)Z
diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali
index 3f63a3b63a..5466d9b428 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, 0x53c
+ const/16 v0, 0x53e
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 b156502b24..52ec4a185a 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
@@ -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;->(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;->(Ljava/lang/Object;Ljava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/utilities/dsti/StickerUtils.smali b/com.discord/smali/com/discord/utilities/dsti/StickerUtils.smali
index c1b83af6b3..24c7f3c5c1 100644
--- a/com.discord/smali/com/discord/utilities/dsti/StickerUtils.smali
+++ b/com.discord/smali/com/discord/utilities/dsti/StickerUtils.smali
@@ -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;->(JIJLjava/lang/String;)V
+ invoke-direct/range {v8 .. v14}, Lcom/discord/utilities/analytics/Traits$StoreSku;->(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;->(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;->(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;->(Landroid/app/Activity;)V
+ invoke-direct {v5, v1}, Lcom/discord/utilities/dsti/StickerUtils$claimOrPurchaseStickerPack$onUpgradeClickListener$1;->(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;->()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;->(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;->()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;
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 3c53a842bf..81df3b6bbc 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali
@@ -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
diff --git a/com.discord/smali/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet$onViewCreated$3.smali b/com.discord/smali/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet$onResume$1.smali
similarity index 89%
rename from com.discord/smali/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet$onViewCreated$3.smali
rename to com.discord/smali/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet$onResume$1.smali
index 1bf9eb184e..d2939a2f7b 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet$onViewCreated$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet$onResume$1.smali
@@ -1,4 +1,4 @@
-.class public final synthetic Lcom/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet$onViewCreated$3;
+.class public final synthetic Lcom/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet$onResume$1;
.super Ly/m/c/i;
.source "WidgetStickerPackStoreSheet.kt"
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
+ value = Lcom/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet;->onResume()V
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
@@ -57,7 +57,7 @@
check-cast p1, Lcom/discord/widgets/chat/input/sticker/StickerPackStoreSheetViewModel$ViewState;
- invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet$onViewCreated$3;->invoke(Lcom/discord/widgets/chat/input/sticker/StickerPackStoreSheetViewModel$ViewState;)V
+ invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet$onResume$1;->invoke(Lcom/discord/widgets/chat/input/sticker/StickerPackStoreSheetViewModel$ViewState;)V
sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet.smali b/com.discord/smali/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet.smali
index 6a8a951c27..6426768c5c 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet.smali
@@ -243,26 +243,6 @@
invoke-virtual {v0, v2}, Lcom/discord/widgets/chat/input/expression/WidgetExpressionPickerAdapter;->setData(Ljava/util/List;)V
- invoke-direct {p0}, Lcom/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet;->getBuy()Lcom/discord/views/LoadingButton;
-
- move-result-object v0
-
- invoke-virtual {p1}, Lcom/discord/widgets/chat/input/sticker/StickerPackStoreSheetViewModel$ViewState;->isBeingPurchased()Z
-
- move-result v2
-
- invoke-virtual {v0, v2}, Lcom/discord/views/LoadingButton;->setIsLoading(Z)V
-
- invoke-direct {p0}, Lcom/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet;->getBuyPremium()Lcom/discord/views/LoadingButton;
-
- move-result-object v0
-
- invoke-virtual {p1}, Lcom/discord/widgets/chat/input/sticker/StickerPackStoreSheetViewModel$ViewState;->isBeingPurchased()Z
-
- move-result v2
-
- invoke-virtual {v0, v2}, Lcom/discord/views/LoadingButton;->setIsLoading(Z)V
-
sget-object v0, Lcom/discord/utilities/dsti/StickerUtils;->INSTANCE:Lcom/discord/utilities/dsti/StickerUtils;
invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
@@ -463,44 +443,65 @@
invoke-direct {p0}, Lcom/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet;->getBuy()Lcom/discord/views/LoadingButton;
- move-result-object p1
+ move-result-object v0
- invoke-virtual {p1, v4}, Lcom/discord/views/LoadingButton;->setEnabled(Z)V
+ invoke-virtual {v0, v4}, Lcom/discord/views/LoadingButton;->setEnabled(Z)V
invoke-direct {p0}, Lcom/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet;->getBuyPremium()Lcom/discord/views/LoadingButton;
- move-result-object p1
+ move-result-object v0
- invoke-virtual {p1, v4}, Lcom/discord/views/LoadingButton;->setEnabled(Z)V
+ invoke-virtual {v0, v4}, Lcom/discord/views/LoadingButton;->setEnabled(Z)V
goto :goto_3
:cond_5
invoke-direct {p0}, Lcom/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet;->getBuy()Lcom/discord/views/LoadingButton;
- move-result-object p1
+ move-result-object v0
- invoke-virtual {p1, v6}, Lcom/discord/views/LoadingButton;->setEnabled(Z)V
+ invoke-virtual {v0, v6}, Lcom/discord/views/LoadingButton;->setEnabled(Z)V
invoke-direct {p0}, Lcom/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet;->getBuyPremium()Lcom/discord/views/LoadingButton;
- move-result-object p1
+ move-result-object v0
- invoke-virtual {p1, v6}, Lcom/discord/views/LoadingButton;->setEnabled(Z)V
+ invoke-virtual {v0, v6}, Lcom/discord/views/LoadingButton;->setEnabled(Z)V
invoke-direct {p0}, Lcom/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet;->getBuy()Lcom/discord/views/LoadingButton;
- move-result-object p1
+ move-result-object v0
- invoke-virtual {p1, v1}, Landroid/widget/FrameLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+ invoke-virtual {v0, v1}, Landroid/widget/FrameLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V
invoke-direct {p0}, Lcom/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet;->getBuyPremium()Lcom/discord/views/LoadingButton;
- move-result-object p1
+ move-result-object v0
- invoke-virtual {p1, v1}, Landroid/widget/FrameLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+ invoke-virtual {v0, v1}, Landroid/widget/FrameLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V
- goto :goto_3
+ :goto_3
+ invoke-direct {p0}, Lcom/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet;->getBuy()Lcom/discord/views/LoadingButton;
+
+ move-result-object v0
+
+ invoke-virtual {p1}, Lcom/discord/widgets/chat/input/sticker/StickerPackStoreSheetViewModel$ViewState;->isBeingPurchased()Z
+
+ move-result v1
+
+ invoke-virtual {v0, v1}, Lcom/discord/views/LoadingButton;->setIsLoading(Z)V
+
+ invoke-direct {p0}, Lcom/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet;->getBuyPremium()Lcom/discord/views/LoadingButton;
+
+ move-result-object v0
+
+ invoke-virtual {p1}, Lcom/discord/widgets/chat/input/sticker/StickerPackStoreSheetViewModel$ViewState;->isBeingPurchased()Z
+
+ move-result p1
+
+ invoke-virtual {v0, p1}, Lcom/discord/views/LoadingButton;->setIsLoading(Z)V
+
+ goto :goto_4
:cond_6
const-string p1, "adapter"
@@ -510,7 +511,7 @@
throw v1
:cond_7
- :goto_3
+ :goto_4
return-void
.end method
@@ -1047,9 +1048,58 @@
return-void
.end method
-.method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
+.method public onResume()V
.locals 10
+ invoke-super {p0}, Lcom/discord/app/AppBottomSheet;->onResume()V
+
+ iget-object v0, p0, Lcom/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet;->viewModel:Lcom/discord/widgets/chat/input/sticker/StickerPackStoreSheetViewModel;
+
+ if-eqz v0, :cond_0
+
+ invoke-virtual {v0}, Lf/a/b/l0;->observeViewState()Lrx/Observable;
+
+ move-result-object v0
+
+ invoke-static {v0, p0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->bindToComponentLifecycle(Lrx/Observable;Lcom/discord/app/AppComponent;)Lrx/Observable;
+
+ move-result-object v1
+
+ const-class v2, Lcom/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet;
+
+ const/4 v3, 0x0
+
+ const/4 v4, 0x0
+
+ const/4 v5, 0x0
+
+ const/4 v6, 0x0
+
+ new-instance v7, Lcom/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet$onResume$1;
+
+ invoke-direct {v7, p0}, Lcom/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet$onResume$1;->(Lcom/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet;)V
+
+ const/16 v8, 0x1e
+
+ const/4 v9, 0x0
+
+ invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+
+ return-void
+
+ :cond_0
+ const-string/jumbo v0, "viewModel"
+
+ invoke-static {v0}, Ly/m/c/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+ const/4 v0, 0x0
+
+ throw v0
+.end method
+
+.method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
+ .locals 7
+
const-string/jumbo v0, "view"
invoke-static {p1, v0}, Ly/m/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
@@ -1114,42 +1164,6 @@
iget-object p1, p0, Lcom/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet;->viewModel:Lcom/discord/widgets/chat/input/sticker/StickerPackStoreSheetViewModel;
- const/4 p2, 0x0
-
- const-string/jumbo v0, "viewModel"
-
- if-eqz p1, :cond_1
-
- invoke-virtual {p1}, Lf/a/b/l0;->observeViewState()Lrx/Observable;
-
- move-result-object p1
-
- invoke-static {p1, p0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->bindToComponentLifecycle(Lrx/Observable;Lcom/discord/app/AppComponent;)Lrx/Observable;
-
- move-result-object v1
-
- const-class v2, Lcom/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet;
-
- const/4 v3, 0x0
-
- const/4 v4, 0x0
-
- const/4 v5, 0x0
-
- const/4 v6, 0x0
-
- new-instance v7, Lcom/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet$onViewCreated$3;
-
- invoke-direct {v7, p0}, Lcom/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet$onViewCreated$3;->(Lcom/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet;)V
-
- const/16 v8, 0x1e
-
- const/4 v9, 0x0
-
- invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
-
- iget-object p1, p0, Lcom/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet;->viewModel:Lcom/discord/widgets/chat/input/sticker/StickerPackStoreSheetViewModel;
-
if-eqz p1, :cond_0
invoke-virtual {p1}, Lcom/discord/widgets/chat/input/sticker/StickerPackStoreSheetViewModel;->fetchStickersData()V
@@ -1157,12 +1171,11 @@
return-void
:cond_0
- invoke-static {v0}, Ly/m/c/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+ const-string/jumbo p1, "viewModel"
- throw p2
+ invoke-static {p1}, Ly/m/c/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
- :cond_1
- invoke-static {v0}, Ly/m/c/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+ const/4 p1, 0x0
- throw p2
+ throw p1
.end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage.smali
index 5246a234e7..b044eed51e 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage.smali
@@ -772,13 +772,13 @@
move-result-object v2
- if-eqz v2, :cond_7
+ if-eqz v2, :cond_8
const/16 v3, 0x13
if-eq v0, v3, :cond_0
- goto/16 :goto_1
+ goto/16 :goto_2
:cond_0
iget-object v0, v7, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->replyHolder:Landroid/view/View;
@@ -814,7 +814,7 @@
invoke-virtual {v7, v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->configureReplyContentWithResourceId(I)V
- goto/16 :goto_0
+ goto/16 :goto_1
:cond_2
instance-of v0, v2, Lcom/discord/stores/StoreMessageReplies$MessageState$Deleted;
@@ -829,34 +829,34 @@
invoke-virtual {v7, v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->configureReplyContentWithResourceId(I)V
- goto/16 :goto_0
+ goto/16 :goto_1
:cond_3
instance-of v0, v2, Lcom/discord/stores/StoreMessageReplies$MessageState$Loaded;
- if-eqz v0, :cond_6
+ if-eqz v0, :cond_7
- if-eqz v1, :cond_6
+ if-eqz v1, :cond_7
invoke-virtual {v1}, Lcom/discord/widgets/chat/list/entries/MessageEntry;->getMessage()Lcom/discord/models/domain/ModelMessage;
- move-result-object v3
+ move-result-object v5
new-instance v0, Lf/a/o/b/b/r;
- invoke-direct {v0, v3}, Lf/a/o/b/b/r;->(Lcom/discord/models/domain/ModelMessage;)V
+ invoke-direct {v0, v5}, Lf/a/o/b/b/r;->(Lcom/discord/models/domain/ModelMessage;)V
const/4 v2, 0x1
new-array v2, v2, [Landroid/view/View;
- iget-object v5, v7, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->replyHolder:Landroid/view/View;
+ iget-object v6, v7, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->replyHolder:Landroid/view/View;
- aput-object v5, v2, v8
+ aput-object v6, v2, v8
invoke-virtual {v7, v0, v2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->setOnClickListener(Lrx/functions/Action3;[Landroid/view/View;)V
- invoke-virtual {v3}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
+ invoke-virtual {v5}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
move-result-object v0
@@ -889,31 +889,47 @@
invoke-virtual {v7, v2, v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->configureReplyNames(Ljava/lang/String;I)V
- invoke-virtual {v3}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String;
+ invoke-virtual {v5}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String;
- move-result-object v9
+ move-result-object v0
+ if-nez v0, :cond_5
+
+ move-object v9, v3
+
+ goto :goto_0
+
+ :cond_5
+ move-object v9, v0
+
+ :goto_0
iget-object v0, v7, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->replyText:Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;
- if-eqz v0, :cond_6
+ if-eqz v0, :cond_7
iget-object v0, v7, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->replyLeadingViewsHolder:Landroid/view/View;
+ if-eqz v0, :cond_7
+
+ invoke-virtual {v5}, Lcom/discord/models/domain/ModelMessage;->hasEmbeds()Z
+
+ move-result v0
+
if-eqz v0, :cond_6
invoke-virtual {v9}, Ljava/lang/String;->isEmpty()Z
move-result v0
- if-eqz v0, :cond_5
+ if-eqz v0, :cond_6
const v0, 0x7f1214cf
invoke-virtual {v7, v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->configureReplyContentWithResourceId(I)V
- goto :goto_0
+ goto :goto_1
- :cond_5
+ :cond_6
iget-object v0, v7, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->replyText:Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;
invoke-virtual {v0}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
@@ -924,7 +940,7 @@
move-result-object v12
- invoke-virtual {v3}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
+ invoke-virtual {v5}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
move-result-object v0
@@ -936,16 +952,22 @@
invoke-direct {v4}, Lcom/discord/stores/StoreMessageState$State;->()V
- const/4 v5, 0x0
+ const/4 v6, 0x0
const/16 v0, 0x32
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
- move-result-object v6
+ move-result-object v11
move-object/from16 v0, p0
+ move-object v3, v5
+
+ move v5, v6
+
+ move-object v6, v11
+
invoke-virtual/range {v0 .. v6}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->getMessagePreprocessor(JLcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;ZLjava/lang/Integer;)Lcom/discord/utilities/textprocessing/MessagePreprocessor;
move-result-object v13
@@ -974,6 +996,8 @@
move-result-object v0
+ if-eqz v0, :cond_7
+
iget-object v1, v7, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->replyLeadingViewsHolder:Landroid/view/View;
invoke-virtual {v1, v8, v8}, Landroid/view/View;->measure(II)V
@@ -1000,19 +1024,19 @@
invoke-virtual {v1, v0}, Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;->setDraweeSpanStringBuilder(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;)V
- :cond_6
- :goto_0
- return-void
-
:cond_7
:goto_1
+ return-void
+
+ :cond_8
+ :goto_2
iget-object v0, v7, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->replyHolder:Landroid/view/View;
- if-eqz v0, :cond_8
+ if-eqz v0, :cond_9
iget-object v1, v7, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->replyLinkItem:Landroid/view/View;
- if-eqz v1, :cond_8
+ if-eqz v1, :cond_9
const/16 v1, 0x8
@@ -1022,7 +1046,7 @@
invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
- :cond_8
+ :cond_9
return-void
.end method
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
index 020058cf95..70dbea0d03 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
@@ -460,7 +460,7 @@
new-array v2, v0, [Ljava/lang/Object;
- const-string v4, "49.13"
+ const-string v4, "49.14"
aput-object v4, v2, v3
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali
index ef94bf3d36..c6964e8c04 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali
@@ -1936,7 +1936,7 @@
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
- const-string v0, " - 49.13 (1340)"
+ const-string v0, " - 49.14 (1342)"
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;