diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml
index bfb4b27f1b..d349cdb881 100644
--- a/com.discord/apktool.yml
+++ b/com.discord/apktool.yml
@@ -1,5 +1,5 @@
!!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-1036.apk
+apkFileName: com.discord-1037.apk
compressionType: false
doNotCompress:
- arsc
@@ -184,5 +184,5 @@ usesFramework:
tag: null
version: 2.4.1-197d46-SNAPSHOT
versionInfo:
- versionCode: '1036'
- versionName: 10.4.0
+ versionCode: '1037'
+ versionName: 10.4.1
diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties
index fead4ab3cc..9e509915e0 100644
--- a/com.discord/assets/crashlytics-build.properties
+++ b/com.discord/assets/crashlytics-build.properties
@@ -3,9 +3,9 @@
#
#Do NOT modify, delete, or commit to source control!
#
-#Wed Feb 12 18:26:31 UTC 2020
-version_name=10.4.0
+#Fri Feb 14 18:41:20 UTC 2020
+version_name=10.4.1
package_name=com.discord
-build_id=b311b87d-5b96-465b-8ba0-a55180bab683
-version_code=1036
+build_id=f98fc0f9-2aad-4841-a6e9-0ced66b70c0f
+version_code=1037
app_name=com.discord
diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml
index 48eda27989..444c850cf7 100644
Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ
diff --git a/com.discord/res/layout/widget_server_boost_status.xml b/com.discord/res/layout/widget_server_boost_status.xml
index 4554bc5097..f9b3e51b79 100644
--- a/com.discord/res/layout/widget_server_boost_status.xml
+++ b/com.discord/res/layout/widget_server_boost_status.xml
@@ -25,7 +25,7 @@
-
+
diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml
index 6b13bc051a..f4632cb4b3 100644
--- a/com.discord/res/values/strings.xml
+++ b/com.discord/res/values/strings.xml
@@ -1007,7 +1007,7 @@ ONE MORE THING {fixed}
OR
Collapse
Collapse Category
- b311b87d-5b96-465b-8ba0-a55180bab683
+ f98fc0f9-2aad-4841-a6e9-0ced66b70c0f
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 dcc367bc0b..e5a1fa6860 100644
--- a/com.discord/smali/com/discord/BuildConfig.smali
+++ b/com.discord/smali/com/discord/BuildConfig.smali
@@ -36,11 +36,11 @@
.field public static final SAMSUNGxDISCORD_CLIENT_ID:Ljava/lang/String; = "97t47j218f"
-.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1036"
+.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1037"
-.field public static final VERSION_CODE:I = 0x40c
+.field public static final VERSION_CODE:I = 0x40d
-.field public static final VERSION_NAME:Ljava/lang/String; = "10.4.0"
+.field public static final VERSION_NAME:Ljava/lang/String; = "10.4.1"
# direct methods
diff --git a/com.discord/smali/com/discord/models/domain/ModelUser.smali b/com.discord/smali/com/discord/models/domain/ModelUser.smali
index b4827845ef..fcb42c170b 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUser.smali
@@ -1183,6 +1183,24 @@
return v0
.end method
+.method public getAgeMs(J)J
+ .locals 2
+
+ iget-wide v0, p0, Lcom/discord/models/domain/ModelUser;->id:J
+
+ invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v0
+
+ invoke-static {v0}, Lcom/discord/utilities/time/TimeUtils;->parseSnowflake(Ljava/lang/Long;)J
+
+ move-result-wide v0
+
+ sub-long/2addr p1, v0
+
+ return-wide p1
+.end method
+
.method public getAvatar()Ljava/lang/String;
.locals 1
@@ -1919,25 +1937,17 @@
.method public isAccountOldEnough()Z
.locals 5
- iget-wide v0, p0, Lcom/discord/models/domain/ModelUser;->id:J
-
- invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
- move-result-object v0
-
- invoke-static {v0}, Lcom/discord/utilities/time/TimeUtils;->parseSnowflake(Ljava/lang/Long;)J
+ invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
move-result-wide v0
- invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
+ invoke-virtual {p0, v0, v1}, Lcom/discord/models/domain/ModelUser;->getAgeMs(J)J
- move-result-wide v2
+ move-result-wide v0
- sub-long/2addr v2, v0
+ const-wide/32 v2, 0x493e0
- const-wide/32 v0, 0x493e0
-
- cmp-long v4, v2, v0
+ cmp-long v4, v0, v2
if-lez v4, :cond_0
diff --git a/com.discord/smali/com/discord/stores/StoreAndroidPackages.smali b/com.discord/smali/com/discord/stores/StoreAndroidPackages.smali
index e07f7eb3eb..de77b3e06e 100644
--- a/com.discord/smali/com/discord/stores/StoreAndroidPackages.smali
+++ b/com.discord/smali/com/discord/stores/StoreAndroidPackages.smali
@@ -113,7 +113,7 @@
check-cast p1, Landroid/content/Context;
- if-eqz p1, :cond_2
+ if-eqz p1, :cond_6
const-string v0, "weakPackageManager.get() ?: return"
@@ -130,61 +130,118 @@
move-result-object p1
- const-string v0, "context.packageManager\n \u2026edPackages(0 /* flags */)"
+ const-string v0, "installedPackages"
invoke-static {p1, v0}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- new-instance v0, Ljava/util/ArrayList;
+ const/4 v0, 0x0
- invoke-direct {v0}, Ljava/util/ArrayList;->()V
+ if-eqz p1, :cond_5
+
+ invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+ move-result-object v1
+
+ :cond_0
+ invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+
+ move-result v2
+
+ if-eqz v2, :cond_1
+
+ invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+ move-result-object v2
+
+ move-object v3, v2
+
+ check-cast v3, Landroid/content/pm/PackageInfo;
+
+ iget-object v3, v3, Landroid/content/pm/PackageInfo;->packageName:Ljava/lang/String;
+
+ const/4 v4, 0x1
+
+ const-string v5, "com.samsung.android.game.gametools"
+
+ invoke-static {v3, v5, v4}, Lt/a0/n;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+ move-result v3
+
+ if-eqz v3, :cond_0
+
+ move-object v0, v2
+
+ :cond_1
+ check-cast v0, Landroid/content/pm/PackageInfo;
+
+ new-instance v1, Ljava/util/ArrayList;
+
+ invoke-direct {v1}, Ljava/util/ArrayList;->()V
invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
move-result-object p1
- :cond_0
+ :cond_2
:goto_0
invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
- move-result v1
+ move-result v2
- if-eqz v1, :cond_1
+ if-eqz v2, :cond_3
invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
- move-result-object v1
+ move-result-object v2
- move-object v2, v1
+ move-object v3, v2
- check-cast v2, Landroid/content/pm/PackageInfo;
+ check-cast v3, Landroid/content/pm/PackageInfo;
- sget-object v3, Lcom/discord/utilities/games/GameDetectionHelper;->INSTANCE:Lcom/discord/utilities/games/GameDetectionHelper;
+ sget-object v4, Lcom/discord/utilities/games/GameDetectionHelper;->INSTANCE:Lcom/discord/utilities/games/GameDetectionHelper;
- iget-object v2, v2, Landroid/content/pm/PackageInfo;->applicationInfo:Landroid/content/pm/ApplicationInfo;
+ iget-object v3, v3, Landroid/content/pm/PackageInfo;->applicationInfo:Landroid/content/pm/ApplicationInfo;
- const-string v4, "it.applicationInfo"
+ const-string v5, "it.applicationInfo"
- invoke-static {v2, v4}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {v3, v5}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-virtual {v3, v2}, Lcom/discord/utilities/games/GameDetectionHelper;->isSystemApp(Landroid/content/pm/ApplicationInfo;)Z
+ invoke-virtual {v4, v3}, Lcom/discord/utilities/games/GameDetectionHelper;->isSystemApp(Landroid/content/pm/ApplicationInfo;)Z
- move-result v2
+ move-result v3
- if-nez v2, :cond_0
+ if-nez v3, :cond_2
- invoke-interface {v0, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+ invoke-interface {v1, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
goto :goto_0
- :cond_1
+ :cond_3
iget-object p1, p0, Lcom/discord/stores/StoreAndroidPackages;->installedPackagesSubject:Lrx/subjects/BehaviorSubject;
- invoke-virtual {p1, v0}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
- :try_end_0
- .catchall {:try_start_0 .. :try_end_0} :catchall_0
+ if-nez v0, :cond_4
goto :goto_1
+ :cond_4
+ invoke-static {v1, v0}, Lt/q/l;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
+
+ move-result-object v1
+
+ :goto_1
+ invoke-virtual {p1, v1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+
+ goto :goto_2
+
+ :cond_5
+ const-string p1, "allPackages"
+
+ invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+
+ throw v0
+ :try_end_0
+ .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
:catchall_0
move-exception p1
@@ -202,8 +259,8 @@
invoke-static/range {v0 .. v5}, 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
- :cond_2
- :goto_1
+ :cond_6
+ :goto_2
return-void
.end method
diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali
index 5e86323cbb..576ffa1422 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, 0x40c
+ const/16 v0, 0x40d
iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I
diff --git a/com.discord/smali/com/discord/stores/StoreUser$observeMe$1.smali b/com.discord/smali/com/discord/stores/StoreUser$observeMe$1.smali
index 31501273d2..1ad2c76e44 100644
--- a/com.discord/smali/com/discord/stores/StoreUser$observeMe$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUser$observeMe$1.smali
@@ -57,7 +57,7 @@
# virtual methods
-.method public final call(Lcom/discord/models/domain/ModelUser;)Lcom/discord/models/domain/ModelUser;
+.method public final call(Lcom/discord/models/domain/ModelUser$Me;)Lcom/discord/models/domain/ModelUser$Me;
.locals 0
if-eqz p1, :cond_0
@@ -75,9 +75,9 @@
.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
.locals 0
- check-cast p1, Lcom/discord/models/domain/ModelUser;
+ check-cast p1, Lcom/discord/models/domain/ModelUser$Me;
- invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUser$observeMe$1;->call(Lcom/discord/models/domain/ModelUser;)Lcom/discord/models/domain/ModelUser;
+ invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUser$observeMe$1;->call(Lcom/discord/models/domain/ModelUser$Me;)Lcom/discord/models/domain/ModelUser$Me;
move-result-object p1
diff --git a/com.discord/smali/com/discord/stores/StoreUser.smali b/com.discord/smali/com/discord/stores/StoreUser.smali
index c953a9edf6..de58952e85 100644
--- a/com.discord/smali/com/discord/stores/StoreUser.smali
+++ b/com.discord/smali/com/discord/stores/StoreUser.smali
@@ -1211,7 +1211,7 @@
value = {
"(Z)",
"Lrx/Observable<",
- "Lcom/discord/models/domain/ModelUser;",
+ "Lcom/discord/models/domain/ModelUser$Me;",
">;"
}
.end annotation
@@ -1230,15 +1230,19 @@
move-result-object p1
- invoke-static {}, Le/a/b/k;->b()Lrx/Observable$c;
+ const-string v0, "mePublisher\n .get\u2026MPTY || emitNullOrEmpty }"
- move-result-object v0
+ invoke-static {p1, v0}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
+ invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
move-result-object p1
- const-string v0, "mePublisher\n .get\u2026onDistinctUntilChanged())"
+ invoke-virtual {p1}, Lrx/Observable;->a()Lrx/Observable;
+
+ move-result-object p1
+
+ const-string v0, "mePublisher\n .get\u2026 .distinctUntilChanged()"
invoke-static {p1, v0}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
@@ -1268,15 +1272,19 @@
move-result-object v0
- invoke-static {}, Le/a/b/k;->b()Lrx/Observable$c;
+ const-string v1, "meIdPublisher\n \u2026UserId? -> meId != null }"
- move-result-object v1
+ invoke-static {v0, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
+ invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
move-result-object v0
- const-string v1, "meIdPublisher\n \u2026onDistinctUntilChanged())"
+ invoke-virtual {v0}, Lrx/Observable;->a()Lrx/Observable;
+
+ move-result-object v0
+
+ const-string v1, "meIdPublisher\n \u2026 .distinctUntilChanged()"
invoke-static {v0, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
index a57a749c28..cf895e2ff0 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
@@ -177,7 +177,7 @@
const-string v3, "browser_user_agent"
- const-string v4, "Discord-Android/1036"
+ const-string v4, "Discord-Android/1037"
invoke-direct {v2, v3, v4}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V
@@ -185,7 +185,7 @@
const/4 v1, 0x2
- const/16 v2, 0x40c
+ const/16 v2, 0x40d
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -201,7 +201,7 @@
const/4 v1, 0x3
- const-string v2, "10.4.0"
+ const-string v2, "10.4.1"
const-string v3, ""
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$initAppOpen$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$initAppOpen$1.smali
index 27d77c6efc..a9cfee59f7 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$initAppOpen$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$initAppOpen$1.smali
@@ -20,7 +20,7 @@
value = {
"Lt/u/b/k;",
"Lkotlin/jvm/functions/Function1<",
- "Lcom/discord/models/domain/ModelUser;",
+ "Lcom/discord/models/domain/ModelUser$Me;",
"Lkotlin/Unit;",
">;"
}
@@ -59,16 +59,16 @@
.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
.locals 0
- check-cast p1, Lcom/discord/models/domain/ModelUser;
+ check-cast p1, Lcom/discord/models/domain/ModelUser$Me;
- invoke-virtual {p0, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$initAppOpen$1;->invoke(Lcom/discord/models/domain/ModelUser;)V
+ invoke-virtual {p0, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$initAppOpen$1;->invoke(Lcom/discord/models/domain/ModelUser$Me;)V
sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
return-object p1
.end method
-.method public final invoke(Lcom/discord/models/domain/ModelUser;)V
+.method public final invoke(Lcom/discord/models/domain/ModelUser$Me;)V
.locals 3
if-nez p1, :cond_0
@@ -123,7 +123,7 @@
move-result-object v0
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getEmail()Ljava/lang/String;
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser$Me;->getEmail()Ljava/lang/String;
move-result-object v1
diff --git a/com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo$Companion$get$1.smali b/com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo$Companion$get$1.smali
index 35c4386572..9c713b7e87 100644
--- a/com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo$Companion$get$1.smali
@@ -69,12 +69,12 @@
# virtual methods
-.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelNotificationSettings;Ljava/lang/Boolean;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/Map;)Lcom/discord/utilities/channel/GuildChannelsInfo;
+.method public final call(Lcom/discord/models/domain/ModelUser$Me;Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelNotificationSettings;Ljava/lang/Boolean;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/Map;)Lcom/discord/utilities/channel/GuildChannelsInfo;
.locals 11
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
- "Lcom/discord/models/domain/ModelUser;",
+ "Lcom/discord/models/domain/ModelUser$Me;",
"Lcom/discord/models/domain/ModelGuild;",
"Lcom/discord/models/domain/ModelNotificationSettings;",
"Ljava/lang/Boolean;",
@@ -97,7 +97,7 @@
if-eqz p1, :cond_0
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isMfaEnabled()Z
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser$Me;->isMfaEnabled()Z
move-result v2
@@ -307,7 +307,7 @@
.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
.locals 0
- check-cast p1, Lcom/discord/models/domain/ModelUser;
+ check-cast p1, Lcom/discord/models/domain/ModelUser$Me;
check-cast p2, Lcom/discord/models/domain/ModelGuild;
@@ -321,7 +321,7 @@
check-cast p7, Ljava/util/Map;
- invoke-virtual/range {p0 .. p7}, Lcom/discord/utilities/channel/GuildChannelsInfo$Companion$get$1;->call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelNotificationSettings;Ljava/lang/Boolean;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/Map;)Lcom/discord/utilities/channel/GuildChannelsInfo;
+ invoke-virtual/range {p0 .. p7}, Lcom/discord/utilities/channel/GuildChannelsInfo$Companion$get$1;->call(Lcom/discord/models/domain/ModelUser$Me;Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelNotificationSettings;Ljava/lang/Boolean;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/Map;)Lcom/discord/utilities/channel/GuildChannelsInfo;
move-result-object p1
diff --git a/com.discord/smali/com/discord/utilities/premium/PremiumUtils.smali b/com.discord/smali/com/discord/utilities/premium/PremiumUtils.smali
index f56108ab1b..f9b8bd1401 100644
--- a/com.discord/smali/com/discord/utilities/premium/PremiumUtils.smali
+++ b/com.discord/smali/com/discord/utilities/premium/PremiumUtils.smali
@@ -348,120 +348,6 @@
throw p1
.end method
-.method public final isAcceptableNitroGift(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGift;)Z
- .locals 3
-
- const/4 v0, 0x0
-
- if-eqz p1, :cond_7
-
- if-eqz p2, :cond_6
-
- invoke-virtual {p2}, Lcom/discord/models/domain/ModelGift;->isAnyNitroGift()Z
-
- move-result v1
-
- if-eqz v1, :cond_0
-
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getPremiumTier()Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;
-
- move-result-object v1
-
- sget-object v2, Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;->NONE:Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;
-
- if-eq v1, v2, :cond_4
-
- :cond_0
- invoke-virtual {p2}, Lcom/discord/models/domain/ModelGift;->getStoreListing()Lcom/discord/models/domain/ModelStoreListing;
-
- move-result-object v1
-
- if-eqz v1, :cond_1
-
- invoke-virtual {v1}, Lcom/discord/models/domain/ModelStoreListing;->getSku()Lcom/discord/models/domain/ModelSku;
-
- move-result-object v1
-
- if-eqz v1, :cond_1
-
- invoke-virtual {v1}, Lcom/discord/models/domain/ModelSku;->getSkuCategory()Lcom/discord/models/domain/ModelSku$SkuCategory;
-
- move-result-object v1
-
- goto :goto_0
-
- :cond_1
- move-object v1, v0
-
- :goto_0
- sget-object v2, Lcom/discord/models/domain/ModelSku$SkuCategory;->NITRO_CLASSIC:Lcom/discord/models/domain/ModelSku$SkuCategory;
-
- if-ne v1, v2, :cond_2
-
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getPremiumTier()Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;
-
- move-result-object v1
-
- sget-object v2, Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;->TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;
-
- if-eq v1, v2, :cond_4
-
- :cond_2
- invoke-virtual {p2}, Lcom/discord/models/domain/ModelGift;->getStoreListing()Lcom/discord/models/domain/ModelStoreListing;
-
- move-result-object p2
-
- if-eqz p2, :cond_3
-
- invoke-virtual {p2}, Lcom/discord/models/domain/ModelStoreListing;->getSku()Lcom/discord/models/domain/ModelSku;
-
- move-result-object p2
-
- if-eqz p2, :cond_3
-
- invoke-virtual {p2}, Lcom/discord/models/domain/ModelSku;->getSkuCategory()Lcom/discord/models/domain/ModelSku$SkuCategory;
-
- move-result-object v0
-
- :cond_3
- sget-object p2, Lcom/discord/models/domain/ModelSku$SkuCategory;->NITRO:Lcom/discord/models/domain/ModelSku$SkuCategory;
-
- if-ne v0, p2, :cond_5
-
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getPremiumTier()Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;
-
- move-result-object p1
-
- sget-object p2, Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;->TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;
-
- if-ne p1, p2, :cond_5
-
- :cond_4
- const/4 p1, 0x1
-
- goto :goto_1
-
- :cond_5
- const/4 p1, 0x0
-
- :goto_1
- return p1
-
- :cond_6
- const-string p1, "gift"
-
- invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
-
- throw v0
-
- :cond_7
- const-string p1, "user"
-
- invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
-
- throw v0
-.end method
-
.method public final isNitroSku(Lcom/discord/models/domain/ModelSku;)Z
.locals 2
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 b992779554..b70114d151 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/1036"
+ const-string v0, "Discord-Android/1037"
return-object v0
.end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali
index 5f0b131210..3140448eb4 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali
@@ -72,7 +72,7 @@
return-void
.end method
-.method public static synthetic a(Lcom/discord/models/domain/ModelChannel;Landroid/content/Context;Lcom/discord/models/domain/ModelUser;Lcom/discord/stores/StoreChat$EditingMessage;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/chat/input/WidgetChatInputModel;
+.method public static synthetic a(Lcom/discord/models/domain/ModelChannel;Landroid/content/Context;Lcom/discord/models/domain/ModelUser$Me;Lcom/discord/stores/StoreChat$EditingMessage;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/chat/input/WidgetChatInputModel;
.locals 16
move-object/from16 v1, p0
@@ -251,7 +251,7 @@
return-object p0
.end method
-.method public static synthetic a(JLjava/lang/Long;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;Ljava/util/Map;Lcom/discord/models/domain/ModelUser;)Ljava/lang/Integer;
+.method public static synthetic a(JLjava/lang/Long;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;Ljava/util/Map;Lcom/discord/models/domain/ModelUser$Me;)Ljava/lang/Integer;
.locals 2
invoke-static {p0, p1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
@@ -268,7 +268,15 @@
if-eqz p0, :cond_0
- invoke-static {p6, p0}, Le/e/b/a/a;->a(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+ invoke-virtual {p6}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+ move-result-wide v0
+
+ invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object p1
+
+ invoke-interface {p0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
move-result-object p0
@@ -328,7 +336,7 @@
:goto_2
if-eqz p6, :cond_3
- invoke-virtual {p6}, Lcom/discord/models/domain/ModelUser;->getPhone()Ljava/lang/String;
+ invoke-virtual {p6}, Lcom/discord/models/domain/ModelUser$Me;->getPhone()Ljava/lang/String;
move-result-object v0
@@ -414,7 +422,7 @@
:cond_9
if-eqz p6, :cond_b
- invoke-virtual {p6}, Lcom/discord/models/domain/ModelUser;->isVerified()Z
+ invoke-virtual {p6}, Lcom/discord/models/domain/ModelUser$Me;->isVerified()Z
move-result p0
@@ -560,7 +568,7 @@
move-result-object v0
- sget-object v1, Le/a/k/b/a/c0;->d:Le/a/k/b/a/c0;
+ sget-object v1, Le/a/k/b/a/a0;->d:Le/a/k/b/a/a0;
invoke-virtual {v0, v1}, Lrx/Observable;->f(Lb0/l/i;)Lrx/Observable;
@@ -586,13 +594,13 @@
move-result-object v10
- new-instance v11, Le/a/k/b/a/z;
+ new-instance v11, Le/a/k/b/a/d0;
move-object v0, p0
move-object/from16 v1, p1
- invoke-direct {v11, v1, p0}, Le/a/k/b/a/z;->(Lcom/discord/models/domain/ModelChannel;Landroid/content/Context;)V
+ invoke-direct {v11, v1, p0}, Le/a/k/b/a/d0;->(Lcom/discord/models/domain/ModelChannel;Landroid/content/Context;)V
const-wide/16 v12, 0x15e
@@ -626,11 +634,11 @@
move-result-object v0
- sget-object v1, Le/a/k/b/a/b0;->d:Le/a/k/b/a/b0;
+ sget-object v1, Le/a/k/b/a/z;->d:Le/a/k/b/a/z;
- new-instance v2, Le/a/k/b/a/d0;
+ new-instance v2, Le/a/k/b/a/b0;
- invoke-direct {v2, p0}, Le/a/k/b/a/d0;->(Landroid/content/Context;)V
+ invoke-direct {v2, p0}, Le/a/k/b/a/b0;->(Landroid/content/Context;)V
const/4 p0, 0x0
@@ -766,9 +774,9 @@
move-result-object v5
- new-instance v6, Le/a/k/b/a/y;
+ new-instance v6, Le/a/k/b/a/c0;
- invoke-direct {v6, p0, p1}, Le/a/k/b/a/y;->(J)V
+ invoke-direct {v6, p0, p1}, Le/a/k/b/a/c0;->(J)V
invoke-static/range {v1 .. v6}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func5;)Lrx/Observable;
@@ -806,7 +814,7 @@
return-object v0
:cond_1
- sget-object v0, Le/a/k/b/a/a0;->d:Le/a/k/b/a/a0;
+ sget-object v0, Le/a/k/b/a/y;->d:Le/a/k/b/a/y;
return-object v0
.end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali
index 71e1ed6c43..4f9ad87410 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali
@@ -785,7 +785,7 @@
.end method
.method private final configureResolvedUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;)V
- .locals 26
+ .locals 25
move-object/from16 v0, p0
@@ -809,6 +809,8 @@
move-result-object v4
+ const/4 v5, 0x1
+
const/4 v6, 0x0
if-eqz v4, :cond_0
@@ -871,31 +873,31 @@
const/4 v8, 0x0
:goto_1
- invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
+ invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getInLibrary()Z
+
+ move-result v9
+
+ if-nez v9, :cond_2
+
+ if-nez v8, :cond_2
+
+ invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getRedeeming()Z
+
+ move-result v9
+
+ if-nez v9, :cond_2
+
+ invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getMeUser()Lcom/discord/models/domain/ModelUser;
move-result-object v9
- invoke-virtual {v9}, Lcom/discord/models/domain/ModelGift;->isAnyNitroGift()Z
+ invoke-virtual {v9}, Lcom/discord/models/domain/ModelUser;->isVerified()Z
move-result v9
if-eqz v9, :cond_2
- sget-object v9, Lcom/discord/utilities/premium/PremiumUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumUtils;
-
- invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getMeUser()Lcom/discord/models/domain/ModelUser;
-
- move-result-object v10
-
- invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
-
- move-result-object v11
-
- invoke-virtual {v9, v10, v11}, Lcom/discord/utilities/premium/PremiumUtils;->isAcceptableNitroGift(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGift;)Z
-
- move-result v9
-
- if-nez v9, :cond_2
+ if-nez v7, :cond_2
const/4 v9, 0x1
@@ -905,111 +907,73 @@
const/4 v9, 0x0
:goto_2
- invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getInLibrary()Z
+ sget-object v10, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
- move-result v10
+ invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
- if-nez v10, :cond_3
+ move-result-object v11
- if-nez v8, :cond_3
+ invoke-virtual {v11}, Lcom/discord/models/domain/ModelGift;->getStoreListing()Lcom/discord/models/domain/ModelStoreListing;
- invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getRedeeming()Z
+ move-result-object v11
- move-result v10
+ if-eqz v11, :cond_3
- if-nez v10, :cond_3
+ invoke-virtual {v11}, Lcom/discord/models/domain/ModelStoreListing;->getSku()Lcom/discord/models/domain/ModelSku;
- invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getMeUser()Lcom/discord/models/domain/ModelUser;
+ move-result-object v11
- move-result-object v10
+ if-eqz v11, :cond_3
- invoke-virtual {v10}, Lcom/discord/models/domain/ModelUser;->isVerified()Z
+ invoke-virtual {v11}, Lcom/discord/models/domain/ModelSku;->getApplicationId()J
- move-result v10
-
- if-eqz v10, :cond_3
-
- if-nez v9, :cond_3
-
- if-nez v7, :cond_3
-
- const/4 v10, 0x1
+ move-result-wide v14
goto :goto_3
:cond_3
- const/4 v10, 0x0
+ const-wide/16 v14, 0x0
:goto_3
- sget-object v11, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
-
invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
- move-result-object v12
+ move-result-object v11
- invoke-virtual {v12}, Lcom/discord/models/domain/ModelGift;->getStoreListing()Lcom/discord/models/domain/ModelStoreListing;
+ invoke-virtual {v11}, Lcom/discord/models/domain/ModelGift;->getStoreListing()Lcom/discord/models/domain/ModelStoreListing;
- move-result-object v12
+ move-result-object v11
- if-eqz v12, :cond_4
+ const/4 v12, 0x0
- invoke-virtual {v12}, Lcom/discord/models/domain/ModelStoreListing;->getSku()Lcom/discord/models/domain/ModelSku;
+ if-eqz v11, :cond_4
- move-result-object v12
+ invoke-virtual {v11}, Lcom/discord/models/domain/ModelStoreListing;->getSku()Lcom/discord/models/domain/ModelSku;
- if-eqz v12, :cond_4
+ move-result-object v11
- invoke-virtual {v12}, Lcom/discord/models/domain/ModelSku;->getApplicationId()J
+ if-eqz v11, :cond_4
- move-result-wide v15
+ invoke-virtual {v11}, Lcom/discord/models/domain/ModelSku;->getApplication()Lcom/discord/models/domain/ModelApplication;
- move-wide v13, v15
+ move-result-object v11
+
+ if-eqz v11, :cond_4
+
+ invoke-virtual {v11}, Lcom/discord/models/domain/ModelApplication;->getSplash()Ljava/lang/String;
+
+ move-result-object v11
goto :goto_4
:cond_4
- const-wide/16 v13, 0x0
+ move-object v11, v12
:goto_4
- invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
+ iget-object v13, v0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
- move-result-object v12
+ invoke-static {v13, v3}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-virtual {v12}, Lcom/discord/models/domain/ModelGift;->getStoreListing()Lcom/discord/models/domain/ModelStoreListing;
-
- move-result-object v12
-
- const/4 v15, 0x0
-
- if-eqz v12, :cond_5
-
- invoke-virtual {v12}, Lcom/discord/models/domain/ModelStoreListing;->getSku()Lcom/discord/models/domain/ModelSku;
-
- move-result-object v12
-
- if-eqz v12, :cond_5
-
- invoke-virtual {v12}, Lcom/discord/models/domain/ModelSku;->getApplication()Lcom/discord/models/domain/ModelApplication;
-
- move-result-object v12
-
- if-eqz v12, :cond_5
-
- invoke-virtual {v12}, Lcom/discord/models/domain/ModelApplication;->getSplash()Ljava/lang/String;
-
- move-result-object v12
-
- goto :goto_5
-
- :cond_5
- move-object v12, v15
-
- :goto_5
- iget-object v5, v0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
-
- invoke-static {v5, v3}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- invoke-virtual {v5}, Landroid/view/View;->getWidth()I
+ invoke-virtual {v13}, Landroid/view/View;->getWidth()I
move-result v3
@@ -1017,9 +981,9 @@
move-result-object v3
- invoke-virtual {v11, v13, v14, v12, v3}, Lcom/discord/utilities/icon/IconUtils;->getGiftSplashUrl(JLjava/lang/String;Ljava/lang/Integer;)Ljava/lang/String;
+ invoke-virtual {v10, v14, v15, v11, v3}, Lcom/discord/utilities/icon/IconUtils;->getGiftSplashUrl(JLjava/lang/String;Ljava/lang/Integer;)Ljava/lang/String;
- move-result-object v18
+ move-result-object v17
invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
@@ -1029,27 +993,27 @@
move-result v3
- const/16 v5, 0x8
+ const/16 v10, 0x8
const-string v11, "context"
- if-eqz v3, :cond_6
+ if-eqz v3, :cond_5
invoke-static {v2, v11}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
const v3, 0x7f0401f4
- const v12, 0x7f08049e
+ const v13, 0x7f08049e
- invoke-static {v2, v3, v12}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/content/Context;II)I
+ invoke-static {v2, v3, v13}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/content/Context;II)I
move-result v3
invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->getImageBackground()Lcom/facebook/drawee/view/SimpleDraweeView;
- move-result-object v12
+ move-result-object v13
- invoke-virtual {v12, v3}, Lcom/facebook/drawee/view/SimpleDraweeView;->setActualImageResource(I)V
+ invoke-virtual {v13, v3}, Lcom/facebook/drawee/view/SimpleDraweeView;->setActualImageResource(I)V
invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->getImageBackground()Lcom/facebook/drawee/view/SimpleDraweeView;
@@ -1057,30 +1021,30 @@
invoke-virtual {v3, v6}, Landroid/widget/ImageView;->setVisibility(I)V
- goto :goto_6
+ goto :goto_5
- :cond_6
- if-eqz v18, :cond_7
+ :cond_5
+ if-eqz v17, :cond_6
invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->getImageBackground()Lcom/facebook/drawee/view/SimpleDraweeView;
- move-result-object v17
+ move-result-object v16
+
+ const/16 v18, 0x0
const/16 v19, 0x0
const/16 v20, 0x0
- const/16 v21, 0x0
+ sget-object v21, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$1;->INSTANCE:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$1;
- sget-object v22, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$1;->INSTANCE:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$1;
+ const/16 v22, 0x0
- const/16 v23, 0x0
+ const/16 v23, 0x5c
- const/16 v24, 0x5c
+ const/16 v24, 0x0
- const/16 v25, 0x0
-
- invoke-static/range {v17 .. v25}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
+ invoke-static/range {v16 .. v24}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->getImageBackground()Lcom/facebook/drawee/view/SimpleDraweeView;
@@ -1088,21 +1052,21 @@
invoke-virtual {v3, v6}, Landroid/widget/ImageView;->setVisibility(I)V
- goto :goto_6
+ goto :goto_5
- :cond_7
+ :cond_6
invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->getImageBackground()Lcom/facebook/drawee/view/SimpleDraweeView;
move-result-object v3
- invoke-virtual {v3, v5}, Landroid/widget/ImageView;->setVisibility(I)V
+ invoke-virtual {v3, v10}, Landroid/widget/ImageView;->setVisibility(I)V
- :goto_6
+ :goto_5
invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->getHeader()Lcom/discord/app/AppTextView;
move-result-object v3
- if-eqz v4, :cond_8
+ if-eqz v4, :cond_7
const v4, 0x7f1207b5
@@ -1110,16 +1074,16 @@
move-result-object v4
- goto :goto_7
+ goto :goto_6
- :cond_8
+ :cond_7
const v4, 0x7f1207b4
invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
move-result-object v4
- :goto_7
+ :goto_6
invoke-virtual {v3, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->getNameText()Landroid/widget/TextView;
@@ -1134,24 +1098,24 @@
move-result-object v4
- if-eqz v4, :cond_9
+ if-eqz v4, :cond_8
invoke-virtual {v4}, Lcom/discord/models/domain/ModelStoreListing;->getSku()Lcom/discord/models/domain/ModelSku;
move-result-object v4
- if-eqz v4, :cond_9
+ if-eqz v4, :cond_8
invoke-virtual {v4}, Lcom/discord/models/domain/ModelSku;->getName()Ljava/lang/String;
move-result-object v4
- goto :goto_8
+ goto :goto_7
- :cond_9
- move-object v4, v15
+ :cond_8
+ move-object v4, v12
- :goto_8
+ :goto_7
invoke-virtual {v3, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->getNameText()Landroid/widget/TextView;
@@ -1184,19 +1148,19 @@
move-result-object v4
- if-eqz v4, :cond_a
+ if-eqz v4, :cond_9
const/4 v4, 0x1
- goto :goto_9
+ goto :goto_8
- :cond_a
+ :cond_9
const/4 v4, 0x0
- :goto_9
- const/4 v12, 0x2
+ :goto_8
+ const/4 v13, 0x2
- invoke-static {v3, v4, v6, v12, v15}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+ invoke-static {v3, v4, v6, v13, v12}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
@@ -1206,31 +1170,29 @@
move-result-object v3
- if-eqz v3, :cond_b
+ if-eqz v3, :cond_a
invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->getExpiresText()Landroid/widget/TextView;
move-result-object v3
- const/4 v12, 0x1
+ new-array v13, v5, [Ljava/lang/Object;
- new-array v13, v12, [Ljava/lang/Object;
-
- sget-object v12, Lcom/discord/utilities/gifting/GiftingUtils;->INSTANCE:Lcom/discord/utilities/gifting/GiftingUtils;
+ sget-object v14, Lcom/discord/utilities/gifting/GiftingUtils;->INSTANCE:Lcom/discord/utilities/gifting/GiftingUtils;
invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
- move-result-object v14
+ move-result-object v15
invoke-static {}, Lcom/discord/utilities/time/ClockFactory;->get()Lcom/discord/utilities/time/Clock;
- move-result-object v17
+ move-result-object v16
- invoke-interface/range {v17 .. v17}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
+ invoke-interface/range {v16 .. v16}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
move-result-wide v4
- invoke-virtual {v14, v4, v5}, Lcom/discord/models/domain/ModelGift;->getExpiresDiff(J)J
+ invoke-virtual {v15, v4, v5}, Lcom/discord/models/domain/ModelGift;->getExpiresDiff(J)J
move-result-wide v4
@@ -1240,11 +1202,11 @@
move-result-object v11
- const-string v14, "context.resources"
+ const-string v15, "context.resources"
- invoke-static {v11, v14}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {v11, v15}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-virtual {v12, v4, v5, v11}, Lcom/discord/utilities/gifting/GiftingUtils;->getTimeString(JLandroid/content/res/Resources;)Ljava/lang/String;
+ invoke-virtual {v14, v4, v5, v11}, Lcom/discord/utilities/gifting/GiftingUtils;->getTimeString(JLandroid/content/res/Resources;)Ljava/lang/String;
move-result-object v4
@@ -1258,7 +1220,7 @@
invoke-virtual {v3, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
- :cond_b
+ :cond_a
invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
move-result-object v3
@@ -1269,7 +1231,7 @@
const/4 v4, 0x4
- if-eqz v3, :cond_c
+ if-eqz v3, :cond_b
invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->getImage()Lcom/facebook/drawee/view/SimpleDraweeView;
@@ -1285,11 +1247,11 @@
move-result v5
- invoke-static {v3, v5, v15, v4, v15}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;ILcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
+ invoke-static {v3, v5, v12, v4, v12}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;ILcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
- goto :goto_c
+ goto :goto_b
- :cond_c
+ :cond_b
invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
move-result-object v3
@@ -1298,27 +1260,27 @@
move-result-object v3
- if-eqz v3, :cond_e
+ if-eqz v3, :cond_d
invoke-virtual {v3}, Lcom/discord/models/domain/ModelStoreListing;->getSku()Lcom/discord/models/domain/ModelSku;
move-result-object v3
- if-eqz v3, :cond_e
+ if-eqz v3, :cond_d
invoke-virtual {v3}, Lcom/discord/models/domain/ModelSku;->getApplication()Lcom/discord/models/domain/ModelApplication;
move-result-object v3
- if-eqz v3, :cond_e
+ if-eqz v3, :cond_d
invoke-virtual {v3}, Lcom/discord/models/domain/ModelApplication;->getIcon()Ljava/lang/String;
- move-result-object v22
+ move-result-object v21
- if-eqz v22, :cond_e
+ if-eqz v21, :cond_d
- sget-object v19, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
+ sget-object v18, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
@@ -1328,49 +1290,49 @@
move-result-object v3
- if-eqz v3, :cond_d
+ if-eqz v3, :cond_c
invoke-virtual {v3}, Lcom/discord/models/domain/ModelStoreListing;->getSku()Lcom/discord/models/domain/ModelSku;
move-result-object v3
- if-eqz v3, :cond_d
+ if-eqz v3, :cond_c
invoke-virtual {v3}, Lcom/discord/models/domain/ModelSku;->getApplicationId()J
move-result-wide v13
- move-wide/from16 v20, v13
+ move-wide/from16 v19, v13
+
+ goto :goto_9
+
+ :cond_c
+ const-wide/16 v19, 0x0
+
+ :goto_9
+ const/16 v22, 0x0
+
+ const/16 v23, 0x4
+
+ const/16 v24, 0x0
+
+ invoke-static/range {v18 .. v24}, Lcom/discord/utilities/icon/IconUtils;->getApplicationIcon$default(Lcom/discord/utilities/icon/IconUtils;JLjava/lang/String;IILjava/lang/Object;)Ljava/lang/String;
+
+ move-result-object v3
goto :goto_a
:cond_d
- const-wide/16 v20, 0x0
+ move-object v3, v12
:goto_a
- const/16 v23, 0x0
-
- const/16 v24, 0x4
-
- const/16 v25, 0x0
-
- invoke-static/range {v19 .. v25}, Lcom/discord/utilities/icon/IconUtils;->getApplicationIcon$default(Lcom/discord/utilities/icon/IconUtils;JLjava/lang/String;IILjava/lang/Object;)Ljava/lang/String;
-
- move-result-object v3
-
- goto :goto_b
-
- :cond_e
- move-object v3, v15
-
- :goto_b
invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->getImage()Lcom/facebook/drawee/view/SimpleDraweeView;
move-result-object v5
invoke-virtual {v5, v3}, Lcom/facebook/drawee/view/SimpleDraweeView;->setImageURI(Ljava/lang/String;)V
- :goto_c
+ :goto_b
invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getMeUser()Lcom/discord/models/domain/ModelUser;
move-result-object v3
@@ -1383,9 +1345,9 @@
const-string v11, "["
- const-string v12, ""
+ const-string v13, ""
- if-nez v3, :cond_f
+ if-nez v3, :cond_e
const v3, 0x7f12075f
@@ -1399,48 +1361,37 @@
const-string v8, "(onClick)"
- invoke-static {v3, v8, v12, v6, v4}, Lt/a0/n;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+ invoke-static {v3, v8, v13, v6, v4}, Lt/a0/n;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
move-result-object v3
- invoke-static {v3, v11, v12, v6, v4}, Lt/a0/n;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+ invoke-static {v3, v11, v13, v6, v4}, Lt/a0/n;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
move-result-object v3
- invoke-static {v3, v5, v12, v6, v4}, Lt/a0/n;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+ invoke-static {v3, v5, v13, v6, v4}, Lt/a0/n;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
- move-result-object v15
+ move-result-object v12
- goto :goto_d
+ goto :goto_c
- :cond_f
- if-eqz v7, :cond_10
+ :cond_e
+ if-eqz v7, :cond_f
const v3, 0x7f120790
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
- move-result-object v15
+ move-result-object v12
- goto :goto_d
+ goto :goto_c
- :cond_10
- if-eqz v9, :cond_11
-
- const v3, 0x7f12076d
-
- invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
-
- move-result-object v15
-
- goto :goto_d
-
- :cond_11
+ :cond_f
invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getInLibrary()Z
move-result v3
- if-eqz v3, :cond_12
+ if-eqz v3, :cond_10
const v3, 0x7f12075e
@@ -1448,7 +1399,7 @@
new-array v8, v8, [Ljava/lang/Object;
- aput-object v12, v8, v6
+ aput-object v13, v8, v6
invoke-virtual {v2, v3, v8}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -1460,38 +1411,38 @@
const-string v8, "()"
- invoke-static {v3, v8, v12, v6, v4}, Lt/a0/n;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+ invoke-static {v3, v8, v13, v6, v4}, Lt/a0/n;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
move-result-object v3
- invoke-static {v3, v11, v12, v6, v4}, Lt/a0/n;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+ invoke-static {v3, v11, v13, v6, v4}, Lt/a0/n;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
move-result-object v3
- invoke-static {v3, v5, v12, v6, v4}, Lt/a0/n;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+ invoke-static {v3, v5, v13, v6, v4}, Lt/a0/n;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
- move-result-object v15
+ move-result-object v12
- goto :goto_d
+ goto :goto_c
- :cond_12
- if-eqz v8, :cond_13
+ :cond_10
+ if-eqz v8, :cond_11
const v3, 0x7f12075d
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
- move-result-object v15
+ move-result-object v12
- :cond_13
- :goto_d
+ :cond_11
+ :goto_c
invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->getSubText()Landroid/widget/TextView;
move-result-object v3
- invoke-static {v3, v15}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
+ invoke-static {v3, v12}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
- if-eqz v10, :cond_14
+ if-eqz v9, :cond_12
invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->getAcceptButton()Landroid/widget/Button;
@@ -1507,9 +1458,9 @@
move-result-object v3
- goto :goto_f
+ goto :goto_e
- :cond_14
+ :cond_12
invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getMeUser()Lcom/discord/models/domain/ModelUser;
move-result-object v3
@@ -1518,7 +1469,7 @@
move-result v3
- if-nez v3, :cond_15
+ if-nez v3, :cond_13
invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->getVerifyButton()Landroid/widget/Button;
@@ -1532,55 +1483,48 @@
move-result-object v3
- goto :goto_f
+ goto :goto_e
- :cond_15
+ :cond_13
invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->getCannotClaimButton()Landroid/widget/Button;
move-result-object v3
- const v4, 0x7f1207a4
-
- if-eqz v9, :cond_16
-
- const v4, 0x7f1207a3
-
- goto :goto_e
-
- :cond_16
invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getRedeeming()Z
- move-result v5
+ move-result v4
- if-eqz v5, :cond_17
+ const v5, 0x7f1207a4
- const v4, 0x7f1207a5
+ if-eqz v4, :cond_14
- goto :goto_e
+ const v5, 0x7f1207a5
- :cond_17
- if-eqz v7, :cond_18
+ goto :goto_d
- goto :goto_e
+ :cond_14
+ if-eqz v7, :cond_15
- :cond_18
+ goto :goto_d
+
+ :cond_15
invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getInLibrary()Z
- move-result v5
+ move-result v4
- if-eqz v5, :cond_19
+ if-eqz v4, :cond_16
- const v4, 0x7f1207a6
+ const v5, 0x7f1207a6
- :cond_19
- :goto_e
- invoke-virtual {v3, v4}, Landroid/widget/Button;->setText(I)V
+ :cond_16
+ :goto_d
+ invoke-virtual {v3, v5}, Landroid/widget/Button;->setText(I)V
invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->getCannotClaimButton()Landroid/widget/Button;
move-result-object v3
- :goto_f
+ :goto_e
invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->getButtons()Ljava/util/List;
move-result-object v4
@@ -1589,12 +1533,12 @@
move-result-object v4
- :goto_10
+ :goto_f
invoke-interface {v4}, Ljava/util/Iterator;->hasNext()Z
move-result v5
- if-eqz v5, :cond_1b
+ if-eqz v5, :cond_18
invoke-interface {v4}, Ljava/util/Iterator;->next()Ljava/lang/Object;
@@ -1602,24 +1546,20 @@
check-cast v5, Landroid/view/View;
- if-ne v5, v3, :cond_1a
+ if-ne v5, v3, :cond_17
check-cast v5, Landroid/widget/Button;
invoke-virtual {v5, v6}, Landroid/widget/Button;->setVisibility(I)V
- const/16 v7, 0x8
+ goto :goto_f
- goto :goto_10
+ :cond_17
+ invoke-virtual {v5, v10}, Landroid/view/View;->setVisibility(I)V
- :cond_1a
- const/16 v7, 0x8
+ goto :goto_f
- invoke-virtual {v5, v7}, Landroid/view/View;->setVisibility(I)V
-
- goto :goto_10
-
- :cond_1b
+ :cond_18
invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
move-result-object v3
@@ -1628,7 +1568,7 @@
move-result v3
- if-eqz v3, :cond_1c
+ if-eqz v3, :cond_19
iget-object v1, v0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
@@ -1636,9 +1576,9 @@
invoke-virtual {v1, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
- goto :goto_11
+ goto :goto_10
- :cond_1c
+ :cond_19
iget-object v3, v0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
new-instance v4, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$4;
@@ -1647,7 +1587,7 @@
invoke-virtual {v3, v4}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
- :goto_11
+ :goto_10
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 c23f0075e8..29c31ddad0 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
@@ -492,7 +492,7 @@
new-array v1, v2, [Ljava/lang/Object;
- const-string v3, "10.4.0"
+ const-string v3, "10.4.1"
aput-object v3, v1, v4
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList.smali
index 9833979dce..99d3399813 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList.smali
@@ -1020,7 +1020,11 @@
new-instance v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory;
- invoke-direct {v0}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory;->()V
+ invoke-static {}, Lcom/discord/utilities/time/ClockFactory;->get()Lcom/discord/utilities/time/Clock;
+
+ move-result-object v1
+
+ invoke-direct {v0, v1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory;->(Lcom/discord/utilities/time/Clock;)V
invoke-static {p0, v0}, Landroidx/lifecycle/ViewModelProviders;->of(Landroidx/fragment/app/Fragment;Landroidx/lifecycle/ViewModelProvider$Factory;)Landroidx/lifecycle/ViewModelProvider;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$3.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$3.smali
index 6fe919a1da..f0732e68b9 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$3.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$3.smali
@@ -30,26 +30,16 @@
.end annotation
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$3;
+# instance fields
+.field public final synthetic this$0:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory;
# direct methods
-.method public static constructor ()V
- .locals 1
-
- new-instance v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$3;
-
- invoke-direct {v0}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$3;->()V
-
- sput-object v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$3;->INSTANCE:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$3;
-
- return-void
-.end method
-
-.method public constructor ()V
+.method public constructor (Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory;)V
.locals 0
+ iput-object p1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$3;->this$0:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory;
+
invoke-direct {p0}, Ljava/lang/Object;->()V
return-void
@@ -74,13 +64,29 @@
.end method
.method public final call(Lcom/discord/models/domain/ModelUser;)Z
- .locals 0
+ .locals 4
- if-eqz p1, :cond_0
+ iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$3;->this$0:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory;
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
+ invoke-static {v0}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory;->access$getClock$p(Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory;)Lcom/discord/utilities/time/Clock;
- move-result p1
+ move-result-object v0
+
+ invoke-interface {v0}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
+
+ move-result-wide v0
+
+ invoke-virtual {p1, v0, v1}, Lcom/discord/models/domain/ModelUser;->getAgeMs(J)J
+
+ move-result-wide v0
+
+ const-wide/32 v2, 0x48190800
+
+ cmp-long p1, v0, v2
+
+ if-gez p1, :cond_0
+
+ const/4 p1, 0x1
goto :goto_0
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$4.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$4.smali
index 92bf02d56d..4ca0e62b26 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$4.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$4.smali
@@ -3,7 +3,7 @@
.source "WidgetGuildsListViewModel.kt"
# interfaces
-.implements Lrx/functions/Func6;
+.implements Lrx/functions/Func5;
# annotations
@@ -28,14 +28,12 @@
"Ljava/lang/Object;",
"T5:",
"Ljava/lang/Object;",
- "T6:",
- "Ljava/lang/Object;",
"R:",
"Ljava/lang/Object;",
">",
"Ljava/lang/Object;",
- "Lrx/functions/Func6<",
- "TT1;TT2;TT3;TT4;TT5;TT6;TR;>;"
+ "Lrx/functions/Func5<",
+ "TT1;TT2;TT3;TT4;TT5;TR;>;"
}
.end annotation
@@ -67,8 +65,8 @@
# virtual methods
-.method public final call(Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk;Ljava/util/Set;Ljava/util/Set;Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;Ljava/lang/Boolean;Ljava/util/Map;)Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
- .locals 21
+.method public final call(Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk;Ljava/util/Set;Ljava/util/Set;Ljava/lang/Boolean;Ljava/util/Map;)Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
+ .locals 17
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
@@ -79,7 +77,6 @@
"Ljava/util/Set<",
"Ljava/lang/Long;",
">;",
- "Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;",
"Ljava/lang/Boolean;",
"Ljava/util/Map<",
"Ljava/lang/Long;",
@@ -89,17 +86,7 @@
}
.end annotation
- move-object/from16 v12, p2
-
- move-object/from16 v13, p3
-
- move-object/from16 v15, p4
-
- move-object/from16 v16, p6
-
- new-instance v17, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
-
- move-object/from16 v0, v17
+ new-instance v16, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk;->getSelectedGuildId()J
@@ -137,54 +124,42 @@
move-result-object v11
- const-string v14, "lurkingGuildIds"
+ const-string v0, "lurkingGuildIds"
- move-object/from16 v18, v0
+ move-object/from16 v12, p2
- move-object/from16 v0, p2
-
- invoke-static {v0, v14}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {v12, v0}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
const-string v0, "openFolderIds"
- move-object/from16 v14, p3
+ move-object/from16 v13, p3
+
+ invoke-static {v13, v0}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ const-string v0, "isNewUser"
+
+ move-object/from16 v14, p4
invoke-static {v14, v0}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const-string v0, "isUserStaff"
-
- move-object/from16 v14, p5
-
- invoke-static {v14, v0}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- invoke-virtual/range {p5 .. p5}, Ljava/lang/Boolean;->booleanValue()Z
+ invoke-virtual/range {p4 .. p4}, Ljava/lang/Boolean;->booleanValue()Z
move-result v14
- const-string v0, "experiment"
-
- move-wide/from16 v19, v1
-
- move-object/from16 v1, p4
-
- invoke-static {v1, v0}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
const-string v0, "allApplicationStreamContexts"
- move-object/from16 v1, p6
+ move-object/from16 v15, p5
- invoke-static {v1, v0}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {v15, v0}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- move-object/from16 v0, v18
+ move-object/from16 v0, v16
- move-wide/from16 v1, v19
+ invoke-direct/range {v0 .. v15}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->(JJLjava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/List;Ljava/util/Set;Ljava/util/Set;ZLjava/util/Map;)V
- invoke-direct/range {v0 .. v16}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->(JJLjava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/List;Ljava/util/Set;Ljava/util/Set;ZLcom/discord/stores/StoreExperiments$ExperimentAndStaff;Ljava/util/Map;)V
-
- return-object v17
+ return-object v16
.end method
-.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
.locals 0
check-cast p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk;
@@ -193,13 +168,11 @@
check-cast p3, Ljava/util/Set;
- check-cast p4, Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;
+ check-cast p4, Ljava/lang/Boolean;
- check-cast p5, Ljava/lang/Boolean;
+ check-cast p5, Ljava/util/Map;
- check-cast p6, Ljava/util/Map;
-
- invoke-virtual/range {p0 .. p6}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$4;->call(Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk;Ljava/util/Set;Ljava/util/Set;Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;Ljava/lang/Boolean;Ljava/util/Map;)Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
+ invoke-virtual/range {p0 .. p5}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$4;->call(Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk;Ljava/util/Set;Ljava/util/Set;Ljava/lang/Boolean;Ljava/util/Map;)Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
move-result-object p1
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory.smali
index 9cf48b066d..3f74d2d772 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory.smali
@@ -23,17 +23,42 @@
.end annotation
+# instance fields
+.field public final clock:Lcom/discord/utilities/time/Clock;
+
+
# direct methods
-.method public constructor ()V
+.method public constructor (Lcom/discord/utilities/time/Clock;)V
.locals 0
+ if-eqz p1, :cond_0
+
invoke-direct {p0}, Ljava/lang/Object;->()V
+ iput-object p1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory;->clock:Lcom/discord/utilities/time/Clock;
+
return-void
+
+ :cond_0
+ const-string p1, "clock"
+
+ invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+
+ const/4 p1, 0x0
+
+ throw p1
+.end method
+
+.method public static final synthetic access$getClock$p(Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory;)Lcom/discord/utilities/time/Clock;
+ .locals 0
+
+ iget-object p0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory;->clock:Lcom/discord/utilities/time/Clock;
+
+ return-object p0
.end method
.method private final observeStores()Lrx/Observable;
- .locals 16
+ .locals 15
.annotation system Ldalvik/annotation/Signature;
value = {
"()",
@@ -77,22 +102,6 @@
sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
- invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getExperiments()Lcom/discord/stores/StoreExperiments;
-
- move-result-object v0
-
- const/4 v4, 0x0
-
- const-string v5, "2020-01_guild_help_nux"
-
- const/4 v6, 0x2
-
- invoke-static {v0, v5, v4, v6, v4}, Lcom/discord/stores/StoreExperiments;->getExperimentAndStaff$default(Lcom/discord/stores/StoreExperiments;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lrx/Observable;
-
- move-result-object v4
-
- sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getUsers()Lcom/discord/stores/StoreUser;
move-result-object v0
@@ -101,14 +110,22 @@
move-result-object v0
- sget-object v5, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$3;->INSTANCE:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$3;
+ invoke-virtual {v0}, Lrx/Observable;->a()Lrx/Observable;
- invoke-virtual {v0, v5}, Lrx/Observable;->f(Lb0/l/i;)Lrx/Observable;
+ move-result-object v0
- move-result-object v5
+ new-instance v4, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$3;
+
+ invoke-direct {v4, p0}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$3;->(Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory;)V
+
+ invoke-virtual {v0, v4}, Lrx/Observable;->f(Lb0/l/i;)Lrx/Observable;
+
+ move-result-object v4
new-instance v0, Lcom/discord/utilities/streams/StreamContextService;
+ const/4 v6, 0x0
+
const/4 v7, 0x0
const/4 v8, 0x0
@@ -121,23 +138,21 @@
const/4 v12, 0x0
- const/4 v13, 0x0
+ const/16 v13, 0x7f
- const/16 v14, 0x7f
+ const/4 v14, 0x0
- const/4 v15, 0x0
+ move-object v5, v0
- move-object v6, v0
-
- invoke-direct/range {v6 .. v15}, Lcom/discord/utilities/streams/StreamContextService;->(Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreApplicationStreamPreviews;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ invoke-direct/range {v5 .. v14}, Lcom/discord/utilities/streams/StreamContextService;->(Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreApplicationStreamPreviews;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
invoke-virtual {v0}, Lcom/discord/utilities/streams/StreamContextService;->getForAllStreamingUsers()Lrx/Observable;
- move-result-object v6
+ move-result-object v5
- sget-object v7, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$4;->INSTANCE:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$4;
+ sget-object v6, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$4;->INSTANCE:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$4;
- invoke-static/range {v1 .. v7}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func6;)Lrx/Observable;
+ invoke-static/range {v1 .. v6}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func5;)Lrx/Observable;
move-result-object v0
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState.smali
index f4cbf7d97a..3197db546c 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState.smali
@@ -38,8 +38,6 @@
.end annotation
.end field
-.field public final experiment:Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;
-
.field public final guildSettings:Ljava/util/Map;
.annotation system Ldalvik/annotation/Signature;
value = {
@@ -51,7 +49,7 @@
.end annotation
.end field
-.field public final isUserStaff:Z
+.field public final isNewUser:Z
.field public final lurkingGuildIds:Ljava/util/Set;
.annotation system Ldalvik/annotation/Signature;
@@ -131,8 +129,8 @@
# direct methods
-.method public constructor (JJLjava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/List;Ljava/util/Set;Ljava/util/Set;ZLcom/discord/stores/StoreExperiments$ExperimentAndStaff;Ljava/util/Map;)V
- .locals 14
+.method public constructor (JJLjava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/List;Ljava/util/Set;Ljava/util/Set;ZLjava/util/Map;)V
+ .locals 13
.annotation system Ldalvik/annotation/Signature;
value = {
"(JJ",
@@ -172,7 +170,6 @@
"Ljava/util/Set<",
"Ljava/lang/Long;",
">;Z",
- "Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;",
"Ljava/util/Map<",
"Ljava/lang/Long;",
"Lcom/discord/utilities/streams/StreamContext;",
@@ -202,41 +199,37 @@
move-object/from16 v10, p15
- move-object/from16 v11, p16
+ const/4 v11, 0x0
- const/4 v12, 0x0
+ if-eqz v1, :cond_9
- if-eqz v1, :cond_a
+ if-eqz v2, :cond_8
- if-eqz v2, :cond_9
+ if-eqz v3, :cond_7
- if-eqz v3, :cond_8
+ if-eqz v4, :cond_6
- if-eqz v4, :cond_7
+ if-eqz v5, :cond_5
- if-eqz v5, :cond_6
+ if-eqz v6, :cond_4
- if-eqz v6, :cond_5
+ if-eqz v7, :cond_3
- if-eqz v7, :cond_4
+ if-eqz v8, :cond_2
- if-eqz v8, :cond_3
+ if-eqz v9, :cond_1
- if-eqz v9, :cond_2
-
- if-eqz v10, :cond_1
-
- if-eqz v11, :cond_0
+ if-eqz v10, :cond_0
invoke-direct {p0}, Ljava/lang/Object;->()V
- move-wide v12, p1
+ move-wide v11, p1
- iput-wide v12, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->selectedGuildId:J
+ iput-wide v11, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->selectedGuildId:J
- move-wide/from16 v12, p3
+ move-wide/from16 v11, p3
- iput-wide v12, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->selectedVoiceChannelId:J
+ iput-wide v11, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->selectedVoiceChannelId:J
iput-object v1, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->guildSettings:Ljava/util/Map;
@@ -258,11 +251,9 @@
move/from16 v1, p14
- iput-boolean v1, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->isUserStaff:Z
+ iput-boolean v1, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->isNewUser:Z
- iput-object v10, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->experiment:Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;
-
- iput-object v11, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->allApplicationStreamContexts:Ljava/util/Map;
+ iput-object v10, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->allApplicationStreamContexts:Ljava/util/Map;
return-void
@@ -271,85 +262,78 @@
invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
- throw v12
+ throw v11
:cond_1
- const-string v1, "experiment"
-
- invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
-
- throw v12
-
- :cond_2
const-string v1, "openFolderIds"
invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
- throw v12
+ throw v11
- :cond_3
+ :cond_2
const-string v1, "lurkingGuildIds"
invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
- throw v12
+ throw v11
- :cond_4
+ :cond_3
const-string v1, "sortedGuilds"
invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
- throw v12
+ throw v11
- :cond_5
+ :cond_4
const-string v1, "privateChannels"
invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
- throw v12
+ throw v11
- :cond_6
+ :cond_5
const-string v1, "unavailableGuilds"
invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
- throw v12
+ throw v11
- :cond_7
+ :cond_6
const-string v1, "channelIds"
invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
- throw v12
+ throw v11
- :cond_8
+ :cond_7
const-string v1, "mentionCounts"
invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
- throw v12
+ throw v11
- :cond_9
+ :cond_8
const-string v1, "unreadGuildIds"
invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
- throw v12
+ throw v11
- :cond_a
+ :cond_9
const-string v1, "guildSettings"
invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
- throw v12
+ throw v11
.end method
-.method public static synthetic copy$default(Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;JJLjava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/List;Ljava/util/Set;Ljava/util/Set;ZLcom/discord/stores/StoreExperiments$ExperimentAndStaff;Ljava/util/Map;ILjava/lang/Object;)Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
+.method public static synthetic copy$default(Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;JJLjava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/List;Ljava/util/Set;Ljava/util/Set;ZLjava/util/Map;ILjava/lang/Object;)Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
.locals 16
move-object/from16 v0, p0
- move/from16 v1, p17
+ move/from16 v1, p16
and-int/lit8 v2, v1, 0x1
@@ -487,7 +471,7 @@
if-eqz v15, :cond_b
- iget-boolean v15, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->isUserStaff:Z
+ iget-boolean v15, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->isNewUser:Z
goto :goto_b
@@ -495,32 +479,18 @@
move/from16 v15, p14
:goto_b
- move/from16 p14, v15
+ and-int/lit16 v1, v1, 0x1000
- and-int/lit16 v15, v1, 0x1000
+ if-eqz v1, :cond_c
- if-eqz v15, :cond_c
-
- iget-object v15, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->experiment:Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;
+ iget-object v1, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->allApplicationStreamContexts:Ljava/util/Map;
goto :goto_c
:cond_c
- move-object/from16 v15, p15
+ move-object/from16 v1, p15
:goto_c
- and-int/lit16 v1, v1, 0x2000
-
- if-eqz v1, :cond_d
-
- iget-object v1, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->allApplicationStreamContexts:Ljava/util/Map;
-
- goto :goto_d
-
- :cond_d
- move-object/from16 v1, p16
-
- :goto_d
move-wide/from16 p1, v2
move-wide/from16 p3, v4
@@ -543,11 +513,11 @@
move-object/from16 p13, v14
- move-object/from16 p15, v15
+ move/from16 p14, v15
- move-object/from16 p16, v1
+ move-object/from16 p15, v1
- invoke-virtual/range {p0 .. p16}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->copy(JJLjava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/List;Ljava/util/Set;Ljava/util/Set;ZLcom/discord/stores/StoreExperiments$ExperimentAndStaff;Ljava/util/Map;)Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
+ invoke-virtual/range {p0 .. p15}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->copy(JJLjava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/List;Ljava/util/Set;Ljava/util/Set;ZLjava/util/Map;)Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
move-result-object v0
@@ -599,20 +569,12 @@
.method public final component12()Z
.locals 1
- iget-boolean v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->isUserStaff:Z
+ iget-boolean v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->isNewUser:Z
return v0
.end method
-.method public final component13()Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;
- .locals 1
-
- iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->experiment:Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;
-
- return-object v0
-.end method
-
-.method public final component14()Ljava/util/Map;
+.method public final component13()Ljava/util/Map;
.locals 1
.annotation system Ldalvik/annotation/Signature;
value = {
@@ -754,8 +716,8 @@
return-object v0
.end method
-.method public final copy(JJLjava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/List;Ljava/util/Set;Ljava/util/Set;ZLcom/discord/stores/StoreExperiments$ExperimentAndStaff;Ljava/util/Map;)Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
- .locals 18
+.method public final copy(JJLjava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/List;Ljava/util/Set;Ljava/util/Set;ZLjava/util/Map;)Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
+ .locals 17
.annotation system Ldalvik/annotation/Signature;
value = {
"(JJ",
@@ -795,7 +757,6 @@
"Ljava/util/Set<",
"Ljava/lang/Long;",
">;Z",
- "Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;",
"Ljava/util/Map<",
"Ljava/lang/Long;",
"Lcom/discord/utilities/streams/StreamContext;",
@@ -806,27 +767,25 @@
const/4 v0, 0x0
- if-eqz p5, :cond_a
+ if-eqz p5, :cond_9
- if-eqz p6, :cond_9
+ if-eqz p6, :cond_8
- if-eqz p7, :cond_8
+ if-eqz p7, :cond_7
- if-eqz p8, :cond_7
+ if-eqz p8, :cond_6
- if-eqz p9, :cond_6
+ if-eqz p9, :cond_5
- if-eqz p10, :cond_5
+ if-eqz p10, :cond_4
- if-eqz p11, :cond_4
+ if-eqz p11, :cond_3
- if-eqz p12, :cond_3
+ if-eqz p12, :cond_2
- if-eqz p13, :cond_2
+ if-eqz p13, :cond_1
- if-eqz p15, :cond_1
-
- if-eqz p16, :cond_0
+ if-eqz p15, :cond_0
new-instance v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
@@ -858,9 +817,7 @@
move-object/from16 v16, p15
- move-object/from16 v17, p16
-
- invoke-direct/range {v1 .. v17}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->(JJLjava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/List;Ljava/util/Set;Ljava/util/Set;ZLcom/discord/stores/StoreExperiments$ExperimentAndStaff;Ljava/util/Map;)V
+ invoke-direct/range {v1 .. v16}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->(JJLjava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/List;Ljava/util/Set;Ljava/util/Set;ZLjava/util/Map;)V
return-object v0
@@ -872,69 +829,62 @@
throw v0
:cond_1
- const-string v1, "experiment"
-
- invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
-
- throw v0
-
- :cond_2
const-string v1, "openFolderIds"
invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
throw v0
- :cond_3
+ :cond_2
const-string v1, "lurkingGuildIds"
invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
throw v0
- :cond_4
+ :cond_3
const-string v1, "sortedGuilds"
invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
throw v0
- :cond_5
+ :cond_4
const-string v1, "privateChannels"
invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
throw v0
- :cond_6
+ :cond_5
const-string v1, "unavailableGuilds"
invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
throw v0
- :cond_7
+ :cond_6
const-string v1, "channelIds"
invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
throw v0
- :cond_8
+ :cond_7
const-string v1, "mentionCounts"
invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
throw v0
- :cond_9
+ :cond_8
const-string v1, "unreadGuildIds"
invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
throw v0
- :cond_a
+ :cond_9
const-string v1, "guildSettings"
invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
@@ -1059,22 +1009,12 @@
if-eqz v0, :cond_0
- iget-boolean v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->isUserStaff:Z
+ iget-boolean v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->isNewUser:Z
- iget-boolean v1, p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->isUserStaff:Z
+ iget-boolean v1, p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->isNewUser:Z
if-ne v0, v1, :cond_0
- iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->experiment:Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;
-
- iget-object v1, p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->experiment:Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;
-
- invoke-static {v0, v1}, Lt/u/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
- move-result v0
-
- if-eqz v0, :cond_0
-
iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->allApplicationStreamContexts:Ljava/util/Map;
iget-object p1, p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->allApplicationStreamContexts:Ljava/util/Map;
@@ -1134,14 +1074,6 @@
return-object v0
.end method
-.method public final getExperiment()Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;
- .locals 1
-
- iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->experiment:Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;
-
- return-object v0
-.end method
-
.method public final getGuildSettings()Ljava/util/Map;
.locals 1
.annotation system Ldalvik/annotation/Signature;
@@ -1474,7 +1406,7 @@
mul-int/lit8 v0, v0, 0x1f
- iget-boolean v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->isUserStaff:Z
+ iget-boolean v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->isNewUser:Z
if-eqz v1, :cond_9
@@ -1485,42 +1417,24 @@
mul-int/lit8 v0, v0, 0x1f
- iget-object v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->experiment:Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;
-
- if-eqz v1, :cond_a
-
- invoke-virtual {v1}, Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;->hashCode()I
-
- move-result v1
-
- goto :goto_9
-
- :cond_a
- const/4 v1, 0x0
-
- :goto_9
- add-int/2addr v0, v1
-
- mul-int/lit8 v0, v0, 0x1f
-
iget-object v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->allApplicationStreamContexts:Ljava/util/Map;
- if-eqz v1, :cond_b
+ if-eqz v1, :cond_a
invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
move-result v2
- :cond_b
+ :cond_a
add-int/2addr v0, v2
return v0
.end method
-.method public final isUserStaff()Z
+.method public final isNewUser()Z
.locals 1
- iget-boolean v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->isUserStaff:Z
+ iget-boolean v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->isNewUser:Z
return v0
.end method
@@ -1618,22 +1532,14 @@
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
- const-string v1, ", isUserStaff="
+ const-string v1, ", isNewUser="
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
- iget-boolean v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->isUserStaff:Z
+ iget-boolean v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->isNewUser:Z
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
- const-string v1, ", experiment="
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- iget-object v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->experiment:Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
const-string v1, ", allApplicationStreamContexts="
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel.smali
index d3c964abf4..f2740787f2 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel.smali
@@ -1339,6 +1339,10 @@
move-object/from16 v22, v26
:goto_12
+ const/4 v11, 0x0
+
+ const/4 v12, 0x1
+
move-object/from16 v14, p0
move-object v8, v15
@@ -1349,10 +1353,6 @@
move-object/from16 v13, v27
- const/4 v11, 0x0
-
- const/4 v12, 0x1
-
move-object/from16 v15, p1
goto/16 :goto_3
@@ -1405,13 +1405,7 @@
invoke-virtual {v0, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
- invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->getExperiment()Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;
-
- move-result-object v1
-
- const/4 v2, 0x1
-
- invoke-virtual {v1, v2}, Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;->isEnabled(I)Z
+ invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->isNewUser()Z
move-result v1
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMain.smali b/com.discord/smali/com/discord/widgets/main/WidgetMain.smali
index b7f7e5b8f1..769f59d77e 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMain.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMain.smali
@@ -1388,7 +1388,7 @@
const/4 v0, 0x0
- if-eqz p1, :cond_3
+ if-eqz p1, :cond_1
invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
@@ -1453,46 +1453,31 @@
invoke-direct {p1, p0}, Lcom/discord/widgets/main/WidgetMain$onViewBound$2;->(Lcom/discord/widgets/main/WidgetMain;)V
- const/4 v1, 0x2
+ const/4 v1, 0x0
- const/4 v2, 0x0
+ const/4 v2, 0x2
- invoke-static {p0, p1, v2, v1, v0}, Lcom/discord/app/AppFragment;->setOnBackPressed$default(Lcom/discord/app/AppFragment;Lrx/functions/Func0;IILjava/lang/Object;)V
-
- sget p1, Landroid/os/Build$VERSION;->SDK_INT:I
-
- const/4 v0, 0x1
-
- const/16 v1, 0x1c
-
- if-lt p1, v1, :cond_1
-
- sget-object p1, Landroid/os/Build;->MANUFACTURER:Ljava/lang/String;
-
- const-string v1, "samsung"
-
- invoke-static {p1, v1, v0}, Lt/a0/n;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
- move-result p1
-
- if-eqz p1, :cond_1
-
- goto :goto_0
-
- :cond_1
- const/4 v0, 0x0
-
- :goto_0
- if-eqz v0, :cond_2
+ invoke-static {p0, p1, v1, v2, v0}, Lcom/discord/app/AppFragment;->setOnBackPressed$default(Lcom/discord/app/AppFragment;Lrx/functions/Func0;IILjava/lang/Object;)V
sget-object p1, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->Companion:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;
- invoke-virtual {p1}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;->enqueue()V
+ invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
+
+ move-result-object v0
+
+ const-string v1, "requireContext()"
+
+ invoke-static {v0, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ invoke-static {}, Lcom/discord/utilities/time/ClockFactory;->get()Lcom/discord/utilities/time/Clock;
+
+ move-result-object v1
+
+ invoke-virtual {p1, v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;->enqueue(Landroid/content/Context;Lcom/discord/utilities/time/Clock;)V
- :cond_2
return-void
- :cond_3
+ :cond_1
const-string p1, "view"
invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$1.smali
index dccf0ed221..7249257cad 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$1.smali
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;->enqueue()V
+ value = Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;->enqueue(Landroid/content/Context;Lcom/discord/utilities/time/Clock;)V
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
@@ -25,7 +25,10 @@
">",
"Ljava/lang/Object;",
"Lb0/l/i<",
- "Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;",
+ "Ljava/util/List<",
+ "+",
+ "Landroid/content/pm/PackageInfo;",
+ ">;",
"Ljava/lang/Boolean;",
">;"
}
@@ -62,9 +65,9 @@
.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
.locals 0
- check-cast p1, Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;
+ check-cast p1, Ljava/util/List;
- invoke-virtual {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$1;->call(Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;)Z
+ invoke-virtual {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$1;->call(Ljava/util/List;)Z
move-result p1
@@ -75,14 +78,27 @@
return-object p1
.end method
-.method public final call(Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;)Z
+.method public final call(Ljava/util/List;)Z
.locals 1
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Ljava/util/List<",
+ "+",
+ "Landroid/content/pm/PackageInfo;",
+ ">;)Z"
+ }
+ .end annotation
- const/4 v0, 0x1
+ const-string v0, "it"
- invoke-virtual {p1, v0}, Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;->isEnabled(I)Z
+ invoke-static {p1, v0}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
move-result p1
+ xor-int/lit8 p1, p1, 0x1
+
return p1
.end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2.smali
index 74397433e2..cd3c41dba6 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2.smali
@@ -1,14 +1,14 @@
.class public final Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2;
-.super Lt/u/b/k;
+.super Ljava/lang/Object;
.source "WidgetNoticeNuxSamsungLink.kt"
# interfaces
-.implements Lkotlin/jvm/functions/Function1;
+.implements Lrx/functions/Func2;
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;->enqueue()V
+ value = Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;->enqueue(Landroid/content/Context;Lcom/discord/utilities/time/Clock;)V
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
@@ -18,62 +18,168 @@
.annotation system Ldalvik/annotation/Signature;
value = {
- "Lt/u/b/k;",
- "Lkotlin/jvm/functions/Function1<",
- "Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;",
- "Lkotlin/Unit;",
- ">;"
+ "",
+ "Ljava/lang/Object;",
+ "Lrx/functions/Func2<",
+ "TT1;TT2;TR;>;"
}
.end annotation
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2;
+# instance fields
+.field public final synthetic $clock:Lcom/discord/utilities/time/Clock;
# direct methods
-.method public static constructor ()V
- .locals 1
+.method public constructor (Lcom/discord/utilities/time/Clock;)V
+ .locals 0
- new-instance v0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2;
+ iput-object p1, p0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2;->$clock:Lcom/discord/utilities/time/Clock;
- invoke-direct {v0}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2;->()V
-
- sput-object v0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2;->INSTANCE:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2;
-
- return-void
-.end method
-
-.method public constructor ()V
- .locals 1
-
- const/4 v0, 0x1
-
- invoke-direct {p0, v0}, Lt/u/b/k;->(I)V
+ invoke-direct {p0}, Ljava/lang/Object;->()V
return-void
.end method
# virtual methods
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
.locals 0
- check-cast p1, Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;
+ check-cast p1, Lcom/discord/models/domain/ModelUser;
- invoke-virtual {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2;->invoke(Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;)V
+ check-cast p2, Ljava/util/List;
- sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+ invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2;->call(Lcom/discord/models/domain/ModelUser;Ljava/util/List;)Z
+
+ move-result p1
+
+ invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+ move-result-object p1
return-object p1
.end method
-.method public final invoke(Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;)V
- .locals 0
+.method public final call(Lcom/discord/models/domain/ModelUser;Ljava/util/List;)Z
+ .locals 8
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Lcom/discord/models/domain/ModelUser;",
+ "Ljava/util/List<",
+ "+",
+ "Landroid/content/pm/PackageInfo;",
+ ">;)Z"
+ }
+ .end annotation
- sget-object p1, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->Companion:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;
+ iget-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2;->$clock:Lcom/discord/utilities/time/Clock;
- invoke-static {p1}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;->access$internalEnqueue(Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;)V
+ const-string v1, "meUser"
- return-void
+ invoke-static {p1, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ const-string v1, "allPackages"
+
+ invoke-static {p2, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ const/4 v2, 0x0
+
+ if-eqz v0, :cond_5
+
+ invoke-interface {v0}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
+
+ move-result-wide v3
+
+ invoke-virtual {p1, v3, v4}, Lcom/discord/models/domain/ModelUser;->getAgeMs(J)J
+
+ move-result-wide v3
+
+ const-wide v5, 0x90321000L
+
+ const/4 p1, 0x0
+
+ const/4 v0, 0x1
+
+ cmp-long v7, v3, v5
+
+ if-lez v7, :cond_0
+
+ const/4 v3, 0x1
+
+ goto :goto_0
+
+ :cond_0
+ const/4 v3, 0x0
+
+ :goto_0
+ if-eqz v3, :cond_4
+
+ if-eqz p2, :cond_3
+
+ invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+ move-result-object p2
+
+ :cond_1
+ invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
+
+ move-result v1
+
+ if-eqz v1, :cond_2
+
+ invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+ move-result-object v1
+
+ move-object v3, v1
+
+ check-cast v3, Landroid/content/pm/PackageInfo;
+
+ iget-object v3, v3, Landroid/content/pm/PackageInfo;->packageName:Ljava/lang/String;
+
+ const-string v4, "com.samsung.android.game.gametools"
+
+ invoke-static {v3, v4, v0}, Lt/a0/n;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+ move-result v3
+
+ if-eqz v3, :cond_1
+
+ goto :goto_1
+
+ :cond_2
+ move-object v1, v2
+
+ :goto_1
+ check-cast v1, Landroid/content/pm/PackageInfo;
+
+ if-eqz v1, :cond_4
+
+ const/4 p1, 0x1
+
+ goto :goto_2
+
+ :cond_3
+ invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+
+ throw v2
+
+ :cond_4
+ :goto_2
+ return p1
+
+ :cond_5
+ const-string p1, "clock"
+
+ invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+
+ throw v2
.end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$3.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$3.smali
new file mode 100644
index 0000000000..a7aed17335
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$3.smali
@@ -0,0 +1,78 @@
+.class public final Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$3;
+.super Ljava/lang/Object;
+.source "WidgetNoticeNuxSamsungLink.kt"
+
+# interfaces
+.implements Lb0/l/i;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;->enqueue(Landroid/content/Context;Lcom/discord/utilities/time/Clock;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "",
+ "Ljava/lang/Object;",
+ "Lb0/l/i<",
+ "Ljava/lang/Boolean;",
+ "Ljava/lang/Boolean;",
+ ">;"
+ }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$3;
+
+
+# direct methods
+.method public static constructor ()V
+ .locals 1
+
+ new-instance v0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$3;
+
+ invoke-direct {v0}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$3;->()V
+
+ sput-object v0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$3;->INSTANCE:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$3;
+
+ return-void
+.end method
+
+.method public constructor ()V
+ .locals 0
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public final call(Ljava/lang/Boolean;)Ljava/lang/Boolean;
+ .locals 0
+
+ return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 0
+
+ check-cast p1, Ljava/lang/Boolean;
+
+ invoke-virtual {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$3;->call(Ljava/lang/Boolean;)Ljava/lang/Boolean;
+
+ move-result-object p1
+
+ return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$4.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$4.smali
new file mode 100644
index 0000000000..455fe749ce
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$4.smali
@@ -0,0 +1,79 @@
+.class public final Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$4;
+.super Lt/u/b/k;
+.source "WidgetNoticeNuxSamsungLink.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;->enqueue(Landroid/content/Context;Lcom/discord/utilities/time/Clock;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Lt/u/b/k;",
+ "Lkotlin/jvm/functions/Function1<",
+ "Ljava/lang/Boolean;",
+ "Lkotlin/Unit;",
+ ">;"
+ }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$4;
+
+
+# direct methods
+.method public static constructor ()V
+ .locals 1
+
+ new-instance v0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$4;
+
+ invoke-direct {v0}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$4;->()V
+
+ sput-object v0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$4;->INSTANCE:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$4;
+
+ return-void
+.end method
+
+.method public constructor ()V
+ .locals 1
+
+ const/4 v0, 0x1
+
+ invoke-direct {p0, v0}, Lt/u/b/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 {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$4;->invoke(Ljava/lang/Boolean;)V
+
+ sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+ return-object p1
+.end method
+
+.method public final invoke(Ljava/lang/Boolean;)V
+ .locals 0
+
+ sget-object p1, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->Companion:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;
+
+ invoke-static {p1}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;->access$internalEnqueue(Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;)V
+
+ return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion.smali
index 204ff924fe..328b8c6e17 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion.smali
@@ -62,9 +62,9 @@
const-wide/16 v9, 0x0
- const-wide/16 v11, 0x0
+ const-wide v11, 0x7fffffffffffffffL
- const/16 v14, 0x1c6
+ const/16 v14, 0xc6
const/16 v16, 0x0
@@ -113,64 +113,139 @@
return-void
.end method
-.method public final enqueue()V
- .locals 11
+.method public final enqueue(Landroid/content/Context;Lcom/discord/utilities/time/Clock;)V
+ .locals 9
- sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+ const/4 v0, 0x0
- invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getExperiments()Lcom/discord/stores/StoreExperiments;
+ if-eqz p1, :cond_3
- move-result-object v0
+ if-eqz p2, :cond_2
+ sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+ const/4 v1, 0x1
+
+ const/16 v2, 0x1c
+
+ if-lt v0, v2, :cond_0
+
+ sget-object v0, Landroid/os/Build;->MANUFACTURER:Ljava/lang/String;
+
+ const-string v2, "samsung"
+
+ invoke-static {v0, v2, v1}, Lt/a0/n;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+ move-result v0
+
+ if-eqz v0, :cond_0
+
+ goto :goto_0
+
+ :cond_0
const/4 v1, 0x0
- const-string v2, "2019-09_samsung_connect_upsell"
+ :goto_0
+ if-nez v1, :cond_1
- const/4 v3, 0x2
+ return-void
- invoke-static {v0, v2, v1, v3, v1}, Lcom/discord/stores/StoreExperiments;->getExperimentAndStaff$default(Lcom/discord/stores/StoreExperiments;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lrx/Observable;
+ :cond_1
+ sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
- move-result-object v4
-
- const-wide/16 v5, 0x0
-
- const/4 v7, 0x0
-
- const/4 v8, 0x3
-
- const/4 v9, 0x0
-
- invoke-static/range {v4 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->takeSingleUntilTimeout$default(Lrx/Observable;JZILjava/lang/Object;)Lrx/Observable;
+ invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getUsers()Lcom/discord/stores/StoreUser;
move-result-object v0
+ invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->observeMe()Lrx/Observable;
+
+ move-result-object v0
+
+ sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+ invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getAndroidPackages()Lcom/discord/stores/StoreAndroidPackages;
+
+ move-result-object v1
+
+ invoke-virtual {v1, p1}, Lcom/discord/stores/StoreAndroidPackages;->getInstalledPackages(Landroid/content/Context;)Lrx/Observable;
+
+ move-result-object p1
+
sget-object v1, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$1;->INSTANCE:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$1;
- invoke-virtual {v0, v1}, Lrx/Observable;->c(Lb0/l/i;)Lrx/Observable;
+ invoke-virtual {p1, v1}, Lrx/Observable;->c(Lb0/l/i;)Lrx/Observable;
+
+ move-result-object p1
+
+ new-instance v1, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2;
+
+ invoke-direct {v1, p2}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2;->(Lcom/discord/utilities/time/Clock;)V
+
+ invoke-static {v0, p1, v1}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
move-result-object v2
- const-string v0, "StoreStream\n .g\u2026ilter { it.isEnabled(1) }"
+ const-string p1, "Observable\n .co\u2026 allPackages)\n }"
- invoke-static {v2, v0}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {v2, p1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const-class v3, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
+ const-wide/16 v3, 0x0
- sget-object v8, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2;->INSTANCE:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2;
+ const/4 v5, 0x0
+
+ const/4 v6, 0x3
+
+ const/4 v7, 0x0
+
+ invoke-static/range {v2 .. v7}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->takeSingleUntilTimeout$default(Lrx/Observable;JZILjava/lang/Object;)Lrx/Observable;
+
+ move-result-object p1
+
+ sget-object p2, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$3;->INSTANCE:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$3;
+
+ invoke-virtual {p1, p2}, Lrx/Observable;->c(Lb0/l/i;)Lrx/Observable;
+
+ move-result-object p1
+
+ const-string p2, "Observable\n .co\u2026er { canShow -> canShow }"
+
+ invoke-static {p1, p2}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
+
+ move-result-object v0
+
+ const-class v1, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
+
+ const/4 v2, 0x0
+
+ const/4 v3, 0x0
const/4 v4, 0x0
const/4 v5, 0x0
- const/4 v6, 0x0
+ sget-object v6, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$4;->INSTANCE:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$4;
- const/4 v7, 0x0
+ const/16 v7, 0x1e
- const/16 v9, 0x1e
+ const/4 v8, 0x0
- const/4 v10, 0x0
-
- invoke-static/range {v2 .. v10}, 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
+ 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_2
+ const-string p1, "clock"
+
+ invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+
+ throw v0
+
+ :cond_3
+ const-string p1, "context"
+
+ invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+
+ throw v0
.end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1.smali
index 0b32fd6916..8081b0356c 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1.smali
@@ -3,7 +3,7 @@
.source "WidgetNoticeNuxSamsungLink.kt"
# interfaces
-.implements Landroid/view/View$OnClickListener;
+.implements Lb0/l/i;
# annotations
@@ -16,16 +16,44 @@
name = null
.end annotation
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "",
+ "Ljava/lang/Object;",
+ "Lb0/l/i<",
+ "Ljava/util/List<",
+ "+",
+ "Lcom/discord/models/domain/ModelOAuth2Token;",
+ ">;",
+ "Ljava/lang/Boolean;",
+ ">;"
+ }
+.end annotation
-# instance fields
-.field public final synthetic this$0:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1;
# direct methods
-.method public constructor (Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;)V
- .locals 0
+.method public static constructor ()V
+ .locals 1
- iput-object p1, p0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1;->this$0:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
+ new-instance v0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1;
+
+ invoke-direct {v0}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1;->()V
+
+ sput-object v0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1;->INSTANCE:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1;
+
+ return-void
+.end method
+
+.method public constructor ()V
+ .locals 0
invoke-direct {p0}, Ljava/lang/Object;->()V
@@ -34,68 +62,108 @@
# virtual methods
-.method public final onClick(Landroid/view/View;)V
- .locals 3
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 0
- iget-object p1, p0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1;->this$0:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
+ check-cast p1, Ljava/util/List;
- sget-object v0, Lcom/discord/utilities/intent/IntentUtils$RouteBuilders$Uris;->INSTANCE:Lcom/discord/utilities/intent/IntentUtils$RouteBuilders$Uris;
+ invoke-virtual {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1;->call(Ljava/util/List;)Z
- invoke-virtual {v0}, Lcom/discord/utilities/intent/IntentUtils$RouteBuilders$Uris;->getOauth2Authorize()Landroid/net/Uri;
+ move-result p1
- move-result-object v0
+ invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
- invoke-virtual {v0}, Landroid/net/Uri;->buildUpon()Landroid/net/Uri$Builder;
+ move-result-object p1
- move-result-object v0
-
- const-string v1, "client_id"
-
- const-string v2, "591317049637339146"
-
- invoke-virtual {v0, v1, v2}, Landroid/net/Uri$Builder;->appendQueryParameter(Ljava/lang/String;Ljava/lang/String;)Landroid/net/Uri$Builder;
-
- move-result-object v0
-
- const-string v1, "prompt"
-
- const-string v2, "consent"
-
- invoke-virtual {v0, v1, v2}, Landroid/net/Uri$Builder;->appendQueryParameter(Ljava/lang/String;Ljava/lang/String;)Landroid/net/Uri$Builder;
-
- move-result-object v0
-
- const-string v1, "response_type"
-
- const-string v2, "code"
-
- invoke-virtual {v0, v1, v2}, Landroid/net/Uri$Builder;->appendQueryParameter(Ljava/lang/String;Ljava/lang/String;)Landroid/net/Uri$Builder;
-
- move-result-object v0
-
- const-string v1, "scope"
-
- const-string v2, "identify activities.read activities.write"
-
- invoke-virtual {v0, v1, v2}, Landroid/net/Uri$Builder;->appendQueryParameter(Ljava/lang/String;Ljava/lang/String;)Landroid/net/Uri$Builder;
-
- move-result-object v0
-
- invoke-virtual {v0}, Landroid/net/Uri$Builder;->build()Landroid/net/Uri;
-
- move-result-object v0
-
- new-instance v1, Landroid/content/Intent;
-
- const-string v2, "android.intent.action.VIEW"
-
- invoke-direct {v1, v2, v0}, Landroid/content/Intent;->(Ljava/lang/String;Landroid/net/Uri;)V
-
- invoke-virtual {p1, v1}, Landroidx/fragment/app/Fragment;->startActivity(Landroid/content/Intent;)V
-
- iget-object p1, p0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1;->this$0:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
-
- invoke-virtual {p1}, Lcom/discord/app/AppDialog;->dismiss()V
-
- return-void
+ return-object p1
+.end method
+
+.method public final call(Ljava/util/List;)Z
+ .locals 8
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Ljava/util/List<",
+ "Lcom/discord/models/domain/ModelOAuth2Token;",
+ ">;)Z"
+ }
+ .end annotation
+
+ const-string v0, "591317049637339146"
+
+ invoke-static {v0}, Lt/a0/m;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+
+ move-result-object v0
+
+ const-string v1, "authedApps"
+
+ invoke-static {p1, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
+
+ move-result v1
+
+ const/4 v2, 0x1
+
+ const/4 v3, 0x0
+
+ if-eqz v1, :cond_0
+
+ goto :goto_2
+
+ :cond_0
+ invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+ move-result-object p1
+
+ :cond_1
+ invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+ move-result v1
+
+ if-eqz v1, :cond_4
+
+ invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+ move-result-object v1
+
+ check-cast v1, Lcom/discord/models/domain/ModelOAuth2Token;
+
+ invoke-virtual {v1}, Lcom/discord/models/domain/ModelOAuth2Token;->getApplication()Lcom/discord/models/domain/ModelApplication;
+
+ move-result-object v1
+
+ invoke-virtual {v1}, Lcom/discord/models/domain/ModelApplication;->getId()J
+
+ move-result-wide v4
+
+ if-nez v0, :cond_2
+
+ goto :goto_0
+
+ :cond_2
+ invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+ move-result-wide v6
+
+ cmp-long v1, v4, v6
+
+ if-nez v1, :cond_3
+
+ const/4 v1, 0x1
+
+ goto :goto_1
+
+ :cond_3
+ :goto_0
+ const/4 v1, 0x0
+
+ :goto_1
+ if-eqz v1, :cond_1
+
+ const/4 v3, 0x1
+
+ :cond_4
+ :goto_2
+ return v3
.end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2.smali
index 66c8d98e68..f4f2e88a18 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2.smali
@@ -1,9 +1,9 @@
.class public final Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2;
-.super Ljava/lang/Object;
+.super Lt/u/b/k;
.source "WidgetNoticeNuxSamsungLink.kt"
# interfaces
-.implements Landroid/view/View$OnClickListener;
+.implements Lkotlin/jvm/functions/Function1;
# annotations
@@ -16,6 +16,19 @@
name = null
.end annotation
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Lt/u/b/k;",
+ "Lkotlin/jvm/functions/Function1<",
+ "Ljava/util/List<",
+ "+",
+ "Lcom/discord/models/domain/ModelOAuth2Token;",
+ ">;",
+ "Lkotlin/Unit;",
+ ">;"
+ }
+.end annotation
+
# instance fields
.field public final synthetic this$0:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
@@ -27,25 +40,37 @@
iput-object p1, p0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2;->this$0:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
- invoke-direct {p0}, Ljava/lang/Object;->()V
+ const/4 p1, 0x1
+
+ invoke-direct {p0, p1}, Lt/u/b/k;->(I)V
return-void
.end method
# virtual methods
-.method public final onClick(Landroid/view/View;)V
- .locals 1
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 0
- sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+ check-cast p1, Ljava/util/List;
- invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
+ invoke-virtual {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2;->invoke(Ljava/util/List;)V
- move-result-object p1
+ sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
- const/4 v0, 0x0
+ return-object p1
+.end method
- invoke-virtual {p1, v0}, Lcom/discord/stores/StoreUserSettings;->setMobileOverlay(Z)V
+.method public final invoke(Ljava/util/List;)V
+ .locals 0
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Ljava/util/List<",
+ "Lcom/discord/models/domain/ModelOAuth2Token;",
+ ">;)V"
+ }
+ .end annotation
iget-object p1, p0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2;->this$0:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$3.smali
new file mode 100644
index 0000000000..0847415300
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$3.smali
@@ -0,0 +1,101 @@
+.class public final Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$3;
+.super Ljava/lang/Object;
+.source "WidgetNoticeNuxSamsungLink.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->onViewBound(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
+
+
+# direct methods
+.method public constructor (Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;)V
+ .locals 0
+
+ iput-object p1, p0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$3;->this$0:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+ .locals 3
+
+ iget-object p1, p0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$3;->this$0:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
+
+ sget-object v0, Lcom/discord/utilities/intent/IntentUtils$RouteBuilders$Uris;->INSTANCE:Lcom/discord/utilities/intent/IntentUtils$RouteBuilders$Uris;
+
+ invoke-virtual {v0}, Lcom/discord/utilities/intent/IntentUtils$RouteBuilders$Uris;->getOauth2Authorize()Landroid/net/Uri;
+
+ move-result-object v0
+
+ invoke-virtual {v0}, Landroid/net/Uri;->buildUpon()Landroid/net/Uri$Builder;
+
+ move-result-object v0
+
+ const-string v1, "client_id"
+
+ const-string v2, "591317049637339146"
+
+ invoke-virtual {v0, v1, v2}, Landroid/net/Uri$Builder;->appendQueryParameter(Ljava/lang/String;Ljava/lang/String;)Landroid/net/Uri$Builder;
+
+ move-result-object v0
+
+ const-string v1, "prompt"
+
+ const-string v2, "consent"
+
+ invoke-virtual {v0, v1, v2}, Landroid/net/Uri$Builder;->appendQueryParameter(Ljava/lang/String;Ljava/lang/String;)Landroid/net/Uri$Builder;
+
+ move-result-object v0
+
+ const-string v1, "response_type"
+
+ const-string v2, "code"
+
+ invoke-virtual {v0, v1, v2}, Landroid/net/Uri$Builder;->appendQueryParameter(Ljava/lang/String;Ljava/lang/String;)Landroid/net/Uri$Builder;
+
+ move-result-object v0
+
+ const-string v1, "scope"
+
+ const-string v2, "identify activities.read activities.write"
+
+ invoke-virtual {v0, v1, v2}, Landroid/net/Uri$Builder;->appendQueryParameter(Ljava/lang/String;Ljava/lang/String;)Landroid/net/Uri$Builder;
+
+ move-result-object v0
+
+ invoke-virtual {v0}, Landroid/net/Uri$Builder;->build()Landroid/net/Uri;
+
+ move-result-object v0
+
+ new-instance v1, Landroid/content/Intent;
+
+ const-string v2, "android.intent.action.VIEW"
+
+ invoke-direct {v1, v2, v0}, Landroid/content/Intent;->(Ljava/lang/String;Landroid/net/Uri;)V
+
+ invoke-virtual {p1, v1}, Landroidx/fragment/app/Fragment;->startActivity(Landroid/content/Intent;)V
+
+ iget-object p1, p0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$3;->this$0:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
+
+ invoke-virtual {p1}, Lcom/discord/app/AppDialog;->dismiss()V
+
+ return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$4.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$4.smali
new file mode 100644
index 0000000000..20f3945ee1
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$4.smali
@@ -0,0 +1,55 @@
+.class public final Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$4;
+.super Ljava/lang/Object;
+.source "WidgetNoticeNuxSamsungLink.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->onViewBound(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
+
+
+# direct methods
+.method public constructor (Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;)V
+ .locals 0
+
+ iput-object p1, p0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$4;->this$0:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+ .locals 1
+
+ sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+ invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
+
+ move-result-object p1
+
+ const/4 v0, 0x0
+
+ invoke-virtual {p1, v0}, Lcom/discord/stores/StoreUserSettings;->setMobileOverlay(Z)V
+
+ iget-object p1, p0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$4;->this$0:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
+
+ invoke-virtual {p1}, Lcom/discord/app/AppDialog;->dismiss()V
+
+ return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.smali
index de7039cc8f..af5e26c603 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.smali
@@ -190,7 +190,9 @@
.end method
.method public onViewBound(Landroid/view/View;)V
- .locals 1
+ .locals 11
+
+ const/4 v0, 0x0
if-eqz p1, :cond_0
@@ -202,17 +204,85 @@
move-result-object p1
- const-string v0, "NUX/SamsungLink"
+ const-string v1, "NUX/SamsungLink"
- invoke-virtual {p1, v0}, Lcom/discord/stores/StoreNotices;->markDialogSeen(Ljava/lang/String;)V
+ invoke-virtual {p1, v1}, Lcom/discord/stores/StoreNotices;->markDialogSeen(Ljava/lang/String;)V
+
+ sget-object p1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+
+ invoke-virtual {p1}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+
+ move-result-object p1
+
+ invoke-virtual {p1}, Lcom/discord/utilities/rest/RestAPI;->getOAuthTokens()Lrx/Observable;
+
+ move-result-object p1
+
+ const/4 v1, 0x0
+
+ const/4 v2, 0x1
+
+ invoke-static {p1, v1, v2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+
+ move-result-object p1
+
+ invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
+
+ move-result-object v1
+
+ const-wide/16 v2, 0x0
+
+ const/4 v4, 0x0
+
+ const/4 v5, 0x1
+
+ const/4 v6, 0x0
+
+ invoke-static/range {v1 .. v6}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->takeSingleUntilTimeout$default(Lrx/Observable;JZILjava/lang/Object;)Lrx/Observable;
+
+ move-result-object p1
+
+ sget-object v1, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1;->INSTANCE:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1;
+
+ invoke-virtual {p1, v1}, Lrx/Observable;->c(Lb0/l/i;)Lrx/Observable;
+
+ move-result-object p1
+
+ const-string v1, "RestAPI.api.getOAuthToke\u2026ApplicationId }\n }"
+
+ invoke-static {p1, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ const/4 v1, 0x2
+
+ invoke-static {p1, p0, v0, v1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+
+ move-result-object v2
+
+ const-class v3, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
+
+ const/4 v4, 0x0
+
+ const/4 v5, 0x0
+
+ const/4 v7, 0x0
+
+ new-instance v8, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2;
+
+ invoke-direct {v8, p0}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2;->(Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;)V
+
+ const/16 v9, 0x1e
+
+ const/4 v10, 0x0
+
+ invoke-static/range {v2 .. v10}, 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
invoke-direct {p0}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->getOk()Landroid/widget/TextView;
move-result-object p1
- new-instance v0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1;
+ new-instance v0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$3;
- invoke-direct {v0, p0}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1;->(Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;)V
+ invoke-direct {v0, p0}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$3;->(Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;)V
invoke-virtual {p1, v0}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
@@ -220,9 +290,9 @@
move-result-object p1
- new-instance v0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2;
+ new-instance v0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$4;
- invoke-direct {v0, p0}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2;->(Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;)V
+ invoke-direct {v0, p0}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$4;->(Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;)V
invoke-virtual {p1, v0}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
@@ -233,7 +303,5 @@
invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
- const/4 p1, 0x0
-
- throw p1
+ throw v0
.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.smali
index 8c4f66e965..d8f92f591f 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.smali
@@ -1187,15 +1187,19 @@
move-result-object v4
- const-string v5, "viewState.meUser.premiumTier"
+ if-eqz v4, :cond_4
- invoke-static {v4, v5}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+ goto :goto_1
- new-instance v6, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;
+ :cond_4
+ sget-object v4, Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;->NONE:Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;
- invoke-direct {v6, p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;->(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;)V
+ :goto_1
+ new-instance v5, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;
- invoke-virtual {v0, v4, v6}, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->a(Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;Lkotlin/jvm/functions/Function0;)V
+ invoke-direct {v5, p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;->(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;)V
+
+ invoke-virtual {v0, v4, v5}, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->a(Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;Lkotlin/jvm/functions/Function0;)V
invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getPremiumGuildSubscriptionUpsellView()Lcom/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView;
@@ -1209,8 +1213,14 @@
move-result-object p1
- invoke-static {p1, v5}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+ if-eqz p1, :cond_5
+ goto :goto_2
+
+ :cond_5
+ sget-object p1, Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;->NONE:Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;
+
+ :goto_2
invoke-virtual {v0, p1, v1}, Lcom/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView;->a(Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;Z)V
invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostNumber()Landroid/widget/TextView;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
index 923810daf9..9d3eaadd04 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
@@ -1663,7 +1663,7 @@
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
- const-string v0, " - 10.4.0 (1036)"
+ const-string v0, " - 10.4.1 (1037)"
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali
index 0e33b79ac8..459105d07a 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali
@@ -3085,27 +3085,31 @@
if-eqz v1, :cond_11
- sget-object v11, Lcom/discord/views/ActiveSubscriptionView;->k:Lcom/discord/views/ActiveSubscriptionView$c;
+ sget-object v14, Lcom/discord/views/ActiveSubscriptionView;->k:Lcom/discord/views/ActiveSubscriptionView$c;
- invoke-virtual {v11, v1}, Lcom/discord/views/ActiveSubscriptionView$c;->a(Lcom/discord/models/domain/ModelSubscription;)Lcom/discord/views/ActiveSubscriptionView$b;
+ invoke-virtual {v14, v1}, Lcom/discord/views/ActiveSubscriptionView$c;->a(Lcom/discord/models/domain/ModelSubscription;)Lcom/discord/views/ActiveSubscriptionView$b;
- move-result-object v11
+ move-result-object v14
- sget-object v14, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$4:[I
+ sget-object v15, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$4:[I
- invoke-virtual {v11}, Ljava/lang/Enum;->ordinal()I
+ invoke-virtual {v14}, Ljava/lang/Enum;->ordinal()I
- move-result v11
+ move-result v14
- aget v11, v14, v11
+ aget v14, v15, v14
- if-eq v11, v3, :cond_10
+ if-eq v14, v3, :cond_10
- if-eq v11, v10, :cond_f
+ if-eq v14, v10, :cond_f
- if-ne v11, v12, :cond_e
+ if-ne v14, v12, :cond_e
- const v11, 0x7f120ef9
+ const v14, 0x7f120ef9
+
+ invoke-virtual {v0, v14}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
+
+ move-result-object v14
goto :goto_d
@@ -3117,19 +3121,34 @@
throw v1
:cond_f
- const v11, 0x7f120f58
+ const v14, 0x7f120f58
+
+ invoke-virtual {v0, v14}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
+
+ move-result-object v14
goto :goto_d
:cond_10
- const v11, 0x7f120f59
+ const v14, 0x7f120f59
+
+ invoke-virtual {v0, v14}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
+
+ move-result-object v14
:goto_d
- invoke-static {v11}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+ if-eqz v14, :cond_11
- move-result-object v11
+ goto :goto_e
:cond_11
+ move-object v14, v11
+
+ :goto_e
+ const-string v11, "subscription?.let { sub \u2026itle)\n }\n } ?: \"\""
+
+ invoke-static {v14, v11}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
if-eqz v6, :cond_12
const v1, 0x7f1202a8
@@ -3140,10 +3159,10 @@
move-object/from16 v20, v1
- :goto_e
- const/4 v14, 0x0
+ :goto_f
+ const/4 v5, 0x0
- goto :goto_12
+ goto :goto_13
:cond_12
if-eqz v5, :cond_18
@@ -3154,15 +3173,15 @@
move-result-object v1
- goto :goto_f
+ goto :goto_10
:cond_13
move-object v1, v9
- :goto_f
+ :goto_10
if-nez v1, :cond_14
- goto :goto_10
+ goto :goto_11
:cond_14
sget-object v5, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$5:[I
@@ -3179,23 +3198,19 @@
if-eq v1, v12, :cond_15
- :goto_10
+ :goto_11
move-object/from16 v20, v9
- goto :goto_e
+ goto :goto_f
:cond_15
const v1, 0x7f120f36
new-array v2, v10, [Ljava/lang/Object;
- invoke-virtual {v11}, Ljava/lang/Object;->toString()Ljava/lang/String;
+ const/4 v5, 0x0
- move-result-object v5
-
- const/4 v14, 0x0
-
- aput-object v5, v2, v14
+ aput-object v14, v2, v5
aput-object v4, v2, v3
@@ -3203,20 +3218,16 @@
move-result-object v1
- goto :goto_11
+ goto :goto_12
:cond_16
- const/4 v14, 0x0
+ const/4 v5, 0x0
const v1, 0x7f120f33
new-array v2, v10, [Ljava/lang/Object;
- invoke-virtual {v11}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
- move-result-object v5
-
- aput-object v5, v2, v14
+ aput-object v14, v2, v5
aput-object v4, v2, v3
@@ -3224,56 +3235,56 @@
move-result-object v1
- goto :goto_11
+ goto :goto_12
:cond_17
- const/4 v14, 0x0
+ const/4 v5, 0x0
const v1, 0x7f120f37
- new-array v5, v10, [Ljava/lang/Object;
+ new-array v10, v10, [Ljava/lang/Object;
- aput-object v4, v5, v14
+ aput-object v4, v10, v5
- aput-object v2, v5, v3
+ aput-object v2, v10, v3
- invoke-virtual {v0, v1, v5}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+ invoke-virtual {v0, v1, v10}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
move-result-object v1
- :goto_11
+ :goto_12
move-object/from16 v20, v1
- goto :goto_12
+ goto :goto_13
:cond_18
- const/4 v14, 0x0
+ const/4 v5, 0x0
move-object/from16 v20, v9
- :goto_12
+ :goto_13
invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBillingInfoTv()Landroid/widget/TextView;
move-result-object v1
if-eqz v20, :cond_19
- goto :goto_13
+ goto :goto_14
:cond_19
const/4 v3, 0x0
- :goto_13
+ :goto_14
if-eqz v3, :cond_1a
const/4 v2, 0x0
- goto :goto_14
+ goto :goto_15
:cond_1a
const/16 v2, 0x8
- :goto_14
+ :goto_15
invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
if-eqz v20, :cond_1b
@@ -3319,7 +3330,7 @@
move-result-object v9
- goto :goto_15
+ goto :goto_16
:cond_1c
if-eqz v7, :cond_1d
@@ -3331,7 +3342,7 @@
move-result-object v9
:cond_1d
- :goto_15
+ :goto_16
invoke-static {v1, v9}, 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;
@@ -3350,13 +3361,13 @@
if-eqz v8, :cond_1e
- goto :goto_16
+ goto :goto_17
:cond_1e
- const/16 v14, 0x8
+ const/16 v5, 0x8
- :goto_16
- invoke-virtual {v1, v14}, Landroid/view/View;->setVisibility(I)V
+ :goto_17
+ invoke-virtual {v1, v5}, Landroid/view/View;->setVisibility(I)V
return-void
.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem.smali b/com.discord/smali/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem.smali
index 2939ce76d7..6f2b8ef904 100644
--- a/com.discord/smali/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem.smali
@@ -408,19 +408,19 @@
# virtual methods
.method public onConfigure(ILcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item;)V
- .locals 27
+ .locals 29
move-object/from16 v0, p0
move-object/from16 v1, p2
- if-eqz v1, :cond_e
+ if-eqz v1, :cond_11
invoke-super/range {p0 .. p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
instance-of v3, v1, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem;
- if-eqz v3, :cond_d
+ if-eqz v3, :cond_10
iget-object v3, v0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
@@ -594,16 +594,16 @@
invoke-static {v3, v8}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const/16 v18, 0x0
-
- const/16 v19, 0x0
-
const/16 v20, 0x0
- const/16 v21, 0x1c
+ const/16 v21, 0x0
const/16 v22, 0x0
+ const/16 v23, 0x1c
+
+ const/16 v24, 0x0
+
move-object v2, v5
move-object/from16 v5, v16
@@ -612,25 +612,25 @@
move-object v7, v3
- move-object/from16 v23, v8
+ move-object/from16 v25, v8
- move-object/from16 v8, v18
+ move-object/from16 v8, v20
- move-object/from16 v24, v9
+ move-object/from16 v26, v9
- move-object/from16 v9, v19
+ move-object/from16 v9, v21
- move/from16 v25, v10
+ move/from16 v27, v10
- move/from16 v10, v20
+ move/from16 v10, v22
- move/from16 v26, v11
+ move/from16 v28, v11
- move/from16 v11, v21
+ move/from16 v11, v23
const/4 v15, 0x0
- move-object/from16 v12, v22
+ move-object/from16 v12, v24
invoke-static/range {v5 .. v12}, Lcom/discord/utilities/time/TimeUtils;->renderUtcDate$default(Lcom/discord/utilities/time/TimeUtils;Ljava/lang/String;Landroid/content/Context;Ljava/lang/String;Ljava/text/DateFormat;IILjava/lang/Object;)Ljava/lang/String;
@@ -652,7 +652,7 @@
const-string v6, "*"
- move-object/from16 v12, v24
+ move-object/from16 v12, v26
invoke-static {v2, v6, v12, v15, v5}, Lt/a0/n;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
@@ -661,124 +661,128 @@
goto :goto_5
:cond_5
- move-object/from16 v23, v8
+ move-object/from16 v25, v8
move-object v12, v9
- move/from16 v25, v10
+ move/from16 v27, v10
- move/from16 v26, v11
+ move/from16 v28, v11
const/4 v15, 0x0
const/4 v2, 0x0
:goto_5
- move/from16 v10, v25
+ const/4 v11, 0x2
+
+ move/from16 v10, v27
if-eqz v10, :cond_6
invoke-virtual {v4}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem;->getSubscriptionSlot()Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
- move-result-object v4
+ move-result-object v5
- invoke-virtual {v4}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->getCooldownExpiresAtTimestamp()J
+ invoke-virtual {v5}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->getCooldownExpiresAtTimestamp()J
- move-result-wide v4
+ move-result-wide v5
- sub-long/2addr v4, v13
+ sub-long/2addr v5, v13
- const-wide/16 v6, 0x0
+ const-wide/16 v7, 0x0
- invoke-static {v4, v5, v6, v7}, Ljava/lang/Math;->max(JJ)J
+ invoke-static {v5, v6, v7, v8}, Ljava/lang/Math;->max(JJ)J
- move-result-wide v4
+ move-result-wide v5
- const-wide/32 v6, 0x5265c00
+ const-wide/32 v7, 0x5265c00
- div-long v8, v4, v6
+ div-long v13, v5, v7
- mul-long v6, v6, v8
+ mul-long v7, v7, v13
- sub-long/2addr v4, v6
+ sub-long/2addr v5, v7
- const-wide/32 v6, 0x36ee80
+ const-wide/32 v7, 0x36ee80
- div-long v13, v4, v6
+ div-long v18, v5, v7
- mul-long v6, v6, v13
+ mul-long v7, v7, v18
- sub-long/2addr v4, v6
+ sub-long/2addr v5, v7
- const-wide/32 v6, 0xea60
+ const-wide/32 v7, 0xea60
- div-long/2addr v4, v6
+ div-long/2addr v5, v7
- sget-object v6, Lcom/discord/utilities/textprocessing/Parsers;->INSTANCE:Lcom/discord/utilities/textprocessing/Parsers;
+ sget-object v7, Lcom/discord/utilities/textprocessing/Parsers;->INSTANCE:Lcom/discord/utilities/textprocessing/Parsers;
- move-object/from16 v7, v23
+ move-object/from16 v9, v25
- invoke-static {v3, v7}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {v3, v9}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const/4 v11, 0x3
+ const/4 v8, 0x3
- new-array v11, v11, [Ljava/lang/Object;
-
- invoke-static {v8, v9}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
-
- move-result-object v8
-
- aput-object v8, v11, v15
+ new-array v8, v8, [Ljava/lang/Object;
invoke-static {v13, v14}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+ move-result-object v13
+
+ aput-object v13, v8, v15
+
+ invoke-static/range {v18 .. v19}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+
+ move-result-object v13
+
+ const/4 v14, 0x1
+
+ aput-object v13, v8, v14
+
+ invoke-static {v5, v6}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+
+ move-result-object v5
+
+ aput-object v5, v8, v11
+
+ const v5, 0x7f120e7f
+
+ invoke-virtual {v3, v5, v8}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
move-result-object v8
- const/4 v9, 0x1
-
- aput-object v8, v11, v9
-
- invoke-static {v4, v5}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
-
- move-result-object v4
-
- const/4 v13, 0x2
-
- aput-object v4, v11, v13
-
- const v4, 0x7f120e7f
-
- invoke-virtual {v3, v4, v11}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
- move-result-object v4
-
const-string v5, "context.getString(\n \u2026.toString()\n )"
- invoke-static {v4, v5}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {v8, v5}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const/4 v8, 0x0
+ const/4 v13, 0x0
- const/4 v9, 0x0
+ const/16 v16, 0x0
- const/16 v11, 0xc
+ const/16 v18, 0xc
- const/4 v14, 0x0
+ const/16 v19, 0x0
- move-object v5, v6
+ move-object v5, v7
move-object v6, v3
- move-object v13, v7
+ move-object v7, v8
- move-object v7, v4
+ move-object v8, v13
- move v4, v10
+ move-object v13, v9
- move v10, v11
+ move-object/from16 v9, v16
+
+ move v14, v10
+
+ move/from16 v10, v18
const/4 v15, 0x2
- move-object v11, v14
+ move-object/from16 v11, v19
invoke-static/range {v5 .. v11}, Lcom/discord/utilities/textprocessing/Parsers;->parseMarkdown$default(Lcom/discord/utilities/textprocessing/Parsers;Landroid/content/Context;Ljava/lang/CharSequence;Ljava/lang/Integer;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/CharSequence;
@@ -787,9 +791,9 @@
goto :goto_6
:cond_6
- move v4, v10
+ move v14, v10
- move-object/from16 v13, v23
+ move-object/from16 v13, v25
const/4 v15, 0x2
@@ -869,7 +873,7 @@
move-result-object v2
- move/from16 v5, v26
+ move/from16 v5, v28
if-eqz v5, :cond_b
@@ -887,33 +891,72 @@
:goto_8
invoke-virtual {v2, v9}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
- if-eqz v5, :cond_c
+ invoke-virtual {v4}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem;->getSubscriptionSlot()Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
+
+ move-result-object v2
+
+ invoke-virtual {v2}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->getCanceled()Z
+
+ move-result v2
+
+ if-eqz v14, :cond_e
+
+ if-nez v2, :cond_c
+
+ iget-object v4, v0, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->adapter:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
+
+ check-cast v4, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter;
+
+ invoke-static {v4}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter;->access$getCanCancelBoosts$p(Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter;)Z
+
+ move-result v4
+
+ if-nez v4, :cond_e
+
+ :cond_c
+ if-eqz v2, :cond_d
+
+ goto :goto_9
+
+ :cond_d
+ const/16 v16, 0x0
+
+ goto :goto_a
+
+ :cond_e
+ :goto_9
+ const/16 v16, 0x1
+
+ :goto_a
+ if-eqz v5, :cond_f
+
+ if-eqz v16, :cond_f
invoke-static {v3, v13}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
const v2, 0x7f040252
+ const/4 v4, 0x0
+
const/4 v6, 0x0
- const/4 v7, 0x0
-
- invoke-static {v3, v2, v7, v15, v6}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
+ invoke-static {v3, v2, v6, v15, v4}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
move-result v12
- goto :goto_9
+ goto :goto_b
- :cond_c
- const/4 v7, 0x0
+ :cond_f
+ const/4 v6, 0x0
const/4 v12, 0x0
- :goto_9
+ :goto_b
invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem;->getAction()Landroid/widget/TextView;
move-result-object v2
- invoke-virtual {v2, v7, v7, v12, v7}, Landroid/widget/TextView;->setCompoundDrawablesWithIntrinsicBounds(IIII)V
+ invoke-virtual {v2, v6, v6, v12, v6}, Landroid/widget/TextView;->setCompoundDrawablesWithIntrinsicBounds(IIII)V
invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem;->getAction()Landroid/widget/TextView;
@@ -921,13 +964,13 @@
new-instance v3, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem$onConfigure$1;
- invoke-direct {v3, v0, v5, v4, v1}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem$onConfigure$1;->(Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem;ZZLcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item;)V
+ invoke-direct {v3, v0, v5, v14, v1}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem$onConfigure$1;->(Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem;ZZLcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item;)V
invoke-virtual {v2, v3}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
return-void
- :cond_d
+ :cond_10
new-instance v1, Ljava/lang/Exception;
const-string v2, "Incorrect List Item Type or null data"
@@ -936,7 +979,7 @@
throw v1
- :cond_e
+ :cond_11
const-string v1, "data"
invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
diff --git a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion$get$1.smali
index c7d243f1d5..d2cdc01c0b 100644
--- a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion$get$1.smali
@@ -61,7 +61,7 @@
# virtual methods
-.method public final call(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelUser;Ljava/lang/Integer;)Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;
+.method public final call(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelUser$Me;Ljava/lang/Integer;)Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;
.locals 11
if-nez p3, :cond_0
@@ -122,11 +122,11 @@
check-cast p1, Lcom/discord/models/domain/ModelPresence;
- check-cast p2, Lcom/discord/models/domain/ModelUser;
+ check-cast p2, Lcom/discord/models/domain/ModelUser$Me;
check-cast p3, Ljava/lang/Integer;
- invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion$get$1;->call(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelUser;Ljava/lang/Integer;)Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;
+ invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion$get$1;->call(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelUser$Me;Ljava/lang/Integer;)Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;
move-result-object p1
diff --git a/com.discord/smali/e/a/a/e/a$c.smali b/com.discord/smali/e/a/a/e/a$c.smali
index 8338206a54..8f10209717 100644
--- a/com.discord/smali/e/a/a/e/a$c.smali
+++ b/com.discord/smali/e/a/a/e/a$c.smali
@@ -1,9 +1,9 @@
.class public final Le/a/a/e/a$c;
-.super Ljava/lang/Object;
+.super Lt/u/b/k;
.source "WidgetGiftAcceptDialog.kt"
# interfaces
-.implements Lrx/functions/Func2;
+.implements Lkotlin/jvm/functions/Function1;
# annotations
@@ -18,57 +18,63 @@
.annotation system Ldalvik/annotation/Signature;
value = {
- "",
- "Ljava/lang/Object;",
- "Lrx/functions/Func2<",
- "TT1;TT2;TR;>;"
+ "Lt/u/b/k;",
+ "Lkotlin/jvm/functions/Function1<",
+ "Lcom/discord/utilities/error/Error;",
+ "Lkotlin/Unit;",
+ ">;"
}
.end annotation
-# static fields
-.field public static final d:Le/a/a/e/a$c;
+# instance fields
+.field public final synthetic this$0:Le/a/a/e/a;
# direct methods
-.method public static constructor ()V
- .locals 1
-
- new-instance v0, Le/a/a/e/a$c;
-
- invoke-direct {v0}, Le/a/a/e/a$c;->()V
-
- sput-object v0, Le/a/a/e/a$c;->d:Le/a/a/e/a$c;
-
- return-void
-.end method
-
-.method public constructor ()V
+.method public constructor (Le/a/a/e/a;)V
.locals 0
- invoke-direct {p0}, Ljava/lang/Object;->()V
+ iput-object p1, p0, Le/a/a/e/a$c;->this$0:Le/a/a/e/a;
+
+ const/4 p1, 0x1
+
+ invoke-direct {p0, p1}, Lt/u/b/k;->(I)V
return-void
.end method
# virtual methods
-.method public call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- .locals 1
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 0
- check-cast p1, Lcom/discord/stores/StoreGifting$GiftState;
+ check-cast p1, Lcom/discord/utilities/error/Error;
- check-cast p2, Lcom/discord/models/domain/ModelUser;
+ invoke-virtual {p0, p1}, Le/a/a/e/a$c;->invoke(Lcom/discord/utilities/error/Error;)V
- new-instance v0, Lkotlin/Pair;
+ sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
- invoke-direct {v0, p1, p2}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V
-
- return-object v0
+ return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/utilities/error/Error;)V
+ .locals 0
+
+ if-eqz p1, :cond_0
+
+ iget-object p1, p0, Le/a/a/e/a$c;->this$0:Le/a/a/e/a;
+
+ invoke-virtual {p1}, Lcom/discord/app/AppDialog;->dismiss()V
+
+ return-void
+
+ :cond_0
+ const-string p1, "it"
+
+ invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+
+ const/4 p1, 0x0
+
+ throw p1
.end method
diff --git a/com.discord/smali/e/a/a/e/a$d.smali b/com.discord/smali/e/a/a/e/a$d.smali
index 94632eff60..44857f0fb2 100644
--- a/com.discord/smali/e/a/a/e/a$d.smali
+++ b/com.discord/smali/e/a/a/e/a$d.smali
@@ -20,7 +20,7 @@
value = {
"Lt/u/b/k;",
"Lkotlin/jvm/functions/Function1<",
- "Lcom/discord/utilities/error/Error;",
+ "Lcom/discord/stores/StoreGifting$GiftState;",
"Lkotlin/Unit;",
">;"
}
@@ -46,31 +46,117 @@
# virtual methods
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
- .locals 0
+.method public final a(Lcom/discord/stores/StoreGifting$GiftState;)V
+ .locals 2
- check-cast p1, Lcom/discord/utilities/error/Error;
+ if-eqz p1, :cond_5
- invoke-virtual {p0, p1}, Le/a/a/e/a$d;->invoke(Lcom/discord/utilities/error/Error;)V
+ instance-of v0, p1, Lcom/discord/stores/StoreGifting$GiftState$Resolved;
- sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+ if-eqz v0, :cond_2
- return-object p1
-.end method
+ check-cast p1, Lcom/discord/stores/StoreGifting$GiftState$Resolved;
-.method public final invoke(Lcom/discord/utilities/error/Error;)V
- .locals 0
+ invoke-virtual {p1}, Lcom/discord/stores/StoreGifting$GiftState$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
- if-eqz p1, :cond_0
+ move-result-object v0
+ invoke-virtual {v0}, Lcom/discord/models/domain/ModelGift;->getRedeemed()Z
+
+ move-result v0
+
+ if-eqz v0, :cond_0
+
+ iget-object v0, p0, Le/a/a/e/a$d;->this$0:Le/a/a/e/a;
+
+ invoke-virtual {p1}, Lcom/discord/stores/StoreGifting$GiftState$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
+
+ move-result-object p1
+
+ invoke-static {v0, p1}, Le/a/a/e/a;->a(Le/a/a/e/a;Lcom/discord/models/domain/ModelGift;)V
+
+ goto :goto_0
+
+ :cond_0
+ invoke-virtual {p1}, Lcom/discord/stores/StoreGifting$GiftState$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
+
+ move-result-object v0
+
+ invoke-virtual {v0}, Lcom/discord/models/domain/ModelGift;->getMaxUses()I
+
+ move-result v0
+
+ invoke-virtual {p1}, Lcom/discord/stores/StoreGifting$GiftState$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
+
+ move-result-object v1
+
+ invoke-virtual {v1}, Lcom/discord/models/domain/ModelGift;->getUses()I
+
+ move-result v1
+
+ if-ne v0, v1, :cond_1
+
+ iget-object v0, p0, Le/a/a/e/a$d;->this$0:Le/a/a/e/a;
+
+ invoke-virtual {p1}, Lcom/discord/stores/StoreGifting$GiftState$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
+
+ move-result-object p1
+
+ invoke-static {v0, p1}, Le/a/a/e/a;->b(Le/a/a/e/a;Lcom/discord/models/domain/ModelGift;)V
+
+ goto :goto_0
+
+ :cond_1
+ iget-object v0, p0, Le/a/a/e/a$d;->this$0:Le/a/a/e/a;
+
+ invoke-virtual {p1}, Lcom/discord/stores/StoreGifting$GiftState$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
+
+ move-result-object p1
+
+ invoke-static {v0, p1}, Le/a/a/e/a;->d(Le/a/a/e/a;Lcom/discord/models/domain/ModelGift;)V
+
+ goto :goto_0
+
+ :cond_2
+ instance-of v0, p1, Lcom/discord/stores/StoreGifting$GiftState$Redeeming;
+
+ if-eqz v0, :cond_3
+
+ iget-object v0, p0, Le/a/a/e/a$d;->this$0:Le/a/a/e/a;
+
+ check-cast p1, Lcom/discord/stores/StoreGifting$GiftState$Redeeming;
+
+ invoke-virtual {p1}, Lcom/discord/stores/StoreGifting$GiftState$Redeeming;->getGift()Lcom/discord/models/domain/ModelGift;
+
+ move-result-object p1
+
+ invoke-static {v0, p1}, Le/a/a/e/a;->c(Le/a/a/e/a;Lcom/discord/models/domain/ModelGift;)V
+
+ goto :goto_0
+
+ :cond_3
+ instance-of v0, p1, Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;
+
+ if-eqz v0, :cond_4
+
+ iget-object v0, p0, Le/a/a/e/a$d;->this$0:Le/a/a/e/a;
+
+ check-cast p1, Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;
+
+ invoke-static {v0, p1}, Le/a/a/e/a;->a(Le/a/a/e/a;Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;)V
+
+ goto :goto_0
+
+ :cond_4
iget-object p1, p0, Le/a/a/e/a$d;->this$0:Le/a/a/e/a;
invoke-virtual {p1}, Lcom/discord/app/AppDialog;->dismiss()V
+ :goto_0
return-void
- :cond_0
- const-string p1, "it"
+ :cond_5
+ const-string p1, "giftState"
invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
@@ -78,3 +164,15 @@
throw p1
.end method
+
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 0
+
+ check-cast p1, Lcom/discord/stores/StoreGifting$GiftState;
+
+ invoke-virtual {p0, p1}, Le/a/a/e/a$d;->a(Lcom/discord/stores/StoreGifting$GiftState;)V
+
+ sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+ return-object p1
+.end method
diff --git a/com.discord/smali/e/a/a/e/a$e.smali b/com.discord/smali/e/a/a/e/a$e.smali
deleted file mode 100644
index 1af0a73086..0000000000
--- a/com.discord/smali/e/a/a/e/a$e.smali
+++ /dev/null
@@ -1,232 +0,0 @@
-.class public final Le/a/a/e/a$e;
-.super Lt/u/b/k;
-.source "WidgetGiftAcceptDialog.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Le/a/a/e/a;->onViewBound(Landroid/view/View;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x19
- name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
- value = {
- "Lt/u/b/k;",
- "Lkotlin/jvm/functions/Function1<",
- "Lkotlin/Pair<",
- "+",
- "Lcom/discord/stores/StoreGifting$GiftState;",
- "+",
- "Lcom/discord/models/domain/ModelUser;",
- ">;",
- "Lkotlin/Unit;",
- ">;"
- }
-.end annotation
-
-
-# instance fields
-.field public final synthetic this$0:Le/a/a/e/a;
-
-
-# direct methods
-.method public constructor (Le/a/a/e/a;)V
- .locals 0
-
- iput-object p1, p0, Le/a/a/e/a$e;->this$0:Le/a/a/e/a;
-
- const/4 p1, 0x1
-
- invoke-direct {p0, p1}, Lt/u/b/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, Lkotlin/Pair;
-
- invoke-virtual {p0, p1}, Le/a/a/e/a$e;->invoke(Lkotlin/Pair;)V
-
- sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
-
- return-object p1
-.end method
-
-.method public final invoke(Lkotlin/Pair;)V
- .locals 3
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "(",
- "Lkotlin/Pair<",
- "+",
- "Lcom/discord/stores/StoreGifting$GiftState;",
- "+",
- "Lcom/discord/models/domain/ModelUser;",
- ">;)V"
- }
- .end annotation
-
- invoke-virtual {p1}, Lkotlin/Pair;->component1()Ljava/lang/Object;
-
- move-result-object v0
-
- check-cast v0, Lcom/discord/stores/StoreGifting$GiftState;
-
- invoke-virtual {p1}, Lkotlin/Pair;->component2()Ljava/lang/Object;
-
- move-result-object p1
-
- check-cast p1, Lcom/discord/models/domain/ModelUser;
-
- instance-of v1, v0, Lcom/discord/stores/StoreGifting$GiftState$Resolved;
-
- if-eqz v1, :cond_3
-
- check-cast v0, Lcom/discord/stores/StoreGifting$GiftState$Resolved;
-
- invoke-virtual {v0}, Lcom/discord/stores/StoreGifting$GiftState$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
-
- move-result-object v1
-
- invoke-virtual {v1}, Lcom/discord/models/domain/ModelGift;->isAnyNitroGift()Z
-
- move-result v1
-
- if-eqz v1, :cond_0
-
- sget-object v1, Lcom/discord/utilities/premium/PremiumUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumUtils;
-
- const-string v2, "me"
-
- invoke-static {p1, v2}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- invoke-virtual {v0}, Lcom/discord/stores/StoreGifting$GiftState$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
-
- move-result-object v2
-
- invoke-virtual {v1, p1, v2}, Lcom/discord/utilities/premium/PremiumUtils;->isAcceptableNitroGift(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGift;)Z
-
- move-result p1
-
- if-nez p1, :cond_0
-
- iget-object p1, p0, Le/a/a/e/a$e;->this$0:Le/a/a/e/a;
-
- invoke-virtual {v0}, Lcom/discord/stores/StoreGifting$GiftState$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
-
- move-result-object v0
-
- invoke-static {p1, v0}, Le/a/a/e/a;->d(Le/a/a/e/a;Lcom/discord/models/domain/ModelGift;)V
-
- goto :goto_0
-
- :cond_0
- invoke-virtual {v0}, Lcom/discord/stores/StoreGifting$GiftState$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
-
- move-result-object p1
-
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->getRedeemed()Z
-
- move-result p1
-
- if-eqz p1, :cond_1
-
- iget-object p1, p0, Le/a/a/e/a$e;->this$0:Le/a/a/e/a;
-
- invoke-virtual {v0}, Lcom/discord/stores/StoreGifting$GiftState$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
-
- move-result-object v0
-
- invoke-static {p1, v0}, Le/a/a/e/a;->a(Le/a/a/e/a;Lcom/discord/models/domain/ModelGift;)V
-
- goto :goto_0
-
- :cond_1
- invoke-virtual {v0}, Lcom/discord/stores/StoreGifting$GiftState$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
-
- move-result-object p1
-
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->getMaxUses()I
-
- move-result p1
-
- invoke-virtual {v0}, Lcom/discord/stores/StoreGifting$GiftState$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
-
- move-result-object v1
-
- invoke-virtual {v1}, Lcom/discord/models/domain/ModelGift;->getUses()I
-
- move-result v1
-
- if-ne p1, v1, :cond_2
-
- iget-object p1, p0, Le/a/a/e/a$e;->this$0:Le/a/a/e/a;
-
- invoke-virtual {v0}, Lcom/discord/stores/StoreGifting$GiftState$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
-
- move-result-object v0
-
- invoke-static {p1, v0}, Le/a/a/e/a;->b(Le/a/a/e/a;Lcom/discord/models/domain/ModelGift;)V
-
- goto :goto_0
-
- :cond_2
- iget-object p1, p0, Le/a/a/e/a$e;->this$0:Le/a/a/e/a;
-
- invoke-virtual {v0}, Lcom/discord/stores/StoreGifting$GiftState$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
-
- move-result-object v0
-
- invoke-static {p1, v0}, Le/a/a/e/a;->e(Le/a/a/e/a;Lcom/discord/models/domain/ModelGift;)V
-
- goto :goto_0
-
- :cond_3
- instance-of p1, v0, Lcom/discord/stores/StoreGifting$GiftState$Redeeming;
-
- if-eqz p1, :cond_4
-
- iget-object p1, p0, Le/a/a/e/a$e;->this$0:Le/a/a/e/a;
-
- check-cast v0, Lcom/discord/stores/StoreGifting$GiftState$Redeeming;
-
- invoke-virtual {v0}, Lcom/discord/stores/StoreGifting$GiftState$Redeeming;->getGift()Lcom/discord/models/domain/ModelGift;
-
- move-result-object v0
-
- invoke-static {p1, v0}, Le/a/a/e/a;->c(Le/a/a/e/a;Lcom/discord/models/domain/ModelGift;)V
-
- goto :goto_0
-
- :cond_4
- instance-of p1, v0, Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;
-
- if-eqz p1, :cond_5
-
- iget-object p1, p0, Le/a/a/e/a$e;->this$0:Le/a/a/e/a;
-
- check-cast v0, Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;
-
- invoke-static {p1, v0}, Le/a/a/e/a;->a(Le/a/a/e/a;Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;)V
-
- goto :goto_0
-
- :cond_5
- iget-object p1, p0, Le/a/a/e/a$e;->this$0:Le/a/a/e/a;
-
- invoke-virtual {p1}, Lcom/discord/app/AppDialog;->dismiss()V
-
- :goto_0
- return-void
-.end method
diff --git a/com.discord/smali/e/a/a/e/a.smali b/com.discord/smali/e/a/a/e/a.smali
index 15dba7d65c..b425e12d21 100644
--- a/com.discord/smali/e/a/a/e/a.smali
+++ b/com.discord/smali/e/a/a/e/a.smali
@@ -592,72 +592,6 @@
.end method
.method public static final synthetic d(Le/a/a/e/a;Lcom/discord/models/domain/ModelGift;)V
- .locals 2
-
- invoke-virtual {p0, p1}, Le/a/a/e/a;->a(Lcom/discord/models/domain/ModelGift;)V
-
- invoke-virtual {p0}, Le/a/a/e/a;->getDialogHeader()Lcom/discord/app/AppTextView;
-
- move-result-object p1
-
- const v0, 0x7f120789
-
- invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
-
- move-result-object v0
-
- invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
- invoke-virtual {p0}, Le/a/a/e/a;->getDialogText()Lcom/discord/app/AppTextView;
-
- move-result-object p1
-
- const v0, 0x7f12076d
-
- invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
-
- move-result-object v0
-
- invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
- invoke-virtual {p0}, Le/a/a/e/a;->c()Landroid/widget/Button;
-
- move-result-object p1
-
- invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
-
- move-result-object v0
-
- if-eqz v0, :cond_0
-
- const v1, 0x7f120782
-
- invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
-
- move-result-object v0
-
- goto :goto_0
-
- :cond_0
- const/4 v0, 0x0
-
- :goto_0
- invoke-virtual {p1, v0}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
-
- invoke-virtual {p0}, Le/a/a/e/a;->c()Landroid/widget/Button;
-
- move-result-object p1
-
- new-instance v0, Le/a/a/e/e;
-
- invoke-direct {v0, p0}, Le/a/a/e/e;->(Le/a/a/e/a;)V
-
- invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
- return-void
-.end method
-
-.method public static final synthetic e(Le/a/a/e/a;Lcom/discord/models/domain/ModelGift;)V
.locals 7
invoke-virtual {p0, p1}, Le/a/a/e/a;->a(Lcom/discord/models/domain/ModelGift;)V
@@ -799,9 +733,9 @@
move-result-object p0
- new-instance v0, Le/a/a/e/f;
+ new-instance v0, Le/a/a/e/e;
- invoke-direct {v0, p1}, Le/a/a/e/f;->(Lcom/discord/models/domain/ModelGift;)V
+ invoke-direct {v0, p1}, Le/a/a/e/e;->(Lcom/discord/models/domain/ModelGift;)V
invoke-virtual {p0, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
@@ -1513,26 +1447,6 @@
move-result-object p1
- sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
- invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getUsers()Lcom/discord/stores/StoreUser;
-
- move-result-object v1
-
- invoke-virtual {v1}, Lcom/discord/stores/StoreUser;->observeMe()Lrx/Observable;
-
- move-result-object v1
-
- sget-object v2, Le/a/a/e/a$c;->d:Le/a/a/e/a$c;
-
- invoke-static {p1, v1, v2}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
-
- move-result-object p1
-
- const-string v1, "Observable.combineLatest\u2026, me -> giftState to me }"
-
- invoke-static {p1, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
const/4 v1, 0x2
invoke-static {p1, p0, v0, v1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
@@ -1545,15 +1459,15 @@
const/4 v5, 0x0
- new-instance v6, Le/a/a/e/a$d;
+ new-instance v6, Le/a/a/e/a$c;
- invoke-direct {v6, p0}, Le/a/a/e/a$d;->(Le/a/a/e/a;)V
+ invoke-direct {v6, p0}, Le/a/a/e/a$c;->(Le/a/a/e/a;)V
const/4 v7, 0x0
- new-instance v8, Le/a/a/e/a$e;
+ new-instance v8, Le/a/a/e/a$d;
- invoke-direct {v8, p0}, Le/a/a/e/a$e;->(Le/a/a/e/a;)V
+ invoke-direct {v8, p0}, Le/a/a/e/a$d;->(Le/a/a/e/a;)V
const/16 v9, 0x16
diff --git a/com.discord/smali/e/a/a/e/e.smali b/com.discord/smali/e/a/a/e/e.smali
index 80415b40b4..ca03756cd4 100644
--- a/com.discord/smali/e/a/a/e/e.smali
+++ b/com.discord/smali/e/a/a/e/e.smali
@@ -7,14 +7,14 @@
# instance fields
-.field public final synthetic d:Le/a/a/e/a;
+.field public final synthetic d:Lcom/discord/models/domain/ModelGift;
# direct methods
-.method public constructor (Le/a/a/e/a;)V
+.method public constructor (Lcom/discord/models/domain/ModelGift;)V
.locals 0
- iput-object p1, p0, Le/a/a/e/e;->d:Le/a/a/e/a;
+ iput-object p1, p0, Le/a/a/e/e;->d:Lcom/discord/models/domain/ModelGift;
invoke-direct {p0}, Ljava/lang/Object;->()V
@@ -24,11 +24,17 @@
# virtual methods
.method public final onClick(Landroid/view/View;)V
- .locals 0
+ .locals 1
- iget-object p1, p0, Le/a/a/e/e;->d:Le/a/a/e/a;
+ sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
- invoke-virtual {p1}, Lcom/discord/app/AppDialog;->dismiss()V
+ invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getGifting()Lcom/discord/stores/StoreGifting;
+
+ move-result-object p1
+
+ iget-object v0, p0, Le/a/a/e/e;->d:Lcom/discord/models/domain/ModelGift;
+
+ invoke-virtual {p1, v0}, Lcom/discord/stores/StoreGifting;->acceptGift(Lcom/discord/models/domain/ModelGift;)V
return-void
.end method
diff --git a/com.discord/smali/e/a/a/e/f.smali b/com.discord/smali/e/a/a/e/f.smali
deleted file mode 100644
index 35381f8d84..0000000000
--- a/com.discord/smali/e/a/a/e/f.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.class public final Le/a/a/e/f;
-.super Ljava/lang/Object;
-.source "WidgetGiftAcceptDialog.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# instance fields
-.field public final synthetic d:Lcom/discord/models/domain/ModelGift;
-
-
-# direct methods
-.method public constructor (Lcom/discord/models/domain/ModelGift;)V
- .locals 0
-
- iput-object p1, p0, Le/a/a/e/f;->d:Lcom/discord/models/domain/ModelGift;
-
- invoke-direct {p0}, Ljava/lang/Object;->()V
-
- return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
- .locals 1
-
- sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
- invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getGifting()Lcom/discord/stores/StoreGifting;
-
- move-result-object p1
-
- iget-object v0, p0, Le/a/a/e/f;->d:Lcom/discord/models/domain/ModelGift;
-
- invoke-virtual {p1, v0}, Lcom/discord/stores/StoreGifting;->acceptGift(Lcom/discord/models/domain/ModelGift;)V
-
- return-void
-.end method
diff --git a/com.discord/smali/e/a/k/b/a/a0.smali b/com.discord/smali/e/a/k/b/a/a0.smali
index 9b07d3feda..94ffd474dd 100644
--- a/com.discord/smali/e/a/k/b/a/a0.smali
+++ b/com.discord/smali/e/a/k/b/a/a0.smali
@@ -3,7 +3,7 @@
.source "lambda"
# interfaces
-.implements Landroid/view/View$OnClickListener;
+.implements Lb0/l/i;
# static fields
@@ -33,16 +33,14 @@
# virtual methods
-.method public final onClick(Landroid/view/View;)V
- .locals 1
+.method public final call(Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 0
- invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
+ check-cast p1, Ljava/lang/Integer;
+
+ invoke-static {p1}, Lcom/discord/widgets/chat/input/WidgetChatInputModel;->a(Ljava/lang/Integer;)Ljava/lang/Boolean;
move-result-object p1
- sget-object v0, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;->UNFORCED:Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;
-
- invoke-static {p1, v0}, Lcom/discord/widgets/user/email/WidgetUserEmailVerify;->launch(Landroid/content/Context;Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;)V
-
- return-void
+ return-object p1
.end method
diff --git a/com.discord/smali/e/a/k/b/a/b0.smali b/com.discord/smali/e/a/k/b/a/b0.smali
index daad517577..278fc5a2a2 100644
--- a/com.discord/smali/e/a/k/b/a/b0.smali
+++ b/com.discord/smali/e/a/k/b/a/b0.smali
@@ -6,39 +6,31 @@
.implements Lkotlin/jvm/functions/Function1;
-# static fields
-.field public static final synthetic d:Le/a/k/b/a/b0;
+# instance fields
+.field private final synthetic d:Landroid/content/Context;
# direct methods
-.method static synthetic constructor ()V
- .locals 1
-
- new-instance v0, Le/a/k/b/a/b0;
-
- invoke-direct {v0}, Le/a/k/b/a/b0;->()V
-
- sput-object v0, Le/a/k/b/a/b0;->d:Le/a/k/b/a/b0;
-
- return-void
-.end method
-
-.method private synthetic constructor ()V
+.method public synthetic constructor (Landroid/content/Context;)V
.locals 0
invoke-direct {p0}, Ljava/lang/Object;->()V
+ iput-object p1, p0, Le/a/k/b/a/b0;->d:Landroid/content/Context;
+
return-void
.end method
# virtual methods
.method public final invoke(Ljava/lang/Object;)Ljava/lang/Object;
- .locals 0
+ .locals 1
+
+ iget-object v0, p0, Le/a/k/b/a/b0;->d:Landroid/content/Context;
check-cast p1, Lcom/discord/models/domain/ModelChannel;
- invoke-static {p1}, Lcom/discord/widgets/chat/input/WidgetChatInputModel;->a(Lcom/discord/models/domain/ModelChannel;)Ljava/lang/Boolean;
+ invoke-static {v0, p1}, Lcom/discord/widgets/chat/input/WidgetChatInputModel;->a(Landroid/content/Context;Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
move-result-object p1
diff --git a/com.discord/smali/e/a/k/b/a/c0.smali b/com.discord/smali/e/a/k/b/a/c0.smali
index e6f4a2588d..4c371b3639 100644
--- a/com.discord/smali/e/a/k/b/a/c0.smali
+++ b/com.discord/smali/e/a/k/b/a/c0.smali
@@ -3,42 +3,52 @@
.source "lambda"
# interfaces
-.implements Lb0/l/i;
+.implements Lrx/functions/Func5;
-# static fields
-.field public static final synthetic d:Le/a/k/b/a/c0;
+# instance fields
+.field private final synthetic d:J
# direct methods
-.method static synthetic constructor ()V
- .locals 1
-
- new-instance v0, Le/a/k/b/a/c0;
-
- invoke-direct {v0}, Le/a/k/b/a/c0;->()V
-
- sput-object v0, Le/a/k/b/a/c0;->d:Le/a/k/b/a/c0;
-
- return-void
-.end method
-
-.method private synthetic constructor ()V
+.method public synthetic constructor (J)V
.locals 0
invoke-direct {p0}, Ljava/lang/Object;->()V
+ iput-wide p1, p0, Le/a/k/b/a/c0;->d:J
+
return-void
.end method
# virtual methods
-.method public final call(Ljava/lang/Object;)Ljava/lang/Object;
- .locals 0
+.method public final call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 7
- check-cast p1, Ljava/lang/Integer;
+ iget-wide v0, p0, Le/a/k/b/a/c0;->d:J
- invoke-static {p1}, Lcom/discord/widgets/chat/input/WidgetChatInputModel;->a(Ljava/lang/Integer;)Ljava/lang/Boolean;
+ move-object v2, p1
+
+ check-cast v2, Ljava/lang/Long;
+
+ move-object v3, p2
+
+ check-cast v3, Lcom/discord/models/domain/ModelGuild;
+
+ move-object v4, p3
+
+ check-cast v4, Ljava/lang/Integer;
+
+ move-object v5, p4
+
+ check-cast v5, Ljava/util/Map;
+
+ move-object v6, p5
+
+ check-cast v6, Lcom/discord/models/domain/ModelUser$Me;
+
+ invoke-static/range {v0 .. v6}, Lcom/discord/widgets/chat/input/WidgetChatInputModel;->a(JLjava/lang/Long;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;Ljava/util/Map;Lcom/discord/models/domain/ModelUser$Me;)Ljava/lang/Integer;
move-result-object p1
diff --git a/com.discord/smali/e/a/k/b/a/d0.smali b/com.discord/smali/e/a/k/b/a/d0.smali
index 383d214714..be6028863b 100644
--- a/com.discord/smali/e/a/k/b/a/d0.smali
+++ b/com.discord/smali/e/a/k/b/a/d0.smali
@@ -3,36 +3,78 @@
.source "lambda"
# interfaces
-.implements Lkotlin/jvm/functions/Function1;
+.implements Lrx/functions/Func9;
# instance fields
-.field private final synthetic d:Landroid/content/Context;
+.field private final synthetic d:Lcom/discord/models/domain/ModelChannel;
+
+.field private final synthetic e:Landroid/content/Context;
# direct methods
-.method public synthetic constructor (Landroid/content/Context;)V
+.method public synthetic constructor (Lcom/discord/models/domain/ModelChannel;Landroid/content/Context;)V
.locals 0
invoke-direct {p0}, Ljava/lang/Object;->()V
- iput-object p1, p0, Le/a/k/b/a/d0;->d:Landroid/content/Context;
+ iput-object p1, p0, Le/a/k/b/a/d0;->d:Lcom/discord/models/domain/ModelChannel;
+
+ iput-object p2, p0, Le/a/k/b/a/d0;->e:Landroid/content/Context;
return-void
.end method
# virtual methods
-.method public final invoke(Ljava/lang/Object;)Ljava/lang/Object;
- .locals 1
+.method public final call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 12
- iget-object v0, p0, Le/a/k/b/a/d0;->d:Landroid/content/Context;
+ move-object v0, p0
- check-cast p1, Lcom/discord/models/domain/ModelChannel;
+ iget-object v1, v0, Le/a/k/b/a/d0;->d:Lcom/discord/models/domain/ModelChannel;
- invoke-static {v0, p1}, Lcom/discord/widgets/chat/input/WidgetChatInputModel;->a(Landroid/content/Context;Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
+ iget-object v2, v0, Le/a/k/b/a/d0;->e:Landroid/content/Context;
- move-result-object p1
+ move-object v3, p1
- return-object p1
+ check-cast v3, Lcom/discord/models/domain/ModelUser$Me;
+
+ move-object v4, p2
+
+ check-cast v4, Lcom/discord/stores/StoreChat$EditingMessage;
+
+ move-object v5, p3
+
+ check-cast v5, Ljava/lang/Integer;
+
+ move-object/from16 v6, p4
+
+ check-cast v6, Ljava/lang/Integer;
+
+ move-object/from16 v7, p5
+
+ check-cast v7, Ljava/lang/Integer;
+
+ move-object/from16 v8, p6
+
+ check-cast v8, Ljava/lang/Boolean;
+
+ move-object/from16 v9, p7
+
+ check-cast v9, Ljava/lang/String;
+
+ move-object/from16 v10, p8
+
+ check-cast v10, Ljava/lang/Boolean;
+
+ move-object/from16 v11, p9
+
+ check-cast v11, Lcom/discord/models/domain/ModelGuild;
+
+ invoke-static/range {v1 .. v11}, Lcom/discord/widgets/chat/input/WidgetChatInputModel;->a(Lcom/discord/models/domain/ModelChannel;Landroid/content/Context;Lcom/discord/models/domain/ModelUser$Me;Lcom/discord/stores/StoreChat$EditingMessage;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/chat/input/WidgetChatInputModel;
+
+ move-result-object v1
+
+ return-object v1
.end method
diff --git a/com.discord/smali/e/a/k/b/a/y.smali b/com.discord/smali/e/a/k/b/a/y.smali
index a30c229b5c..9b459cbe4c 100644
--- a/com.discord/smali/e/a/k/b/a/y.smali
+++ b/com.discord/smali/e/a/k/b/a/y.smali
@@ -3,54 +3,46 @@
.source "lambda"
# interfaces
-.implements Lrx/functions/Func5;
+.implements Landroid/view/View$OnClickListener;
-# instance fields
-.field private final synthetic d:J
+# static fields
+.field public static final synthetic d:Le/a/k/b/a/y;
# direct methods
-.method public synthetic constructor (J)V
+.method static synthetic constructor ()V
+ .locals 1
+
+ new-instance v0, Le/a/k/b/a/y;
+
+ invoke-direct {v0}, Le/a/k/b/a/y;->()V
+
+ sput-object v0, Le/a/k/b/a/y;->d:Le/a/k/b/a/y;
+
+ return-void
+.end method
+
+.method private synthetic constructor ()V
.locals 0
invoke-direct {p0}, Ljava/lang/Object;->()V
- iput-wide p1, p0, Le/a/k/b/a/y;->d:J
-
return-void
.end method
# virtual methods
-.method public final call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- .locals 7
+.method public final onClick(Landroid/view/View;)V
+ .locals 1
- iget-wide v0, p0, Le/a/k/b/a/y;->d:J
-
- move-object v2, p1
-
- check-cast v2, Ljava/lang/Long;
-
- move-object v3, p2
-
- check-cast v3, Lcom/discord/models/domain/ModelGuild;
-
- move-object v4, p3
-
- check-cast v4, Ljava/lang/Integer;
-
- move-object v5, p4
-
- check-cast v5, Ljava/util/Map;
-
- move-object v6, p5
-
- check-cast v6, Lcom/discord/models/domain/ModelUser;
-
- invoke-static/range {v0 .. v6}, Lcom/discord/widgets/chat/input/WidgetChatInputModel;->a(JLjava/lang/Long;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;Ljava/util/Map;Lcom/discord/models/domain/ModelUser;)Ljava/lang/Integer;
+ invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
move-result-object p1
- return-object p1
+ sget-object v0, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;->UNFORCED:Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;
+
+ invoke-static {p1, v0}, Lcom/discord/widgets/user/email/WidgetUserEmailVerify;->launch(Landroid/content/Context;Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;)V
+
+ return-void
.end method
diff --git a/com.discord/smali/e/a/k/b/a/z.smali b/com.discord/smali/e/a/k/b/a/z.smali
index eb37a19183..6b667cc5a7 100644
--- a/com.discord/smali/e/a/k/b/a/z.smali
+++ b/com.discord/smali/e/a/k/b/a/z.smali
@@ -3,78 +3,44 @@
.source "lambda"
# interfaces
-.implements Lrx/functions/Func9;
+.implements Lkotlin/jvm/functions/Function1;
-# instance fields
-.field private final synthetic d:Lcom/discord/models/domain/ModelChannel;
-
-.field private final synthetic e:Landroid/content/Context;
+# static fields
+.field public static final synthetic d:Le/a/k/b/a/z;
# direct methods
-.method public synthetic constructor (Lcom/discord/models/domain/ModelChannel;Landroid/content/Context;)V
+.method static synthetic constructor ()V
+ .locals 1
+
+ new-instance v0, Le/a/k/b/a/z;
+
+ invoke-direct {v0}, Le/a/k/b/a/z;->()V
+
+ sput-object v0, Le/a/k/b/a/z;->d:Le/a/k/b/a/z;
+
+ return-void
+.end method
+
+.method private synthetic constructor ()V
.locals 0
invoke-direct {p0}, Ljava/lang/Object;->()V
- iput-object p1, p0, Le/a/k/b/a/z;->d:Lcom/discord/models/domain/ModelChannel;
-
- iput-object p2, p0, Le/a/k/b/a/z;->e:Landroid/content/Context;
-
return-void
.end method
# virtual methods
-.method public final call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- .locals 12
+.method public final invoke(Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 0
- move-object v0, p0
+ check-cast p1, Lcom/discord/models/domain/ModelChannel;
- iget-object v1, v0, Le/a/k/b/a/z;->d:Lcom/discord/models/domain/ModelChannel;
+ invoke-static {p1}, Lcom/discord/widgets/chat/input/WidgetChatInputModel;->a(Lcom/discord/models/domain/ModelChannel;)Ljava/lang/Boolean;
- iget-object v2, v0, Le/a/k/b/a/z;->e:Landroid/content/Context;
+ move-result-object p1
- move-object v3, p1
-
- check-cast v3, Lcom/discord/models/domain/ModelUser;
-
- move-object v4, p2
-
- check-cast v4, Lcom/discord/stores/StoreChat$EditingMessage;
-
- move-object v5, p3
-
- check-cast v5, Ljava/lang/Integer;
-
- move-object/from16 v6, p4
-
- check-cast v6, Ljava/lang/Integer;
-
- move-object/from16 v7, p5
-
- check-cast v7, Ljava/lang/Integer;
-
- move-object/from16 v8, p6
-
- check-cast v8, Ljava/lang/Boolean;
-
- move-object/from16 v9, p7
-
- check-cast v9, Ljava/lang/String;
-
- move-object/from16 v10, p8
-
- check-cast v10, Ljava/lang/Boolean;
-
- move-object/from16 v11, p9
-
- check-cast v11, Lcom/discord/models/domain/ModelGuild;
-
- invoke-static/range {v1 .. v11}, Lcom/discord/widgets/chat/input/WidgetChatInputModel;->a(Lcom/discord/models/domain/ModelChannel;Landroid/content/Context;Lcom/discord/models/domain/ModelUser;Lcom/discord/stores/StoreChat$EditingMessage;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/chat/input/WidgetChatInputModel;
-
- move-result-object v1
-
- return-object v1
+ return-object p1
.end method