diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml
index e328eb1953..a98b552897 100644
--- a/com.discord/apktool.yml
+++ b/com.discord/apktool.yml
@@ -1,5 +1,5 @@
!!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-1279.apk
+apkFileName: com.discord-1280.apk
compressionType: false
doNotCompress:
- resources.arsc
@@ -3111,5 +3111,5 @@ usesFramework:
tag: null
version: 2.4.2-83a459-SNAPSHOT
versionInfo:
- versionCode: '1279'
- versionName: '41.10'
+ versionCode: '1280'
+ versionName: '41.11'
diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml
index 8d926b033a..b67fc1ea5f 100644
Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ
diff --git a/com.discord/res/drawable-ldpi/img_age_gate_failure.png b/com.discord/res/drawable-ldpi/img_age_gate_failure.png
index 0138941de6..ef3179daaa 100644
Binary files a/com.discord/res/drawable-ldpi/img_age_gate_failure.png and b/com.discord/res/drawable-ldpi/img_age_gate_failure.png differ
diff --git a/com.discord/res/drawable-mdpi/img_age_gate_failure.png b/com.discord/res/drawable-mdpi/img_age_gate_failure.png
index 323f257764..0b02b79bbb 100644
Binary files a/com.discord/res/drawable-mdpi/img_age_gate_failure.png and b/com.discord/res/drawable-mdpi/img_age_gate_failure.png differ
diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml
index 1c114a8da5..662e8aa069 100644
--- a/com.discord/res/values/strings.xml
+++ b/com.discord/res/values/strings.xml
@@ -1156,7 +1156,7 @@ We’re here to make a good impression."
Presets
Select a color
Transparency
- 04ab6940807843bb8d824243008c2c97
+ a5876c594c154667b8ea29ae2711532a
Coming Soon
Search Animated GIFs on the Web
Displays text with emphasis.
diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali
index e33282a876..3172ee7eec 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/1279"
+.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1280"
-.field public static final VERSION_CODE:I = 0x4ff
+.field public static final VERSION_CODE:I = 0x500
-.field public static final VERSION_NAME:Ljava/lang/String; = "41.10"
+.field public static final VERSION_NAME:Ljava/lang/String; = "41.11"
# direct methods
diff --git a/com.discord/smali/com/discord/app/App.smali b/com.discord/smali/com/discord/app/App.smali
index 8973adb3f3..3200a36002 100644
--- a/com.discord/smali/com/discord/app/App.smali
+++ b/com.discord/smali/com/discord/app/App.smali
@@ -301,10 +301,6 @@
monitor-exit v1
:goto_2
- sget-object v0, Lcom/discord/utilities/billing/GooglePlayBillingManager;->INSTANCE:Lcom/discord/utilities/billing/GooglePlayBillingManager;
-
- invoke-virtual {v0, p0}, Lcom/discord/utilities/billing/GooglePlayBillingManager;->init(Landroid/app/Application;)V
-
const-string v0, "Application initialized."
invoke-static {v0}, Lcom/discord/app/AppLog;->i(Ljava/lang/String;)V
diff --git a/com.discord/smali/com/discord/app/AppActivity$b.smali b/com.discord/smali/com/discord/app/AppActivity$b.smali
index e4b7af9455..08cf8648d4 100644
--- a/com.discord/smali/com/discord/app/AppActivity$b.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$b.smali
@@ -56,7 +56,7 @@
.end method
.method public final invoke()V
- .locals 3
+ .locals 4
sget-boolean v0, Lcom/discord/app/AppActivity;->r:Z
@@ -128,11 +128,23 @@
move-result-object v1
- const-string v2, "applicationContext"
+ const-string v3, "applicationContext"
+
+ invoke-static {v1, v3}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+ invoke-virtual {v0, v1}, Lcom/discord/utilities/ShareUtils;->updateDirectShareTargets(Landroid/content/Context;)V
+
+ sget-object v0, Lcom/discord/utilities/billing/GooglePlayBillingManager;->INSTANCE:Lcom/discord/utilities/billing/GooglePlayBillingManager;
+
+ iget-object v1, p0, Lcom/discord/app/AppActivity$b;->this$0:Lcom/discord/app/AppActivity;
+
+ invoke-virtual {v1}, Landroid/app/Activity;->getApplication()Landroid/app/Application;
+
+ move-result-object v1
invoke-static {v1, v2}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-virtual {v0, v1}, Lcom/discord/utilities/ShareUtils;->updateDirectShareTargets(Landroid/content/Context;)V
+ invoke-virtual {v0, v1}, Lcom/discord/utilities/billing/GooglePlayBillingManager;->init(Landroid/app/Application;)V
:cond_0
return-void
diff --git a/com.discord/smali/com/discord/app/AppActivity$c.smali b/com.discord/smali/com/discord/app/AppActivity$c.smali
index f09546ed51..00208dde8e 100644
--- a/com.discord/smali/com/discord/app/AppActivity$c.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$c.smali
@@ -74,7 +74,7 @@
if-eqz v0, :cond_4
- sget-object v2, Lf/a/b/m;->f:Lf/a/b/m;
+ sget-object v2, Lf/a/b/m;->g:Lf/a/b/m;
sget-object v2, Lf/a/b/m;->e:Ljava/util/List;
diff --git a/com.discord/smali/com/discord/app/AppActivity$d.smali b/com.discord/smali/com/discord/app/AppActivity$d.smali
index 434a028d29..5d1a4fbd9b 100644
--- a/com.discord/smali/com/discord/app/AppActivity$d.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$d.smali
@@ -114,7 +114,7 @@
goto :goto_1
:cond_2
- sget-object v0, Lf/a/b/m;->f:Lf/a/b/m;
+ sget-object v0, Lf/a/b/m;->g:Lf/a/b/m;
sget-object v0, Lf/a/b/m;->c:Ljava/util/List;
@@ -176,7 +176,7 @@
return-void
:cond_6
- sget-object v0, Lf/a/b/m;->f:Lf/a/b/m;
+ sget-object v0, Lf/a/b/m;->g:Lf/a/b/m;
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
diff --git a/com.discord/smali/com/discord/app/AppActivity.smali b/com.discord/smali/com/discord/app/AppActivity.smali
index 9cfbbe4ea9..4b072acf85 100644
--- a/com.discord/smali/com/discord/app/AppActivity.smali
+++ b/com.discord/smali/com/discord/app/AppActivity.smali
@@ -189,7 +189,7 @@
:cond_0
iget-object v0, p1, Lcom/discord/app/AppActivity$a;->a:Ljava/lang/String;
- sget-object v3, Lf/a/b/m;->f:Lf/a/b/m;
+ sget-object v3, Lf/a/b/m;->g:Lf/a/b/m;
sget-object v3, Lf/a/b/m;->e:Ljava/util/List;
@@ -1242,7 +1242,7 @@
invoke-super {p0}, Lcom/discord/app/AppTransitionActivity;->onResume()V
- sget-object v0, Lf/a/b/m;->f:Lf/a/b/m;
+ sget-object v0, Lf/a/b/m;->g:Lf/a/b/m;
const-string v0, "activity"
diff --git a/com.discord/smali/com/discord/models/sticker/dto/ModelUserStickerPack.smali b/com.discord/smali/com/discord/models/sticker/dto/ModelUserStickerPack.smali
new file mode 100644
index 0000000000..cab6ed187a
--- /dev/null
+++ b/com.discord/smali/com/discord/models/sticker/dto/ModelUserStickerPack.smali
@@ -0,0 +1,480 @@
+.class public final Lcom/discord/models/sticker/dto/ModelUserStickerPack;
+.super Ljava/lang/Object;
+.source "ModelUserStickerPack.kt"
+
+
+# instance fields
+.field public final entitlementId:J
+
+.field public final hasAccess:Z
+
+.field public final packId:J
+
+.field public final premiumTypeRequired:Ljava/lang/Integer;
+
+.field public final stickerPack:Lcom/discord/models/sticker/dto/ModelStickerPack;
+
+.field public final userId:J
+
+
+# direct methods
+.method public constructor (JJJZLjava/lang/Integer;Lcom/discord/models/sticker/dto/ModelStickerPack;)V
+ .locals 0
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ iput-wide p1, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->userId:J
+
+ iput-wide p3, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->packId:J
+
+ iput-wide p5, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->entitlementId:J
+
+ iput-boolean p7, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->hasAccess:Z
+
+ iput-object p8, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->premiumTypeRequired:Ljava/lang/Integer;
+
+ iput-object p9, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->stickerPack:Lcom/discord/models/sticker/dto/ModelStickerPack;
+
+ return-void
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/models/sticker/dto/ModelUserStickerPack;JJJZLjava/lang/Integer;Lcom/discord/models/sticker/dto/ModelStickerPack;ILjava/lang/Object;)Lcom/discord/models/sticker/dto/ModelUserStickerPack;
+ .locals 10
+
+ move-object v0, p0
+
+ and-int/lit8 v1, p10, 0x1
+
+ if-eqz v1, :cond_0
+
+ iget-wide v1, v0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->userId:J
+
+ goto :goto_0
+
+ :cond_0
+ move-wide v1, p1
+
+ :goto_0
+ and-int/lit8 v3, p10, 0x2
+
+ if-eqz v3, :cond_1
+
+ iget-wide v3, v0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->packId:J
+
+ goto :goto_1
+
+ :cond_1
+ move-wide v3, p3
+
+ :goto_1
+ and-int/lit8 v5, p10, 0x4
+
+ if-eqz v5, :cond_2
+
+ iget-wide v5, v0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->entitlementId:J
+
+ goto :goto_2
+
+ :cond_2
+ move-wide v5, p5
+
+ :goto_2
+ and-int/lit8 v7, p10, 0x8
+
+ if-eqz v7, :cond_3
+
+ iget-boolean v7, v0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->hasAccess:Z
+
+ goto :goto_3
+
+ :cond_3
+ move/from16 v7, p7
+
+ :goto_3
+ and-int/lit8 v8, p10, 0x10
+
+ if-eqz v8, :cond_4
+
+ iget-object v8, v0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->premiumTypeRequired:Ljava/lang/Integer;
+
+ goto :goto_4
+
+ :cond_4
+ move-object/from16 v8, p8
+
+ :goto_4
+ and-int/lit8 v9, p10, 0x20
+
+ if-eqz v9, :cond_5
+
+ iget-object v9, v0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->stickerPack:Lcom/discord/models/sticker/dto/ModelStickerPack;
+
+ goto :goto_5
+
+ :cond_5
+ move-object/from16 v9, p9
+
+ :goto_5
+ move-wide p1, v1
+
+ move-wide p3, v3
+
+ move-wide p5, v5
+
+ move/from16 p7, v7
+
+ move-object/from16 p8, v8
+
+ move-object/from16 p9, v9
+
+ invoke-virtual/range {p0 .. p9}, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->copy(JJJZLjava/lang/Integer;Lcom/discord/models/sticker/dto/ModelStickerPack;)Lcom/discord/models/sticker/dto/ModelUserStickerPack;
+
+ move-result-object v0
+
+ return-object v0
+.end method
+
+
+# virtual methods
+.method public final component1()J
+ .locals 2
+
+ iget-wide v0, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->userId:J
+
+ return-wide v0
+.end method
+
+.method public final component2()J
+ .locals 2
+
+ iget-wide v0, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->packId:J
+
+ return-wide v0
+.end method
+
+.method public final component3()J
+ .locals 2
+
+ iget-wide v0, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->entitlementId:J
+
+ return-wide v0
+.end method
+
+.method public final component4()Z
+ .locals 1
+
+ iget-boolean v0, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->hasAccess:Z
+
+ return v0
+.end method
+
+.method public final component5()Ljava/lang/Integer;
+ .locals 1
+
+ iget-object v0, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->premiumTypeRequired:Ljava/lang/Integer;
+
+ return-object v0
+.end method
+
+.method public final component6()Lcom/discord/models/sticker/dto/ModelStickerPack;
+ .locals 1
+
+ iget-object v0, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->stickerPack:Lcom/discord/models/sticker/dto/ModelStickerPack;
+
+ return-object v0
+.end method
+
+.method public final copy(JJJZLjava/lang/Integer;Lcom/discord/models/sticker/dto/ModelStickerPack;)Lcom/discord/models/sticker/dto/ModelUserStickerPack;
+ .locals 11
+
+ new-instance v10, Lcom/discord/models/sticker/dto/ModelUserStickerPack;
+
+ move-object v0, v10
+
+ move-wide v1, p1
+
+ move-wide v3, p3
+
+ move-wide/from16 v5, p5
+
+ move/from16 v7, p7
+
+ move-object/from16 v8, p8
+
+ move-object/from16 v9, p9
+
+ invoke-direct/range {v0 .. v9}, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->(JJJZLjava/lang/Integer;Lcom/discord/models/sticker/dto/ModelStickerPack;)V
+
+ return-object v10
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+ .locals 5
+
+ if-eq p0, p1, :cond_1
+
+ instance-of v0, p1, Lcom/discord/models/sticker/dto/ModelUserStickerPack;
+
+ if-eqz v0, :cond_0
+
+ check-cast p1, Lcom/discord/models/sticker/dto/ModelUserStickerPack;
+
+ iget-wide v0, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->userId:J
+
+ iget-wide v2, p1, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->userId:J
+
+ cmp-long v4, v0, v2
+
+ if-nez v4, :cond_0
+
+ iget-wide v0, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->packId:J
+
+ iget-wide v2, p1, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->packId:J
+
+ cmp-long v4, v0, v2
+
+ if-nez v4, :cond_0
+
+ iget-wide v0, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->entitlementId:J
+
+ iget-wide v2, p1, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->entitlementId:J
+
+ cmp-long v4, v0, v2
+
+ if-nez v4, :cond_0
+
+ iget-boolean v0, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->hasAccess:Z
+
+ iget-boolean v1, p1, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->hasAccess:Z
+
+ if-ne v0, v1, :cond_0
+
+ iget-object v0, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->premiumTypeRequired:Ljava/lang/Integer;
+
+ iget-object v1, p1, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->premiumTypeRequired:Ljava/lang/Integer;
+
+ invoke-static {v0, v1}, Lc0/n/c/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+ move-result v0
+
+ if-eqz v0, :cond_0
+
+ iget-object v0, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->stickerPack:Lcom/discord/models/sticker/dto/ModelStickerPack;
+
+ iget-object p1, p1, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->stickerPack:Lcom/discord/models/sticker/dto/ModelStickerPack;
+
+ invoke-static {v0, p1}, Lc0/n/c/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+ move-result p1
+
+ if-eqz p1, :cond_0
+
+ goto :goto_0
+
+ :cond_0
+ const/4 p1, 0x0
+
+ return p1
+
+ :cond_1
+ :goto_0
+ const/4 p1, 0x1
+
+ return p1
+.end method
+
+.method public final getEntitlementId()J
+ .locals 2
+
+ iget-wide v0, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->entitlementId:J
+
+ return-wide v0
+.end method
+
+.method public final getHasAccess()Z
+ .locals 1
+
+ iget-boolean v0, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->hasAccess:Z
+
+ return v0
+.end method
+
+.method public final getPackId()J
+ .locals 2
+
+ iget-wide v0, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->packId:J
+
+ return-wide v0
+.end method
+
+.method public final getPremiumTypeRequired()Ljava/lang/Integer;
+ .locals 1
+
+ iget-object v0, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->premiumTypeRequired:Ljava/lang/Integer;
+
+ return-object v0
+.end method
+
+.method public final getStickerPack()Lcom/discord/models/sticker/dto/ModelStickerPack;
+ .locals 1
+
+ iget-object v0, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->stickerPack:Lcom/discord/models/sticker/dto/ModelStickerPack;
+
+ return-object v0
+.end method
+
+.method public final getUserId()J
+ .locals 2
+
+ iget-wide v0, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->userId:J
+
+ return-wide v0
+.end method
+
+.method public hashCode()I
+ .locals 7
+
+ iget-wide v0, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->userId:J
+
+ const/16 v2, 0x20
+
+ ushr-long v3, v0, v2
+
+ xor-long/2addr v0, v3
+
+ long-to-int v1, v0
+
+ mul-int/lit8 v1, v1, 0x1f
+
+ iget-wide v3, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->packId:J
+
+ ushr-long v5, v3, v2
+
+ xor-long/2addr v3, v5
+
+ long-to-int v0, v3
+
+ add-int/2addr v1, v0
+
+ mul-int/lit8 v1, v1, 0x1f
+
+ iget-wide v3, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->entitlementId:J
+
+ ushr-long v5, v3, v2
+
+ xor-long v2, v3, v5
+
+ long-to-int v0, v2
+
+ add-int/2addr v1, v0
+
+ mul-int/lit8 v1, v1, 0x1f
+
+ iget-boolean v0, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->hasAccess:Z
+
+ if-eqz v0, :cond_0
+
+ const/4 v0, 0x1
+
+ :cond_0
+ add-int/2addr v1, v0
+
+ mul-int/lit8 v1, v1, 0x1f
+
+ iget-object v0, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->premiumTypeRequired:Ljava/lang/Integer;
+
+ const/4 v2, 0x0
+
+ if-eqz v0, :cond_1
+
+ invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+ move-result v0
+
+ goto :goto_0
+
+ :cond_1
+ const/4 v0, 0x0
+
+ :goto_0
+ add-int/2addr v1, v0
+
+ mul-int/lit8 v1, v1, 0x1f
+
+ iget-object v0, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->stickerPack:Lcom/discord/models/sticker/dto/ModelStickerPack;
+
+ if-eqz v0, :cond_2
+
+ invoke-virtual {v0}, Lcom/discord/models/sticker/dto/ModelStickerPack;->hashCode()I
+
+ move-result v2
+
+ :cond_2
+ add-int/2addr v1, v2
+
+ return v1
+.end method
+
+.method public toString()Ljava/lang/String;
+ .locals 3
+
+ const-string v0, "ModelUserStickerPack(userId="
+
+ invoke-static {v0}, Lf/e/c/a/a;->F(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+ move-result-object v0
+
+ iget-wide v1, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->userId:J
+
+ invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+ const-string v1, ", packId="
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+ iget-wide v1, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->packId:J
+
+ invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+ const-string v1, ", entitlementId="
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+ iget-wide v1, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->entitlementId:J
+
+ invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+ const-string v1, ", hasAccess="
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+ iget-boolean v1, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->hasAccess:Z
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+ const-string v1, ", premiumTypeRequired="
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+ iget-object v1, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->premiumTypeRequired:Ljava/lang/Integer;
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+ const-string v1, ", stickerPack="
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+ iget-object v1, p0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->stickerPack:Lcom/discord/models/sticker/dto/ModelStickerPack;
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+ const-string v1, ")"
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+ invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+ move-result-object v0
+
+ return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIInterface.smali b/com.discord/smali/com/discord/restapi/RestAPIInterface.smali
index 21afa14394..423e50f4dc 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIInterface.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIInterface.smali
@@ -392,26 +392,6 @@
.end annotation
.end method
-.method public abstract claimStickerPack(J)Lrx/Observable;
- .param p1 # J
- .annotation runtime Lk0/k0/q;
- value = "packId"
- .end annotation
- .end param
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "(J)",
- "Lrx/Observable<",
- "Lcom/discord/models/sticker/dto/ModelStickerPack;",
- ">;"
- }
- .end annotation
-
- .annotation runtime Lk0/k0/n;
- value = "users/@me/sticker-packs/{packId}"
- .end annotation
-.end method
-
.method public abstract convertDMToGroup(JJ)Lrx/Observable;
.param p1 # J
.annotation runtime Lk0/k0/q;
@@ -1970,7 +1950,7 @@
"()",
"Lrx/Observable<",
"Ljava/util/List<",
- "Lcom/discord/models/sticker/dto/ModelStickerPack;",
+ "Lcom/discord/models/sticker/dto/ModelUserStickerPack;",
">;>;"
}
.end annotation
diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali
index 82bc5db335..a93e2bed32 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, 0x4ff
+ const/16 v0, 0x500
iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$authNavHandler$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$authNavHandler$1.smali
index a0c55d53b5..788ece3741 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$authNavHandler$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$authNavHandler$1.smali
@@ -86,7 +86,7 @@
invoke-static {p2, v0}, Lc0/n/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
- sget-object v0, Lf/a/b/m;->f:Lf/a/b/m;
+ sget-object v0, Lf/a/b/m;->g:Lf/a/b/m;
sget-object v0, Lf/a/b/m;->a:Ljava/util/List;
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$oAuthStateHandler$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$oAuthStateHandler$1.smali
index 1713477980..ea8e3eb35a 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$oAuthStateHandler$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$oAuthStateHandler$1.smali
@@ -92,7 +92,7 @@
if-eqz v0, :cond_0
- sget-object v0, Lf/a/b/m;->f:Lf/a/b/m;
+ sget-object v0, Lf/a/b/m;->g:Lf/a/b/m;
sget-object v0, Lf/a/b/m;->b:Ljava/util/List;
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$verificationNavHandler$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$verificationNavHandler$1.smali
index 996d3f1a5d..7c395b00de 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$verificationNavHandler$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$verificationNavHandler$1.smali
@@ -86,7 +86,7 @@
invoke-static {p2, v0}, Lc0/n/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
- sget-object v0, Lf/a/b/m;->f:Lf/a/b/m;
+ sget-object v0, Lf/a/b/m;->g:Lf/a/b/m;
sget-object v0, Lf/a/b/m;->d:Ljava/util/List;
diff --git a/com.discord/smali/com/discord/stores/StoreStickers$OwnedStickerPackState$Loaded.smali b/com.discord/smali/com/discord/stores/StoreStickers$OwnedStickerPackState$Loaded.smali
index c985944820..5535c54397 100644
--- a/com.discord/smali/com/discord/stores/StoreStickers$OwnedStickerPackState$Loaded.smali
+++ b/com.discord/smali/com/discord/stores/StoreStickers$OwnedStickerPackState$Loaded.smali
@@ -20,7 +20,7 @@
value = {
"Ljava/util/Map<",
"Ljava/lang/Long;",
- "Lcom/discord/models/sticker/dto/ModelStickerPack;",
+ "Lcom/discord/models/sticker/dto/ModelUserStickerPack;",
">;"
}
.end annotation
@@ -35,7 +35,7 @@
"(",
"Ljava/util/Map<",
"Ljava/lang/Long;",
- "Lcom/discord/models/sticker/dto/ModelStickerPack;",
+ "Lcom/discord/models/sticker/dto/ModelUserStickerPack;",
">;)V"
}
.end annotation
@@ -79,7 +79,7 @@
"()",
"Ljava/util/Map<",
"Ljava/lang/Long;",
- "Lcom/discord/models/sticker/dto/ModelStickerPack;",
+ "Lcom/discord/models/sticker/dto/ModelUserStickerPack;",
">;"
}
.end annotation
@@ -96,7 +96,7 @@
"(",
"Ljava/util/Map<",
"Ljava/lang/Long;",
- "Lcom/discord/models/sticker/dto/ModelStickerPack;",
+ "Lcom/discord/models/sticker/dto/ModelUserStickerPack;",
">;)",
"Lcom/discord/stores/StoreStickers$OwnedStickerPackState$Loaded;"
}
@@ -155,7 +155,7 @@
"()",
"Ljava/util/Map<",
"Ljava/lang/Long;",
- "Lcom/discord/models/sticker/dto/ModelStickerPack;",
+ "Lcom/discord/models/sticker/dto/ModelUserStickerPack;",
">;"
}
.end annotation
diff --git a/com.discord/smali/com/discord/stores/StoreStickers$claimFreePack$$inlined$let$lambda$2$1.smali b/com.discord/smali/com/discord/stores/StoreStickers$claimFreePack$$inlined$let$lambda$2$1.smali
deleted file mode 100644
index 4c1c74235f..0000000000
--- a/com.discord/smali/com/discord/stores/StoreStickers$claimFreePack$$inlined$let$lambda$2$1.smali
+++ /dev/null
@@ -1,70 +0,0 @@
-.class public final Lcom/discord/stores/StoreStickers$claimFreePack$$inlined$let$lambda$2$1;
-.super Lc0/n/c/k;
-.source "StoreStickers.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/stores/StoreStickers$claimFreePack$$inlined$let$lambda$2;->invoke(Ljava/lang/Void;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x19
- name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
- value = {
- "Lc0/n/c/k;",
- "Lkotlin/jvm/functions/Function0<",
- "Lkotlin/Unit;",
- ">;"
- }
-.end annotation
-
-
-# instance fields
-.field public final synthetic this$0:Lcom/discord/stores/StoreStickers$claimFreePack$$inlined$let$lambda$2;
-
-
-# direct methods
-.method public constructor (Lcom/discord/stores/StoreStickers$claimFreePack$$inlined$let$lambda$2;)V
- .locals 0
-
- iput-object p1, p0, Lcom/discord/stores/StoreStickers$claimFreePack$$inlined$let$lambda$2$1;->this$0:Lcom/discord/stores/StoreStickers$claimFreePack$$inlined$let$lambda$2;
-
- const/4 p1, 0x0
-
- invoke-direct {p0, p1}, Lc0/n/c/k;->(I)V
-
- return-void
-.end method
-
-
-# virtual methods
-.method public bridge synthetic invoke()Ljava/lang/Object;
- .locals 1
-
- invoke-virtual {p0}, Lcom/discord/stores/StoreStickers$claimFreePack$$inlined$let$lambda$2$1;->invoke()V
-
- sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
-
- return-object v0
-.end method
-
-.method public final invoke()V
- .locals 2
-
- iget-object v0, p0, Lcom/discord/stores/StoreStickers$claimFreePack$$inlined$let$lambda$2$1;->this$0:Lcom/discord/stores/StoreStickers$claimFreePack$$inlined$let$lambda$2;
-
- iget-object v1, v0, Lcom/discord/stores/StoreStickers$claimFreePack$$inlined$let$lambda$2;->this$0:Lcom/discord/stores/StoreStickers;
-
- iget-object v0, v0, Lcom/discord/stores/StoreStickers$claimFreePack$$inlined$let$lambda$2;->$pack$inlined:Lcom/discord/models/sticker/dto/ModelStickerPack;
-
- invoke-virtual {v1, v0}, Lcom/discord/stores/StoreStickers;->handleNewOwnedStickerPack(Lcom/discord/models/sticker/dto/ModelStickerPack;)V
-
- return-void
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreStickers$claimFreePack$$inlined$let$lambda$2.smali b/com.discord/smali/com/discord/stores/StoreStickers$claimFreePack$$inlined$let$lambda$2.smali
index 3454ddf9df..b9976dbfa8 100644
--- a/com.discord/smali/com/discord/stores/StoreStickers$claimFreePack$$inlined$let$lambda$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreStickers$claimFreePack$$inlined$let$lambda$2.smali
@@ -71,15 +71,7 @@
iget-object p1, p0, Lcom/discord/stores/StoreStickers$claimFreePack$$inlined$let$lambda$2;->this$0:Lcom/discord/stores/StoreStickers;
- invoke-static {p1}, Lcom/discord/stores/StoreStickers;->access$getDispatcher$p(Lcom/discord/stores/StoreStickers;)Lcom/discord/stores/Dispatcher;
-
- move-result-object p1
-
- new-instance v0, Lcom/discord/stores/StoreStickers$claimFreePack$$inlined$let$lambda$2$1;
-
- invoke-direct {v0, p0}, Lcom/discord/stores/StoreStickers$claimFreePack$$inlined$let$lambda$2$1;->(Lcom/discord/stores/StoreStickers$claimFreePack$$inlined$let$lambda$2;)V
-
- invoke-virtual {p1, v0}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
+ invoke-virtual {p1}, Lcom/discord/stores/StoreStickers;->fetchOwnedStickerPacks()V
return-void
.end method
diff --git a/com.discord/smali/com/discord/stores/StoreStickers$fetchOwnedStickerPacks$1$2$1.smali b/com.discord/smali/com/discord/stores/StoreStickers$fetchOwnedStickerPacks$1$2$1.smali
index 8ba551e493..3a95cbe526 100644
--- a/com.discord/smali/com/discord/stores/StoreStickers$fetchOwnedStickerPacks$1$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreStickers$fetchOwnedStickerPacks$1$2$1.smali
@@ -108,9 +108,9 @@
move-object v4, v2
- check-cast v4, Lcom/discord/models/sticker/dto/ModelStickerPack;
+ check-cast v4, Lcom/discord/models/sticker/dto/ModelUserStickerPack;
- invoke-virtual {v4}, Lcom/discord/models/sticker/dto/ModelStickerPack;->getId()J
+ invoke-virtual {v4}, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->getPackId()J
move-result-wide v4
@@ -129,6 +129,48 @@
invoke-static {v0, v1}, Lcom/discord/stores/StoreStickers;->access$setOwnedStickerPackState$p(Lcom/discord/stores/StoreStickers;Lcom/discord/stores/StoreStickers$OwnedStickerPackState;)V
+ iget-object v0, p0, Lcom/discord/stores/StoreStickers$fetchOwnedStickerPacks$1$2$1;->$ownedPacks:Ljava/util/List;
+
+ invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+ move-result-object v0
+
+ :goto_1
+ invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+ move-result v1
+
+ if-eqz v1, :cond_2
+
+ invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+ move-result-object v1
+
+ check-cast v1, Lcom/discord/models/sticker/dto/ModelUserStickerPack;
+
+ iget-object v2, p0, Lcom/discord/stores/StoreStickers$fetchOwnedStickerPacks$1$2$1;->this$0:Lcom/discord/stores/StoreStickers$fetchOwnedStickerPacks$1$2;
+
+ iget-object v2, v2, Lcom/discord/stores/StoreStickers$fetchOwnedStickerPacks$1$2;->this$0:Lcom/discord/stores/StoreStickers$fetchOwnedStickerPacks$1;
+
+ iget-object v2, v2, Lcom/discord/stores/StoreStickers$fetchOwnedStickerPacks$1;->this$0:Lcom/discord/stores/StoreStickers;
+
+ invoke-static {v2}, Lcom/discord/stores/StoreStickers;->access$getPurchasingStickerPacks$p(Lcom/discord/stores/StoreStickers;)Ljava/util/Set;
+
+ move-result-object v2
+
+ invoke-virtual {v1}, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->getPackId()J
+
+ move-result-wide v3
+
+ invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v1
+
+ invoke-interface {v2, v1}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
+
+ goto :goto_1
+
+ :cond_2
iget-object v0, p0, Lcom/discord/stores/StoreStickers$fetchOwnedStickerPacks$1$2$1;->this$0:Lcom/discord/stores/StoreStickers$fetchOwnedStickerPacks$1$2;
iget-object v0, v0, Lcom/discord/stores/StoreStickers$fetchOwnedStickerPacks$1$2;->this$0:Lcom/discord/stores/StoreStickers$fetchOwnedStickerPacks$1;
@@ -145,7 +187,40 @@
iget-object v1, p0, Lcom/discord/stores/StoreStickers$fetchOwnedStickerPacks$1$2$1;->$ownedPacks:Ljava/util/List;
- invoke-virtual {v0, v1}, Lcom/discord/stores/StoreStickers;->handleNewLoadedStickerPacks(Ljava/util/List;)V
+ new-instance v2, Ljava/util/ArrayList;
+
+ invoke-direct {v2}, Ljava/util/ArrayList;->()V
+
+ invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+ move-result-object v1
+
+ :cond_3
+ :goto_2
+ invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+
+ move-result v3
+
+ if-eqz v3, :cond_4
+
+ invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+ move-result-object v3
+
+ check-cast v3, Lcom/discord/models/sticker/dto/ModelUserStickerPack;
+
+ invoke-virtual {v3}, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->getStickerPack()Lcom/discord/models/sticker/dto/ModelStickerPack;
+
+ move-result-object v3
+
+ if-eqz v3, :cond_3
+
+ invoke-interface {v2, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+ goto :goto_2
+
+ :cond_4
+ invoke-virtual {v0, v2}, Lcom/discord/stores/StoreStickers;->handleNewLoadedStickerPacks(Ljava/util/List;)V
return-void
.end method
diff --git a/com.discord/smali/com/discord/stores/StoreStickers$fetchOwnedStickerPacks$1$2.smali b/com.discord/smali/com/discord/stores/StoreStickers$fetchOwnedStickerPacks$1$2.smali
index d34bd822ee..997d16c774 100644
--- a/com.discord/smali/com/discord/stores/StoreStickers$fetchOwnedStickerPacks$1$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreStickers$fetchOwnedStickerPacks$1$2.smali
@@ -22,7 +22,7 @@
"Lkotlin/jvm/functions/Function1<",
"Ljava/util/List<",
"+",
- "Lcom/discord/models/sticker/dto/ModelStickerPack;",
+ "Lcom/discord/models/sticker/dto/ModelUserStickerPack;",
">;",
"Lkotlin/Unit;",
">;"
@@ -67,7 +67,7 @@
value = {
"(",
"Ljava/util/List<",
- "Lcom/discord/models/sticker/dto/ModelStickerPack;",
+ "Lcom/discord/models/sticker/dto/ModelUserStickerPack;",
">;)V"
}
.end annotation
diff --git a/com.discord/smali/com/discord/stores/StoreStickers.smali b/com.discord/smali/com/discord/stores/StoreStickers.smali
index b40f13eb97..06d746ed21 100644
--- a/com.discord/smali/com/discord/stores/StoreStickers.smali
+++ b/com.discord/smali/com/discord/stores/StoreStickers.smali
@@ -708,100 +708,6 @@
return-void
.end method
-.method public final handleNewOwnedStickerPack(Lcom/discord/models/sticker/dto/ModelStickerPack;)V
- .locals 3
- .annotation runtime Lcom/discord/stores/StoreThread;
- .end annotation
-
- const-string v0, "stickerPack"
-
- invoke-static {p1, v0}, Lc0/n/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
-
- iget-object v0, p0, Lcom/discord/stores/StoreStickers;->ownedStickerPackState:Lcom/discord/stores/StoreStickers$OwnedStickerPackState;
-
- instance-of v1, v0, Lcom/discord/stores/StoreStickers$OwnedStickerPackState$Loaded;
-
- if-nez v1, :cond_0
-
- const/4 v0, 0x0
-
- :cond_0
- check-cast v0, Lcom/discord/stores/StoreStickers$OwnedStickerPackState$Loaded;
-
- if-eqz v0, :cond_2
-
- invoke-virtual {v0}, Lcom/discord/stores/StoreStickers$OwnedStickerPackState$Loaded;->getOwnedStickerPacks()Ljava/util/Map;
-
- move-result-object v0
-
- invoke-static {v0}, Lf/h/a/f/e/n/f;->toMutableMap(Ljava/util/Map;)Ljava/util/Map;
-
- move-result-object v0
-
- invoke-virtual {p1}, Lcom/discord/models/sticker/dto/ModelStickerPack;->getId()J
-
- move-result-wide v1
-
- invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
- move-result-object v1
-
- move-object v2, v0
-
- check-cast v2, Ljava/util/HashMap;
-
- invoke-virtual {v2, v1, p1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
- new-instance p1, Lcom/discord/stores/StoreStickers$OwnedStickerPackState$Loaded;
-
- invoke-direct {p1, v0}, Lcom/discord/stores/StoreStickers$OwnedStickerPackState$Loaded;->(Ljava/util/Map;)V
-
- iput-object p1, p0, Lcom/discord/stores/StoreStickers;->ownedStickerPackState:Lcom/discord/stores/StoreStickers$OwnedStickerPackState;
-
- check-cast v0, Ljava/util/LinkedHashMap;
-
- invoke-virtual {v0}, Ljava/util/LinkedHashMap;->keySet()Ljava/util/Set;
-
- move-result-object p1
-
- invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
- move-result-object p1
-
- :goto_0
- invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
-
- move-result v0
-
- if-eqz v0, :cond_1
-
- invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
- move-result-object v0
-
- check-cast v0, Ljava/lang/Number;
-
- invoke-virtual {v0}, Ljava/lang/Number;->longValue()J
-
- move-result-wide v0
-
- iget-object v2, p0, Lcom/discord/stores/StoreStickers;->purchasingStickerPacks:Ljava/util/Set;
-
- invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
- move-result-object v0
-
- invoke-interface {v2, v0}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
-
- goto :goto_0
-
- :cond_1
- invoke-virtual {p0}, Lcom/discord/stores/StoreV2;->markChanged()V
-
- :cond_2
- return-void
-.end method
-
.method public final handlePreLogout()V
.locals 4
.annotation runtime Lcom/discord/stores/StoreThread;
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
index 70e2d5d98b..3956e1f7b2 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
@@ -173,7 +173,7 @@
const-string v3, "browser_user_agent"
- const-string v4, "Discord-Android/1279"
+ const-string v4, "Discord-Android/1280"
invoke-direct {v2, v3, v4}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V
@@ -181,7 +181,7 @@
const/4 v1, 0x2
- const/16 v2, 0x4ff
+ const/16 v2, 0x500
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -201,7 +201,7 @@
const-string v3, "client_version"
- const-string v4, "41.10"
+ const-string v4, "41.11"
invoke-direct {v2, v3, v4}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/utilities/billing/GooglePlayBillingManager$GooglePlayBillingManagerLifecycleListener.smali b/com.discord/smali/com/discord/utilities/billing/GooglePlayBillingManager$GooglePlayBillingManagerLifecycleListener.smali
index 9be4649eeb..f0aae2f198 100644
--- a/com.discord/smali/com/discord/utilities/billing/GooglePlayBillingManager$GooglePlayBillingManagerLifecycleListener.smali
+++ b/com.discord/smali/com/discord/utilities/billing/GooglePlayBillingManager$GooglePlayBillingManagerLifecycleListener.smali
@@ -1,10 +1,7 @@
.class public final Lcom/discord/utilities/billing/GooglePlayBillingManager$GooglePlayBillingManagerLifecycleListener;
-.super Ljava/lang/Object;
+.super Lcom/discord/utilities/rx/ActivityLifecycleCallbacks;
.source "GooglePlayBillingManager.kt"
-# interfaces
-.implements Landroid/app/Application$ActivityLifecycleCallbacks;
-
# annotations
.annotation system Ldalvik/annotation/EnclosingClass;
@@ -21,21 +18,37 @@
.method public constructor ()V
.locals 0
- invoke-direct {p0}, Ljava/lang/Object;->()V
+ invoke-direct {p0}, Lcom/discord/utilities/rx/ActivityLifecycleCallbacks;->()V
return-void
.end method
# virtual methods
-.method public onActivityCreated(Landroid/app/Activity;Landroid/os/Bundle;)V
- .locals 0
+.method public onActivityCreated(Lcom/discord/app/AppActivity;Landroid/os/Bundle;)V
+ .locals 1
- const-string p2, "activity"
+ const-string v0, "activity"
- invoke-static {p1, p2}, Lc0/n/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {p1, v0}, Lc0/n/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
- instance-of p1, p1, Lcom/discord/app/AppActivity$Main;
+ invoke-super {p0, p1, p2}, Lcom/discord/utilities/rx/ActivityLifecycleCallbacks;->onActivityCreated(Lcom/discord/app/AppActivity;Landroid/os/Bundle;)V
+
+ sget-object p2, Lf/a/b/m;->g:Lf/a/b/m;
+
+ sget-object p2, Lf/a/b/m;->f:Ljava/util/List;
+
+ invoke-virtual {p1, p2}, Lcom/discord/app/AppActivity;->l(Ljava/util/List;)Z
+
+ move-result p1
+
+ if-eqz p1, :cond_0
+
+ sget-object p1, Lcom/discord/utilities/billing/GooglePlayBillingManager;->INSTANCE:Lcom/discord/utilities/billing/GooglePlayBillingManager;
+
+ invoke-static {p1}, Lcom/discord/utilities/billing/GooglePlayBillingManager;->access$isAuthenticated$p(Lcom/discord/utilities/billing/GooglePlayBillingManager;)Z
+
+ move-result p1
if-eqz p1, :cond_0
@@ -47,14 +60,22 @@
return-void
.end method
-.method public onActivityDestroyed(Landroid/app/Activity;)V
+.method public onActivityDestroyed(Lcom/discord/app/AppActivity;)V
.locals 1
const-string v0, "activity"
invoke-static {p1, v0}, Lc0/n/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
- instance-of p1, p1, Lcom/discord/app/AppActivity$Main;
+ invoke-super {p0, p1}, Lcom/discord/utilities/rx/ActivityLifecycleCallbacks;->onActivityDestroyed(Lcom/discord/app/AppActivity;)V
+
+ sget-object v0, Lf/a/b/m;->g:Lf/a/b/m;
+
+ sget-object v0, Lf/a/b/m;->f:Ljava/util/List;
+
+ invoke-virtual {p1, v0}, Lcom/discord/app/AppActivity;->l(Ljava/util/List;)Z
+
+ move-result p1
if-eqz p1, :cond_0
@@ -66,24 +87,30 @@
return-void
.end method
-.method public onActivityPaused(Landroid/app/Activity;)V
+.method public onActivityResumed(Lcom/discord/app/AppActivity;)V
.locals 1
const-string v0, "activity"
invoke-static {p1, v0}, Lc0/n/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
- return-void
-.end method
+ invoke-super {p0, p1}, Lcom/discord/utilities/rx/ActivityLifecycleCallbacks;->onActivityResumed(Lcom/discord/app/AppActivity;)V
-.method public onActivityResumed(Landroid/app/Activity;)V
- .locals 1
+ sget-object v0, Lf/a/b/m;->g:Lf/a/b/m;
- const-string v0, "activity"
+ sget-object v0, Lf/a/b/m;->f:Ljava/util/List;
- invoke-static {p1, v0}, Lc0/n/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-virtual {p1, v0}, Lcom/discord/app/AppActivity;->l(Ljava/util/List;)Z
- instance-of p1, p1, Lcom/discord/app/AppActivity$Main;
+ move-result p1
+
+ if-eqz p1, :cond_0
+
+ sget-object p1, Lcom/discord/utilities/billing/GooglePlayBillingManager;->INSTANCE:Lcom/discord/utilities/billing/GooglePlayBillingManager;
+
+ invoke-static {p1}, Lcom/discord/utilities/billing/GooglePlayBillingManager;->access$isAuthenticated$p(Lcom/discord/utilities/billing/GooglePlayBillingManager;)Z
+
+ move-result p1
if-eqz p1, :cond_0
@@ -94,37 +121,3 @@
:cond_0
return-void
.end method
-
-.method public onActivitySaveInstanceState(Landroid/app/Activity;Landroid/os/Bundle;)V
- .locals 1
-
- const-string v0, "activity"
-
- invoke-static {p1, v0}, Lc0/n/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
-
- const-string p1, "outState"
-
- invoke-static {p2, p1}, Lc0/n/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
-
- return-void
-.end method
-
-.method public onActivityStarted(Landroid/app/Activity;)V
- .locals 1
-
- const-string v0, "activity"
-
- invoke-static {p1, v0}, Lc0/n/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
-
- return-void
-.end method
-
-.method public onActivityStopped(Landroid/app/Activity;)V
- .locals 1
-
- const-string v0, "activity"
-
- invoke-static {p1, v0}, Lc0/n/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
-
- return-void
-.end method
diff --git a/com.discord/smali/com/discord/utilities/billing/GooglePlayBillingManager$init$1.smali b/com.discord/smali/com/discord/utilities/billing/GooglePlayBillingManager$init$1.smali
new file mode 100644
index 0000000000..dfeb03e277
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/billing/GooglePlayBillingManager$init$1.smali
@@ -0,0 +1,83 @@
+.class public final Lcom/discord/utilities/billing/GooglePlayBillingManager$init$1;
+.super Lc0/n/c/k;
+.source "GooglePlayBillingManager.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/utilities/billing/GooglePlayBillingManager;->init(Landroid/app/Application;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Lc0/n/c/k;",
+ "Lkotlin/jvm/functions/Function1<",
+ "Ljava/lang/Boolean;",
+ "Lkotlin/Unit;",
+ ">;"
+ }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/utilities/billing/GooglePlayBillingManager$init$1;
+
+
+# direct methods
+.method public static constructor ()V
+ .locals 1
+
+ new-instance v0, Lcom/discord/utilities/billing/GooglePlayBillingManager$init$1;
+
+ invoke-direct {v0}, Lcom/discord/utilities/billing/GooglePlayBillingManager$init$1;->()V
+
+ sput-object v0, Lcom/discord/utilities/billing/GooglePlayBillingManager$init$1;->INSTANCE:Lcom/discord/utilities/billing/GooglePlayBillingManager$init$1;
+
+ return-void
+.end method
+
+.method public constructor ()V
+ .locals 1
+
+ const/4 v0, 0x1
+
+ invoke-direct {p0, v0}, Lc0/n/c/k;->(I)V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 0
+
+ check-cast p1, Ljava/lang/Boolean;
+
+ invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
+
+ move-result p1
+
+ invoke-virtual {p0, p1}, Lcom/discord/utilities/billing/GooglePlayBillingManager$init$1;->invoke(Z)V
+
+ sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+ return-object p1
+.end method
+
+.method public final invoke(Z)V
+ .locals 1
+
+ sget-object v0, Lcom/discord/utilities/billing/GooglePlayBillingManager;->INSTANCE:Lcom/discord/utilities/billing/GooglePlayBillingManager;
+
+ invoke-static {v0, p1}, Lcom/discord/utilities/billing/GooglePlayBillingManager;->access$setAuthenticated$p(Lcom/discord/utilities/billing/GooglePlayBillingManager;Z)V
+
+ return-void
+.end method
diff --git a/com.discord/smali/com/discord/utilities/billing/GooglePlayBillingManager.smali b/com.discord/smali/com/discord/utilities/billing/GooglePlayBillingManager.smali
index a06f76ba34..9d1ac14546 100644
--- a/com.discord/smali/com/discord/utilities/billing/GooglePlayBillingManager.smali
+++ b/com.discord/smali/com/discord/utilities/billing/GooglePlayBillingManager.smali
@@ -29,6 +29,8 @@
.field public static billingClient:Lcom/android/billingclient/api/BillingClient;
+.field public static isAuthenticated:Z
+
.field public static isReconnecting:Ljava/util/concurrent/atomic/AtomicBoolean;
@@ -96,6 +98,14 @@
throw p0
.end method
+.method public static final synthetic access$isAuthenticated$p(Lcom/discord/utilities/billing/GooglePlayBillingManager;)Z
+ .locals 0
+
+ sget-boolean p0, Lcom/discord/utilities/billing/GooglePlayBillingManager;->isAuthenticated:Z
+
+ return p0
+.end method
+
.method public static final synthetic access$isReconnecting$p(Lcom/discord/utilities/billing/GooglePlayBillingManager;)Ljava/util/concurrent/atomic/AtomicBoolean;
.locals 0
@@ -104,6 +114,14 @@
return-object p0
.end method
+.method public static final synthetic access$setAuthenticated$p(Lcom/discord/utilities/billing/GooglePlayBillingManager;Z)V
+ .locals 0
+
+ sput-boolean p1, Lcom/discord/utilities/billing/GooglePlayBillingManager;->isAuthenticated:Z
+
+ return-void
+.end method
+
.method public static final synthetic access$setBackoffTimeMs$p(Lcom/discord/utilities/billing/GooglePlayBillingManager;Ljava/util/concurrent/atomic/AtomicLong;)V
.locals 0
@@ -168,7 +186,7 @@
# virtual methods
.method public final init(Landroid/app/Application;)V
- .locals 3
+ .locals 9
const-string v0, "application"
@@ -198,6 +216,34 @@
invoke-virtual {p1, v0}, Landroid/app/Application;->registerActivityLifecycleCallbacks(Landroid/app/Application$ActivityLifecycleCallbacks;)V
+ sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+ invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getAuthentication()Lcom/discord/stores/StoreAuthentication;
+
+ move-result-object p1
+
+ invoke-virtual {p1}, Lcom/discord/stores/StoreAuthentication;->getIsAuthed$app_productionDiscordExternalRelease()Lrx/Observable;
+
+ move-result-object v0
+
+ const-class v1, Lcom/discord/utilities/billing/GooglePlayBillingManager;
+
+ const/4 v2, 0x0
+
+ const/4 v3, 0x0
+
+ const/4 v4, 0x0
+
+ const/4 v5, 0x0
+
+ sget-object v6, Lcom/discord/utilities/billing/GooglePlayBillingManager$init$1;->INSTANCE:Lcom/discord/utilities/billing/GooglePlayBillingManager$init$1;
+
+ const/16 v7, 0x1e
+
+ const/4 v8, 0x0
+
+ invoke-static/range {v0 .. v8}, 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
@@ -1384,7 +1430,7 @@
.end method
.method public onSkuDetailsResponse(Lcom/android/billingclient/api/BillingResult;Ljava/util/List;)V
- .locals 9
+ .locals 7
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
@@ -1404,10 +1450,6 @@
iget-object p1, p1, Lcom/android/billingclient/api/BillingResult;->b:Ljava/lang/String;
- const/16 v1, 0x20
-
- const-string v2, "onSkuDetailsResponse: "
-
packed-switch v0, :pswitch_data_0
goto :goto_1
@@ -1432,41 +1474,13 @@
goto :goto_1
:pswitch_1
- sget-object p2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+ sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
- invoke-virtual {p2}, Lcom/discord/stores/StoreStream$Companion;->getGooglePlaySkuDetails()Lcom/discord/stores/StoreGooglePlaySkuDetails;
+ invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getGooglePlaySkuDetails()Lcom/discord/stores/StoreGooglePlaySkuDetails;
- move-result-object p2
+ move-result-object p1
- invoke-virtual {p2}, Lcom/discord/stores/StoreGooglePlaySkuDetails;->handleError()V
-
- sget-object v3, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
-
- new-instance p2, Ljava/lang/StringBuilder;
-
- invoke-direct {p2}, Ljava/lang/StringBuilder;->()V
-
- invoke-virtual {p2, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
- invoke-virtual {p2, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
- invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
- move-result-object v4
-
- const/4 v5, 0x0
-
- const/4 v6, 0x0
-
- const/4 v7, 0x6
-
- const/4 v8, 0x0
-
- invoke-static/range {v3 .. v8}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
+ invoke-virtual {p1}, Lcom/discord/stores/StoreGooglePlaySkuDetails;->handleError()V
goto :goto_1
@@ -1479,33 +1493,37 @@
invoke-virtual {p2}, Lcom/discord/stores/StoreGooglePlaySkuDetails;->handleError()V
- sget-object v3, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+ sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
new-instance p2, Ljava/lang/StringBuilder;
invoke-direct {p2}, Ljava/lang/StringBuilder;->()V
+ const-string v2, "onSkuDetailsResponse: "
+
invoke-virtual {p2, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
- invoke-virtual {p2, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+ const/16 v0, 0x20
+
+ invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
- move-result-object v4
+ move-result-object v2
- const/4 v5, 0x0
+ const/4 v3, 0x0
+
+ const/4 v4, 0x0
+
+ const/4 v5, 0x6
const/4 v6, 0x0
- const/4 v7, 0x6
-
- const/4 v8, 0x0
-
- invoke-static/range {v3 .. v8}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
+ invoke-static/range {v1 .. v6}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
:goto_1
return-void
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 2e26b3ab7a..962964c847 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/1279"
+ const-string v0, "Discord-Android/1280"
return-object v0
.end method
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI.smali
index 3b3a5201f9..277bfe52d0 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI.smali
@@ -1291,35 +1291,6 @@
return-object p1
.end method
-.method public claimStickerPack(J)Lrx/Observable;
- .locals 1
- .param p1 # J
- .annotation runtime Lk0/k0/q;
- value = "packId"
- .end annotation
- .end param
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "(J)",
- "Lrx/Observable<",
- "Lcom/discord/models/sticker/dto/ModelStickerPack;",
- ">;"
- }
- .end annotation
-
- .annotation runtime Lk0/k0/n;
- value = "users/@me/sticker-packs/{packId}"
- .end annotation
-
- iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
-
- invoke-interface {v0, p1, p2}, Lcom/discord/restapi/RestAPIInterface;->claimStickerPack(J)Lrx/Observable;
-
- move-result-object p1
-
- return-object p1
-.end method
-
.method public convertDMToGroup(JJ)Lrx/Observable;
.locals 1
.param p1 # J
@@ -3911,7 +3882,7 @@
"()",
"Lrx/Observable<",
"Ljava/util/List<",
- "Lcom/discord/models/sticker/dto/ModelStickerPack;",
+ "Lcom/discord/models/sticker/dto/ModelUserStickerPack;",
">;>;"
}
.end annotation
diff --git a/com.discord/smali/com/discord/widgets/chat/input/sticker/StickerPackStoreSheetViewModel.smali b/com.discord/smali/com/discord/widgets/chat/input/sticker/StickerPackStoreSheetViewModel.smali
index 7bd50a9798..b7d6bbcdfe 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/sticker/StickerPackStoreSheetViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/sticker/StickerPackStoreSheetViewModel.smali
@@ -152,6 +152,8 @@
instance-of v3, v0, Lcom/discord/stores/StoreStickers$OwnedStickerPackState$Loaded;
+ const/4 v6, 0x0
+
if-eqz v3, :cond_0
check-cast v0, Lcom/discord/stores/StoreStickers$OwnedStickerPackState$Loaded;
@@ -160,23 +162,39 @@
move-result-object v0
- iget-wide v6, p0, Lcom/discord/widgets/chat/input/sticker/StickerPackStoreSheetViewModel;->stickerPackId:J
+ iget-wide v7, p0, Lcom/discord/widgets/chat/input/sticker/StickerPackStoreSheetViewModel;->stickerPackId:J
- invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+ invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
move-result-object v3
- invoke-interface {v0, v3}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
+ invoke-interface {v0, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
- move-result v0
+ move-result-object v0
- move v8, v0
+ check-cast v0, Lcom/discord/models/sticker/dto/ModelUserStickerPack;
+
+ if-eqz v0, :cond_0
+
+ invoke-virtual {v0}, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->getHasAccess()Z
+
+ move-result v3
+
+ if-eqz v3, :cond_0
+
+ invoke-virtual {v0}, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->getStickerPack()Lcom/discord/models/sticker/dto/ModelStickerPack;
+
+ move-result-object v0
+
+ if-eqz v0, :cond_0
+
+ const/4 v0, 0x1
+
+ const/4 v8, 0x1
goto :goto_0
:cond_0
- const/4 v0, 0x0
-
const/4 v8, 0x0
:goto_0
diff --git a/com.discord/smali/com/discord/widgets/chat/input/sticker/StickerPickerViewModel.smali b/com.discord/smali/com/discord/widgets/chat/input/sticker/StickerPickerViewModel.smali
index f99201b3ad..cb11dc231d 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/sticker/StickerPickerViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/sticker/StickerPickerViewModel.smali
@@ -306,7 +306,7 @@
instance-of p1, v0, Lcom/discord/stores/StoreStickers$OwnedStickerPackState$Loaded;
- if-eqz p1, :cond_1
+ if-eqz p1, :cond_4
check-cast v0, Lcom/discord/stores/StoreStickers$OwnedStickerPackState$Loaded;
@@ -314,26 +314,91 @@
move-result-object p1
- goto :goto_1
-
- :cond_1
- sget-object p1, Lc0/i/m;->d:Lc0/i/m;
-
- :goto_1
invoke-interface {p1}, Ljava/util/Map;->values()Ljava/util/Collection;
move-result-object p1
- invoke-interface {p1}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
+ new-instance v0, Ljava/util/ArrayList;
+
+ invoke-direct {v0}, Ljava/util/ArrayList;->()V
+
+ invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
move-result-object p1
+ :cond_1
+ :goto_1
+ invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+ move-result v7
+
+ if-eqz v7, :cond_2
+
+ invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+ move-result-object v7
+
+ move-object v8, v7
+
+ check-cast v8, Lcom/discord/models/sticker/dto/ModelUserStickerPack;
+
+ invoke-virtual {v8}, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->getHasAccess()Z
+
+ move-result v8
+
+ if-eqz v8, :cond_1
+
+ invoke-interface {v0, v7}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+ goto :goto_1
+
+ :cond_2
+ new-instance p1, Ljava/util/ArrayList;
+
+ invoke-direct {p1}, Ljava/util/ArrayList;->()V
+
+ invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+ move-result-object v0
+
+ :cond_3
:goto_2
+ invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+ move-result v7
+
+ if-eqz v7, :cond_5
+
+ invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+ move-result-object v7
+
+ check-cast v7, Lcom/discord/models/sticker/dto/ModelUserStickerPack;
+
+ invoke-virtual {v7}, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->getStickerPack()Lcom/discord/models/sticker/dto/ModelStickerPack;
+
+ move-result-object v7
+
+ if-eqz v7, :cond_3
+
+ invoke-interface {p1, v7}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+ goto :goto_2
+
+ :cond_4
+ sget-object p1, Lc0/i/l;->d:Lc0/i/l;
+
+ :cond_5
+ invoke-interface {p1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+ move-result-object p1
+
+ :goto_3
invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
move-result v0
- if-eqz v0, :cond_3
+ if-eqz v0, :cond_7
invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
@@ -347,16 +412,16 @@
cmp-long v9, v2, v7
- if-nez v9, :cond_2
+ if-nez v9, :cond_6
const/4 v7, 0x1
- goto :goto_3
+ goto :goto_4
- :cond_2
+ :cond_6
const/4 v7, 0x0
- :goto_3
+ :goto_4
invoke-virtual {v0}, Lcom/discord/models/sticker/dto/ModelStickerPack;->getStickers()Ljava/util/List;
move-result-object v8
@@ -389,9 +454,9 @@
move v4, v8
- goto :goto_2
+ goto :goto_3
- :cond_3
+ :cond_7
return-object v1
.end method
@@ -459,7 +524,7 @@
iget-object v3, p0, Lcom/discord/widgets/chat/input/sticker/StickerPickerViewModel;->locale:Ljava/util/Locale;
- if-eqz v2, :cond_8
+ if-eqz v2, :cond_a
invoke-virtual {v2, v3}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
@@ -564,21 +629,43 @@
move-result-object v3
+ :cond_3
:goto_2
invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
move-result v6
- if-eqz v6, :cond_3
+ if-eqz v6, :cond_5
invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
move-result-object v6
- check-cast v6, Lcom/discord/models/sticker/dto/ModelStickerPack;
+ check-cast v6, Lcom/discord/models/sticker/dto/ModelUserStickerPack;
+ invoke-virtual {v6}, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->getStickerPack()Lcom/discord/models/sticker/dto/ModelStickerPack;
+
+ move-result-object v8
+
+ if-eqz v8, :cond_3
+
+ invoke-virtual {v6}, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->getHasAccess()Z
+
+ move-result v8
+
+ if-nez v8, :cond_4
+
+ goto :goto_2
+
+ :cond_4
sget-object v8, Lcom/discord/widgets/chat/input/sticker/StickerPickerViewModel;->Companion:Lcom/discord/widgets/chat/input/sticker/StickerPickerViewModel$Companion;
+ invoke-virtual {v6}, Lcom/discord/models/sticker/dto/ModelUserStickerPack;->getStickerPack()Lcom/discord/models/sticker/dto/ModelStickerPack;
+
+ move-result-object v6
+
+ invoke-static {v6}, Lc0/n/c/j;->checkNotNull(Ljava/lang/Object;)V
+
iget-object v9, p0, Lcom/discord/widgets/chat/input/sticker/StickerPickerViewModel;->locale:Ljava/util/Locale;
invoke-static {v8, v6, v2, v1, v9}, Lcom/discord/widgets/chat/input/sticker/StickerPickerViewModel$Companion;->access$buildOwnedStickerListItems(Lcom/discord/widgets/chat/input/sticker/StickerPickerViewModel$Companion;Lcom/discord/models/sticker/dto/ModelStickerPack;Ljava/lang/String;ILjava/util/Locale;)Ljava/util/List;
@@ -589,24 +676,24 @@
goto :goto_2
- :cond_3
+ :cond_5
invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
move-result v0
const/4 v1, 0x0
- if-eqz v0, :cond_4
+ if-eqz v0, :cond_6
const/4 v0, 0x1
goto :goto_3
- :cond_4
+ :cond_6
const/4 v0, 0x0
:goto_3
- if-eqz v0, :cond_5
+ if-eqz v0, :cond_7
new-instance p1, Lcom/discord/widgets/chat/input/sticker/StickerPickerViewModel$ViewState$NoOwnedPacks;
@@ -618,26 +705,26 @@
goto :goto_5
- :cond_5
+ :cond_7
invoke-interface {v4}, Ljava/util/Collection;->isEmpty()Z
move-result v0
- if-eqz v0, :cond_7
+ if-eqz v0, :cond_9
invoke-interface {v2}, Ljava/lang/CharSequence;->length()I
move-result v0
- if-lez v0, :cond_6
+ if-lez v0, :cond_8
goto :goto_4
- :cond_6
+ :cond_8
const/4 v7, 0x0
:goto_4
- if-eqz v7, :cond_7
+ if-eqz v7, :cond_9
new-instance v0, Lcom/discord/widgets/chat/input/sticker/StickerPickerViewModel$ViewState$EmptySearchResults;
@@ -653,7 +740,7 @@
goto :goto_5
- :cond_7
+ :cond_9
new-instance v0, Lcom/discord/widgets/chat/input/sticker/StickerPickerViewModel$ViewState$Stickers;
invoke-virtual {p1}, Lcom/discord/widgets/chat/input/sticker/StickerPickerViewModel$StoreState$Loaded;->getSearchInputStringUpper()Ljava/lang/String;
@@ -669,7 +756,7 @@
:goto_5
return-void
- :cond_8
+ :cond_a
new-instance p1, Ljava/lang/NullPointerException;
const-string v0, "null cannot be cast to non-null type java.lang.String"
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
index 73785c945b..b04b6783dd 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
@@ -446,7 +446,7 @@
new-array v2, v0, [Ljava/lang/Object;
- const-string v4, "41.10"
+ const-string v4, "41.11"
aput-object v4, v2, v3
diff --git a/com.discord/smali/f/a/b/m.smali b/com.discord/smali/f/a/b/m.smali
index fe86e26fa3..b3b26313dc 100644
--- a/com.discord/smali/f/a/b/m.smali
+++ b/com.discord/smali/f/a/b/m.smali
@@ -63,7 +63,18 @@
.end annotation
.end field
-.field public static final f:Lf/a/b/m;
+.field public static final f:Ljava/util/List;
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Ljava/util/List<",
+ "Lc0/r/b<",
+ "Lcom/discord/widgets/tabs/WidgetTabsHost;",
+ ">;>;"
+ }
+ .end annotation
+.end field
+
+.field public static final g:Lf/a/b/m;
# direct methods
@@ -74,7 +85,7 @@
invoke-direct {v0}, Lf/a/b/m;->()V
- sput-object v0, Lf/a/b/m;->f:Lf/a/b/m;
+ sput-object v0, Lf/a/b/m;->g:Lf/a/b/m;
const/16 v0, 0x8
@@ -680,6 +691,18 @@
sput-object v0, Lf/a/b/m;->e:Ljava/util/List;
+ const-class v0, Lcom/discord/widgets/tabs/WidgetTabsHost;
+
+ invoke-static {v0}, Lc0/n/c/u;->getOrCreateKotlinClass(Ljava/lang/Class;)Lc0/r/b;
+
+ move-result-object v0
+
+ invoke-static {v0}, Lf/h/a/f/e/n/f;->listOf(Ljava/lang/Object;)Ljava/util/List;
+
+ move-result-object v0
+
+ sput-object v0, Lf/a/b/m;->f:Ljava/util/List;
+
return-void
.end method
@@ -858,15 +881,17 @@
invoke-virtual {v0, v1, v2}, Lcom/discord/app/AppLog;->g(Ljava/lang/String;Ljava/lang/String;)V
- new-instance v0, Landroid/content/Intent;
-
if-eqz p2, :cond_0
+ new-instance v0, Landroid/content/Intent;
+
invoke-direct {v0, p2}, Landroid/content/Intent;->(Landroid/content/Intent;)V
goto :goto_0
:cond_0
+ new-instance v0, Landroid/content/Intent;
+
invoke-direct {v0}, Landroid/content/Intent;->()V
:goto_0
@@ -882,7 +907,7 @@
move-result-object p1
- const-string p2, "if (extras != null) { In\u2026nts.EXTRA_SCREEN, screen)"
+ const-string p2, "if (extras != null) {\n \u2026nts.EXTRA_SCREEN, screen)"
invoke-static {p1, p2}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
@@ -956,15 +981,17 @@
invoke-virtual {v1, v2, v3}, Lcom/discord/app/AppLog;->g(Ljava/lang/String;Ljava/lang/String;)V
- new-instance v1, Landroid/content/Intent;
-
if-eqz p2, :cond_0
+ new-instance v1, Landroid/content/Intent;
+
invoke-direct {v1, p2}, Landroid/content/Intent;->(Landroid/content/Intent;)V
goto :goto_0
:cond_0
+ new-instance v1, Landroid/content/Intent;
+
invoke-direct {v1}, Landroid/content/Intent;->()V
:goto_0
@@ -980,7 +1007,7 @@
move-result-object p1
- const-string p2, "if (extras != null) { In\u2026nts.EXTRA_SCREEN, screen)"
+ const-string p2, "if (extras != null) {\n \u2026nts.EXTRA_SCREEN, screen)"
invoke-static {p1, p2}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
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 d9c87f2fc6..419140a966 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali
@@ -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;
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali
index 01b3c4cdaf..6fe1e87c38 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali
@@ -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