diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index e14f0908e7..8c9df97325 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-1262.apk +apkFileName: com.discord-1265.apk compressionType: false doNotCompress: - resources.arsc @@ -3109,5 +3109,5 @@ usesFramework: tag: null version: 2.4.2-83a459-SNAPSHOT versionInfo: - versionCode: '1262' - versionName: '41.01' + versionCode: '1265' + versionName: '40.4' diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index 9a1df9353e..aaae59f1ab 100644 Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ diff --git a/com.discord/res/drawable-xhdpi/bg_cloud_pattern_dark.png b/com.discord/res/drawable-xhdpi/bg_cloud_pattern_dark.png index 0c20251da0..ca5f430a9a 100644 Binary files a/com.discord/res/drawable-xhdpi/bg_cloud_pattern_dark.png and b/com.discord/res/drawable-xhdpi/bg_cloud_pattern_dark.png differ diff --git a/com.discord/res/drawable-xxxhdpi/bg_cloud_pattern_light.png b/com.discord/res/drawable-xxxhdpi/bg_cloud_pattern_light.png index f409d1fca3..135a348869 100644 Binary files a/com.discord/res/drawable-xxxhdpi/bg_cloud_pattern_light.png and b/com.discord/res/drawable-xxxhdpi/bg_cloud_pattern_light.png differ diff --git a/com.discord/res/layout-v22/view_upload_progress.xml b/com.discord/res/layout-v22/view_upload_progress.xml index 3e493036dc..732045356b 100644 --- a/com.discord/res/layout-v22/view_upload_progress.xml +++ b/com.discord/res/layout-v22/view_upload_progress.xml @@ -4,5 +4,5 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/view_upload_progress.xml b/com.discord/res/layout/view_upload_progress.xml index 609c3171d6..ea89403955 100644 --- a/com.discord/res/layout/view_upload_progress.xml +++ b/com.discord/res/layout/view_upload_progress.xml @@ -4,5 +4,5 @@ - + \ No newline at end of file diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index 185dc4c7a2..ee0c7aadf1 100644 --- a/com.discord/res/values/strings.xml +++ b/com.discord/res/values/strings.xml @@ -1149,7 +1149,7 @@ We’re here to make a good impression." Presets Select a color Transparency - c11fc99903e64f848e255b244a3e96ee + 9dbe0f51311d470f99499c83506d53c7 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 586a9b9490..da2705f084 100644 --- a/com.discord/smali/com/discord/BuildConfig.smali +++ b/com.discord/smali/com/discord/BuildConfig.smali @@ -42,11 +42,11 @@ .field public static final SAMSUNGxDISCORD_CLIENT_ID:Ljava/lang/String; = "97t47j218f" -.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1262" +.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1265" -.field public static final VERSION_CODE:I = 0x4ee +.field public static final VERSION_CODE:I = 0x4f1 -.field public static final VERSION_NAME:Ljava/lang/String; = "41.01" +.field public static final VERSION_NAME:Ljava/lang/String; = "40.4" # direct methods diff --git a/com.discord/smali/com/discord/models/domain/emoji/EmojiCategory.smali b/com.discord/smali/com/discord/models/domain/emoji/EmojiCategory.smali index ad57c96692..14ee1b7b82 100644 --- a/com.discord/smali/com/discord/models/domain/emoji/EmojiCategory.smali +++ b/com.discord/smali/com/discord/models/domain/emoji/EmojiCategory.smali @@ -123,7 +123,7 @@ const/4 v8, 0x6 - const-string v9, "travel" + const-string/jumbo v9, "travel" invoke-direct {v0, v1, v8, v9}, Lcom/discord/models/domain/emoji/EmojiCategory;->(Ljava/lang/String;ILjava/lang/String;)V diff --git a/com.discord/smali/com/discord/stores/SlowTtiExperimentManagerKt.smali b/com.discord/smali/com/discord/stores/SlowTtiExperimentManagerKt.smali index 1b2f84b237..3a6f637a5b 100644 --- a/com.discord/smali/com/discord/stores/SlowTtiExperimentManagerKt.smali +++ b/com.discord/smali/com/discord/stores/SlowTtiExperimentManagerKt.smali @@ -20,71 +20,89 @@ # direct methods .method public static constructor ()V - .locals 7 + .locals 5 - const/4 v0, 0x4 + const/4 v0, 0x5 - new-array v1, v0, [Lkotlin/Pair; + new-array v0, v0, [Lkotlin/Pair; - const/4 v2, 0x1 + const/4 v1, 0x0 - invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + + move-result-object v2 + + const-wide/16 v3, 0x0 + + invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; move-result-object v3 - const-wide/16 v4, 0x1f4 + new-instance v4, Lkotlin/Pair; - invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-direct {v4, v2, v3}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V - move-result-object v4 + aput-object v4, v0, v1 - new-instance v5, Lkotlin/Pair; + const/4 v1, 0x1 - invoke-direct {v5, v3, v4}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V + invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - const/4 v3, 0x0 + move-result-object v2 - aput-object v5, v1, v3 + const-wide/16 v3, 0x1f4 - const/4 v3, 0x2 + invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + move-result-object v3 - move-result-object v4 + new-instance v4, Lkotlin/Pair; - const-wide/16 v5, 0x3e8 + invoke-direct {v4, v2, v3}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V - invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + aput-object v4, v0, v1 - move-result-object v5 + const/4 v1, 0x2 - new-instance v6, Lkotlin/Pair; + invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - invoke-direct {v6, v4, v5}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V + move-result-object v2 - aput-object v6, v1, v2 + const-wide/16 v3, 0x3e8 - const/4 v2, 0x3 + invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + move-result-object v3 - move-result-object v4 + new-instance v4, Lkotlin/Pair; - const-wide/16 v5, 0x7d0 + invoke-direct {v4, v2, v3}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V - invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + aput-object v4, v0, v1 - move-result-object v5 + const/4 v1, 0x3 - new-instance v6, Lkotlin/Pair; + invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - invoke-direct {v6, v4, v5}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V + move-result-object v2 - aput-object v6, v1, v3 + const-wide/16 v3, 0x7d0 - invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - move-result-object v0 + move-result-object v3 + + new-instance v4, Lkotlin/Pair; + + invoke-direct {v4, v2, v3}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V + + aput-object v4, v0, v1 + + const/4 v1, 0x4 + + invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + + move-result-object v2 const-wide/16 v3, 0xfa0 @@ -94,11 +112,11 @@ new-instance v4, Lkotlin/Pair; - invoke-direct {v4, v0, v3}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V + invoke-direct {v4, v2, v3}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V - aput-object v4, v1, v2 + aput-object v4, v0, v1 - invoke-static {v1}, Lf/h/a/f/e/n/f;->mapOf([Lkotlin/Pair;)Ljava/util/Map; + invoke-static {v0}, Lf/h/a/f/e/n/f;->mapOf([Lkotlin/Pair;)Ljava/util/Map; move-result-object v0 diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali index 0752d46762..599f5cefcf 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, 0x4ee + const/16 v0, 0x4f1 iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali index 647b8c224a..d2bb73a0f6 100644 --- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali +++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali @@ -84,7 +84,9 @@ iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application; - invoke-direct {v0, v1}, Lcom/discord/utilities/networking/NetworkMonitor;->(Landroid/content/Context;)V + sget-object v2, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog; + + invoke-direct {v0, v1, v2}, Lcom/discord/utilities/networking/NetworkMonitor;->(Landroid/content/Context;Lcom/discord/utilities/logging/Logger;)V iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream; diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali index c31a17eb3b..34b19689f6 100644 --- a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali +++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali @@ -173,7 +173,7 @@ const-string v3, "browser_user_agent" - const-string v4, "Discord-Android/1262" + const-string v4, "Discord-Android/1265" invoke-direct {v2, v3, v4}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V @@ -181,7 +181,7 @@ const/4 v1, 0x2 - const/16 v2, 0x4ee + const/16 v2, 0x4f1 invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -201,7 +201,7 @@ const-string v3, "client_version" - const-string v4, "41.01" + const-string v4, "40.4" invoke-direct {v2, v3, v4}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V diff --git a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerBroadcastAirplaneMode$1.smali b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerBroadcastAirplaneMode$1.smali index 5c7f846bdc..425b71f6c0 100644 --- a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerBroadcastAirplaneMode$1.smali +++ b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerBroadcastAirplaneMode$1.smali @@ -37,7 +37,7 @@ # virtual methods .method public onReceive(Landroid/content/Context;Landroid/content/Intent;)V - .locals 2 + .locals 6 const-string v0, "context" @@ -49,6 +49,24 @@ iget-object p2, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerBroadcastAirplaneMode$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor; + invoke-static {p2}, Lcom/discord/utilities/networking/NetworkMonitor;->access$getLogger$p(Lcom/discord/utilities/networking/NetworkMonitor;)Lcom/discord/utilities/logging/Logger; + + move-result-object v0 + + const-string v1, "[NetworkMonitor]" + + const-string v2, "Got airplane mode broadcast intent." + + const/4 v3, 0x0 + + const/4 v4, 0x4 + + const/4 v5, 0x0 + + invoke-static/range {v0 .. v5}, Lcom/discord/utilities/logging/Logger;->i$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V + + iget-object p2, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerBroadcastAirplaneMode$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor; + const/4 v0, 0x0 const/4 v1, 0x2 diff --git a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerBroadcastConnectivityNetworkMonitor$1.smali b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerBroadcastConnectivityNetworkMonitor$1.smali index aa1edcba69..045b37c79e 100644 --- a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerBroadcastConnectivityNetworkMonitor$1.smali +++ b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerBroadcastConnectivityNetworkMonitor$1.smali @@ -37,7 +37,7 @@ # virtual methods .method public onReceive(Landroid/content/Context;Landroid/content/Intent;)V - .locals 1 + .locals 7 const-string v0, "context" @@ -49,6 +49,24 @@ iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerBroadcastConnectivityNetworkMonitor$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor; + invoke-static {v0}, Lcom/discord/utilities/networking/NetworkMonitor;->access$getLogger$p(Lcom/discord/utilities/networking/NetworkMonitor;)Lcom/discord/utilities/logging/Logger; + + move-result-object v1 + + const-string v2, "[NetworkMonitor]" + + const-string v3, "Got connectivity action broadcast intent." + + const/4 v4, 0x0 + + const/4 v5, 0x4 + + const/4 v6, 0x0 + + invoke-static/range {v1 .. v6}, Lcom/discord/utilities/logging/Logger;->i$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V + + iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerBroadcastConnectivityNetworkMonitor$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor; + invoke-static {v0, p1, p2}, Lcom/discord/utilities/networking/NetworkMonitor;->access$updateNetworkState(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;Landroid/content/Intent;)V return-void diff --git a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1.smali b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1.smali index 0de5ff8d38..7143b27f7f 100644 --- a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1.smali +++ b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1.smali @@ -43,7 +43,7 @@ # virtual methods .method public onAvailable(Landroid/net/Network;)V - .locals 3 + .locals 6 const-string v0, "network" @@ -51,6 +51,24 @@ iget-object p1, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor; + invoke-static {p1}, Lcom/discord/utilities/networking/NetworkMonitor;->access$getLogger$p(Lcom/discord/utilities/networking/NetworkMonitor;)Lcom/discord/utilities/logging/Logger; + + move-result-object v0 + + const-string v1, "[NetworkMonitor]" + + const-string v2, "Network callback, onAvailable fired." + + const/4 v3, 0x0 + + const/4 v4, 0x4 + + const/4 v5, 0x0 + + invoke-static/range {v0 .. v5}, Lcom/discord/utilities/logging/Logger;->i$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V + + iget-object p1, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor; + iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->$context:Landroid/content/Context; const/4 v1, 0x0 @@ -63,7 +81,7 @@ .end method .method public onCapabilitiesChanged(Landroid/net/Network;Landroid/net/NetworkCapabilities;)V - .locals 2 + .locals 6 const-string v0, "network" @@ -75,6 +93,24 @@ iget-object p1, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor; + invoke-static {p1}, Lcom/discord/utilities/networking/NetworkMonitor;->access$getLogger$p(Lcom/discord/utilities/networking/NetworkMonitor;)Lcom/discord/utilities/logging/Logger; + + move-result-object v0 + + const-string v1, "[NetworkMonitor]" + + const-string v2, "Network callback, onCapabilitiesChanged fired." + + const/4 v3, 0x0 + + const/4 v4, 0x4 + + const/4 v5, 0x0 + + invoke-static/range {v0 .. v5}, Lcom/discord/utilities/logging/Logger;->i$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V + + iget-object p1, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor; + iget-object p2, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->$context:Landroid/content/Context; const/4 v0, 0x0 @@ -87,7 +123,7 @@ .end method .method public onLost(Landroid/net/Network;)V - .locals 3 + .locals 6 const-string v0, "network" @@ -95,6 +131,24 @@ iget-object p1, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor; + invoke-static {p1}, Lcom/discord/utilities/networking/NetworkMonitor;->access$getLogger$p(Lcom/discord/utilities/networking/NetworkMonitor;)Lcom/discord/utilities/logging/Logger; + + move-result-object v0 + + const-string v1, "[NetworkMonitor]" + + const-string v2, "Network callback, onLost fired." + + const/4 v3, 0x0 + + const/4 v4, 0x4 + + const/4 v5, 0x0 + + invoke-static/range {v0 .. v5}, Lcom/discord/utilities/logging/Logger;->i$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V + + iget-object p1, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor; + iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->$context:Landroid/content/Context; const/4 v1, 0x0 @@ -107,7 +161,25 @@ .end method .method public onUnavailable()V - .locals 4 + .locals 7 + + iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor; + + invoke-static {v0}, Lcom/discord/utilities/networking/NetworkMonitor;->access$getLogger$p(Lcom/discord/utilities/networking/NetworkMonitor;)Lcom/discord/utilities/logging/Logger; + + move-result-object v1 + + const-string v2, "[NetworkMonitor]" + + const-string v3, "Network callback, onUnavailable fired." + + const/4 v4, 0x0 + + const/4 v5, 0x4 + + const/4 v6, 0x0 + + invoke-static/range {v1 .. v6}, Lcom/discord/utilities/logging/Logger;->i$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor; diff --git a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor.smali b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor.smali index f707d1a71e..9cb29f6bfb 100644 --- a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor.smali +++ b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor.smali @@ -12,6 +12,8 @@ # instance fields +.field public logger:Lcom/discord/utilities/logging/Logger; + .field public final networkStateSubject:Lrx/subjects/BehaviorSubject; .annotation system Ldalvik/annotation/Signature; value = { @@ -24,34 +26,56 @@ # direct methods -.method public constructor (Landroid/content/Context;)V - .locals 2 +.method public constructor (Landroid/content/Context;Lcom/discord/utilities/logging/Logger;)V + .locals 1 const-string v0, "context" invoke-static {p1, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + const-string v0, "logger" + + invoke-static {p2, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + invoke-direct {p0}, Ljava/lang/Object;->()V - const/4 v0, 0x0 + iput-object p2, p0, Lcom/discord/utilities/networking/NetworkMonitor;->logger:Lcom/discord/utilities/logging/Logger; - const/4 v1, 0x2 + const/4 p2, 0x0 - invoke-static {p0, p1, v0, v1, v0}, Lcom/discord/utilities/networking/NetworkMonitor;->getState$default(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;Landroid/content/Intent;ILjava/lang/Object;)Lcom/discord/utilities/networking/NetworkMonitor$State; + const/4 v0, 0x2 - move-result-object v0 + invoke-static {p0, p1, p2, v0, p2}, Lcom/discord/utilities/networking/NetworkMonitor;->getState$default(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;Landroid/content/Intent;ILjava/lang/Object;)Lcom/discord/utilities/networking/NetworkMonitor$State; - invoke-static {v0}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject; + move-result-object p2 - move-result-object v0 + invoke-static {p2}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject; - iput-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor;->networkStateSubject:Lrx/subjects/BehaviorSubject; + move-result-object p2 + + iput-object p2, p0, Lcom/discord/utilities/networking/NetworkMonitor;->networkStateSubject:Lrx/subjects/BehaviorSubject; invoke-direct {p0, p1}, Lcom/discord/utilities/networking/NetworkMonitor;->registerConnectivityNetworkMonitor(Landroid/content/Context;)V return-void .end method +.method public static final synthetic access$getLogger$p(Lcom/discord/utilities/networking/NetworkMonitor;)Lcom/discord/utilities/logging/Logger; + .locals 0 + + iget-object p0, p0, Lcom/discord/utilities/networking/NetworkMonitor;->logger:Lcom/discord/utilities/logging/Logger; + + return-object p0 +.end method + +.method public static final synthetic access$setLogger$p(Lcom/discord/utilities/networking/NetworkMonitor;Lcom/discord/utilities/logging/Logger;)V + .locals 0 + + iput-object p1, p0, Lcom/discord/utilities/networking/NetworkMonitor;->logger:Lcom/discord/utilities/logging/Logger; + + return-void +.end method + .method public static final synthetic access$updateNetworkState(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;Landroid/content/Intent;)V .locals 0 @@ -61,7 +85,7 @@ .end method .method private final getState(Landroid/content/Context;Landroid/content/Intent;)Lcom/discord/utilities/networking/NetworkMonitor$State; - .locals 1 + .locals 6 sget-object v0, Lcom/discord/utilities/io/NetworkUtils;->INSTANCE:Lcom/discord/utilities/io/NetworkUtils; @@ -92,6 +116,32 @@ sget-object p1, Lcom/discord/utilities/networking/NetworkMonitor$State;->OFFLINE:Lcom/discord/utilities/networking/NetworkMonitor$State; :goto_0 + iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor;->logger:Lcom/discord/utilities/logging/Logger; + + new-instance p2, Ljava/lang/StringBuilder; + + invoke-direct {p2}, Ljava/lang/StringBuilder;->()V + + const-string v1, "Updating network state to " + + invoke-virtual {p2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + + invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + + move-result-object v2 + + const/4 v3, 0x0 + + const/4 v4, 0x4 + + const/4 v5, 0x0 + + const-string v1, "[NetworkMonitor]" + + invoke-static/range {v0 .. v5}, Lcom/discord/utilities/logging/Logger;->i$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V + return-object p1 .end method 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 da0186ea0f..a9137c45a5 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/1262" + const-string v0, "Discord-Android/1265" return-object v0 .end method diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel$Factory$create$1.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel$Factory$create$1.smali index a4a1da78c9..5fbc450c35 100644 --- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel$Factory$create$1.smali +++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel$Factory$create$1.smali @@ -85,7 +85,7 @@ invoke-static {p1, v1}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V - const-string v1, "trendingGifCategoryPreviewUrl" + const-string/jumbo v1, "trendingGifCategoryPreviewUrl" invoke-static {p2, v1}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel$StoreState.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel$StoreState.smali index dd9b155685..a8b69108fc 100644 --- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel$StoreState.smali +++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel$StoreState.smali @@ -46,7 +46,7 @@ invoke-static {p1, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V - const-string v0, "trendingGifCategoryPreviewUrl" + const-string/jumbo v0, "trendingGifCategoryPreviewUrl" invoke-static {p2, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V @@ -127,7 +127,7 @@ invoke-static {p1, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V - const-string v0, "trendingGifCategoryPreviewUrl" + const-string/jumbo v0, "trendingGifCategoryPreviewUrl" invoke-static {p2, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$SearchResults.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$SearchResults.smali index 1177411cc6..bf0da4993f 100644 --- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$SearchResults.smali +++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$SearchResults.smali @@ -76,7 +76,7 @@ invoke-static {p2, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V - const-string v0, "trending" + const-string/jumbo v0, "trending" invoke-static {p3, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V @@ -219,7 +219,7 @@ invoke-static {p2, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V - const-string v0, "trending" + const-string/jumbo v0, "trending" invoke-static {p3, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$TrendingSearchTermsResults.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$TrendingSearchTermsResults.smali index b272225551..98e9b88076 100644 --- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$TrendingSearchTermsResults.smali +++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$TrendingSearchTermsResults.smali @@ -38,7 +38,7 @@ } .end annotation - const-string v0, "trending" + const-string/jumbo v0, "trending" invoke-static {p1, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V @@ -98,7 +98,7 @@ } .end annotation - const-string v0, "trending" + const-string/jumbo v0, "trending" invoke-static {p1, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage.smali index 31c2485939..cba39ec309 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage.smali @@ -645,7 +645,7 @@ .end method .method public synthetic e(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;Landroid/view/View;Ljava/lang/Integer;Lcom/discord/widgets/chat/list/entries/ChatListEntry;)V - .locals 0 + .locals 1 invoke-virtual {p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->getEventHandler()Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler; @@ -661,6 +661,24 @@ move-result-object p3 + iget-object p4, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->itemText:Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView; + + invoke-virtual {p4}, Landroidx/appcompat/widget/AppCompatTextView;->getText()Ljava/lang/CharSequence; + + move-result-object p4 + + invoke-interface {p4}, Ljava/lang/CharSequence;->length()I + + move-result p4 + + add-int/lit8 p4, p4, -0x1 + + const/4 v0, 0x0 + + invoke-interface {p3, v0, p4}, Ljava/lang/CharSequence;->subSequence(II)Ljava/lang/CharSequence; + + move-result-object p3 + invoke-interface {p1, p2, p3}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;->onMessageLongClicked(Lcom/discord/models/domain/ModelMessage;Ljava/lang/CharSequence;)V return-void diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali index 799fce5062..8eff35c481 100644 --- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali +++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali @@ -446,7 +446,7 @@ new-array v2, v0, [Ljava/lang/Object; - const-string v4, "41.01" + const-string v4, "40.4" aput-object v4, v2, v3 diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali index 59b206ad7a..61193f08f9 100644 --- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali +++ b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali @@ -1902,7 +1902,7 @@ invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v0, " - 41.01 (1262)" + const-string v0, " - 40.4 (1265)" invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView2$configureUI$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView2$configureUI$1.smali index 45c030f202..ed153d24fe 100644 --- a/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView2$configureUI$1.smali +++ b/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView2$configureUI$1.smali @@ -8,7 +8,7 @@ # annotations .annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->configureUI(Lcom/discord/widgets/voice/model/CallModel;Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;ZZZZZLkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;)V + value = Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->configureUI(Lcom/discord/widgets/voice/model/CallModel;Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;ZZZZZLkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V .end annotation .annotation system Ldalvik/annotation/InnerClass; diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView2$configureUI$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView2$configureUI$2.smali index b7998d164e..4094a57f44 100644 --- a/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView2$configureUI$2.smali +++ b/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView2$configureUI$2.smali @@ -8,7 +8,7 @@ # annotations .annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->configureUI(Lcom/discord/widgets/voice/model/CallModel;Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;ZZZZZLkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;)V + value = Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->configureUI(Lcom/discord/widgets/voice/model/CallModel;Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;ZZZZZLkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V .end annotation .annotation system Ldalvik/annotation/InnerClass; diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView2$configureUI$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView2$configureUI$3.smali index 223a687d6c..465f51eab1 100644 --- a/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView2$configureUI$3.smali +++ b/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView2$configureUI$3.smali @@ -8,7 +8,7 @@ # annotations .annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->configureUI(Lcom/discord/widgets/voice/model/CallModel;Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;ZZZZZLkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;)V + value = Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->configureUI(Lcom/discord/widgets/voice/model/CallModel;Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;ZZZZZLkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V .end annotation .annotation system Ldalvik/annotation/InnerClass; diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView2.smali index 01555ee093..84f92fdaab 100644 --- a/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView2.smali +++ b/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView2.smali @@ -1252,8 +1252,8 @@ # virtual methods -.method public final configureUI(Lcom/discord/widgets/voice/model/CallModel;Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;ZZZZZLkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;)V - .locals 16 +.method public final configureUI(Lcom/discord/widgets/voice/model/CallModel;Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;ZZZZZLkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V + .locals 15 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -1280,16 +1280,11 @@ ">;", "Lkotlin/jvm/functions/Function0<", "Lkotlin/Unit;", - ">;", - "Lkotlin/jvm/functions/Function1<", - "-", - "Ljava/lang/Boolean;", - "Lkotlin/Unit;", ">;)V" } .end annotation - move-object/from16 v0, p0 + move-object v0, p0 move-object/from16 v1, p1 @@ -1311,105 +1306,99 @@ move-object/from16 v10, p14 - move-object/from16 v11, p15 + const-string v11, "model" - const-string v12, "model" + invoke-static {v1, v11}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {v1, v12}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + const-string v11, "outputSelectorState" - const-string v12, "outputSelectorState" + invoke-static {v2, v11}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {v2, v12}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + const-string v11, "onStopWatchingClick" - const-string v12, "onStopWatchingClick" + invoke-static {v4, v11}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {v4, v12}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + const-string v11, "onDisconnectClick" - const-string v12, "onDisconnectClick" + invoke-static {v5, v11}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {v5, v12}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + const-string v11, "onAudioOutputClick" - const-string v12, "onAudioOutputClick" + invoke-static {v6, v11}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {v6, v12}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + const-string v11, "onVideoClick" - const-string v12, "onVideoClick" + invoke-static {v7, v11}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {v7, v12}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + const-string v11, "onMuteClick" - const-string v12, "onMuteClick" + invoke-static {v8, v11}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {v8, v12}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + const-string v11, "onInviteClick" - const-string v12, "onInviteClick" + invoke-static {v9, v11}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {v9, v12}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + const-string v11, "onScreenshareClick" - const-string v12, "onScreenshareClick" + invoke-static {v10, v11}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {v10, v12}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + invoke-direct {p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->getStopWatching()Landroid/view/View; - const-string v12, "onPttPress" + move-result-object v11 - invoke-static {v11, v12}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + const/16 v12, 0x8 - invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->getStopWatching()Landroid/view/View; - - move-result-object v12 - - const/16 v13, 0x8 - - const/4 v14, 0x0 + const/4 v13, 0x0 if-eqz p6, :cond_0 - const/4 v15, 0x0 + const/4 v14, 0x0 goto :goto_0 :cond_0 - const/16 v15, 0x8 + const/16 v14, 0x8 :goto_0 - invoke-virtual {v12, v15}, Landroid/view/View;->setVisibility(I)V + invoke-virtual {v11, v14}, Landroid/view/View;->setVisibility(I)V - invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->getStopWatching()Landroid/view/View; + invoke-direct {p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->getStopWatching()Landroid/view/View; - move-result-object v12 + move-result-object v11 - new-instance v15, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2$configureUI$1; + new-instance v14, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2$configureUI$1; - invoke-direct {v15, v4}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2$configureUI$1;->(Lkotlin/jvm/functions/Function0;)V + invoke-direct {v14, v4}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2$configureUI$1;->(Lkotlin/jvm/functions/Function0;)V - invoke-virtual {v12, v15}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V + invoke-virtual {v11, v14}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V - invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->getDisconnect()Landroid/view/View; + invoke-direct {p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->getDisconnect()Landroid/view/View; move-result-object v4 if-eqz p7, :cond_1 - const/4 v12, 0x0 + const/4 v11, 0x0 goto :goto_1 :cond_1 - const/16 v12, 0x8 + const/16 v11, 0x8 :goto_1 - invoke-virtual {v4, v12}, Landroid/view/View;->setVisibility(I)V + invoke-virtual {v4, v11}, Landroid/view/View;->setVisibility(I)V - invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->getDisconnect()Landroid/view/View; + invoke-direct {p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->getDisconnect()Landroid/view/View; move-result-object v4 - new-instance v12, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2$configureUI$2; + new-instance v11, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2$configureUI$2; - invoke-direct {v12, v5}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2$configureUI$2;->(Lkotlin/jvm/functions/Function0;)V + invoke-direct {v11, v5}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2$configureUI$2;->(Lkotlin/jvm/functions/Function0;)V - invoke-virtual {v4, v12}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V + invoke-virtual {v4, v11}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V - invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->getPushToTalkButton()Landroid/widget/Button; + invoke-direct {p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->getPushToTalkButton()Landroid/widget/Button; move-result-object v4 @@ -1425,17 +1414,7 @@ :goto_2 invoke-virtual {v4, v5}, Landroid/view/View;->setVisibility(I)V - invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->getPushToTalkButton()Landroid/widget/Button; - - move-result-object v4 - - new-instance v5, Lcom/discord/utilities/press/OnPressListener; - - invoke-direct {v5, v11}, Lcom/discord/utilities/press/OnPressListener;->(Lkotlin/jvm/functions/Function1;)V - - invoke-virtual {v4, v5}, Landroid/widget/Button;->setOnTouchListener(Landroid/view/View$OnTouchListener;)V - - invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->getInviteSheetButton()Landroid/widget/TextView; + invoke-direct {p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->getInviteSheetButton()Landroid/widget/TextView; move-result-object v4 @@ -1481,12 +1460,12 @@ :goto_4 if-eqz v5, :cond_5 - const/4 v13, 0x0 + const/4 v12, 0x0 :cond_5 - invoke-virtual {v4, v13}, Landroid/view/View;->setVisibility(I)V + invoke-virtual {v4, v12}, Landroid/view/View;->setVisibility(I)V - invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->getInviteSheetButton()Landroid/widget/TextView; + invoke-direct {p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->getInviteSheetButton()Landroid/widget/TextView; move-result-object v4 @@ -1496,17 +1475,17 @@ invoke-virtual {v4, v5}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V - invoke-direct {v0, v1, v8}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->configureMuteButton(Lcom/discord/widgets/voice/model/CallModel;Lkotlin/jvm/functions/Function0;)V + invoke-direct {p0, v1, v8}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->configureMuteButton(Lcom/discord/widgets/voice/model/CallModel;Lkotlin/jvm/functions/Function0;)V xor-int/lit8 v4, v3, 0x1 - invoke-direct {v0, v2, v6, v4}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->configureOutputSelectors(Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;Lkotlin/jvm/functions/Function0;Z)V + invoke-direct {p0, v2, v6, v4}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->configureOutputSelectors(Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;Lkotlin/jvm/functions/Function0;Z)V move/from16 v2, p3 - invoke-direct {v0, v1, v7, v2}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->configureVideoButton(Lcom/discord/widgets/voice/model/CallModel;Lkotlin/jvm/functions/Function0;Z)V + invoke-direct {p0, v1, v7, v2}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->configureVideoButton(Lcom/discord/widgets/voice/model/CallModel;Lkotlin/jvm/functions/Function0;Z)V - invoke-direct {v0, v1, v10, v3}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->configureScreenshareButtons(Lcom/discord/widgets/voice/model/CallModel;Lkotlin/jvm/functions/Function0;Z)V + invoke-direct {p0, v1, v10, v3}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->configureScreenshareButtons(Lcom/discord/widgets/voice/model/CallModel;Lkotlin/jvm/functions/Function0;Z)V return-void .end method @@ -1586,3 +1565,19 @@ return-void .end method + +.method public final setOnPTTListener(Lcom/discord/utilities/press/OnPressListener;)V + .locals 1 + + const-string v0, "listener" + + invoke-static {p1, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-direct {p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->getPushToTalkButton()Landroid/widget/Button; + + move-result-object v0 + + invoke-virtual {v0, p1}, Landroid/widget/Button;->setOnTouchListener(Landroid/view/View$OnTouchListener;)V + + return-void +.end method diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$10.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$10.smali index 90ea78f597..5c723586c4 100644 --- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$10.smali +++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$10.smali @@ -1,5 +1,5 @@ -.class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$10; -.super Lk0/n/c/j; +.class public final synthetic Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$10; +.super Lk0/n/c/h; .source "WidgetCallFullscreen.kt" # interfaces @@ -12,13 +12,13 @@ .end annotation .annotation system Ldalvik/annotation/InnerClass; - accessFlags = 0x19 + accessFlags = 0x1019 name = null .end annotation .annotation system Ldalvik/annotation/Signature; value = { - "Lk0/n/c/j;", + "Lk0/n/c/h;", "Lkotlin/jvm/functions/Function0<", "Lkotlin/Unit;", ">;" @@ -26,23 +26,25 @@ .end annotation -# instance fields -.field public final synthetic $viewState:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid; - -.field public final synthetic this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen; - - # direct methods -.method public constructor (Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;)V - .locals 0 +.method public constructor (Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;)V + .locals 7 - iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$10;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen; + const-class v3, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel; - iput-object p2, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$10;->$viewState:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid; + const/4 v1, 0x0 - const/4 p1, 0x0 + const-string v4, "stopWatchingStream" - invoke-direct {p0, p1}, Lk0/n/c/j;->(I)V + const-string v5, "stopWatchingStream()V" + + const/4 v6, 0x0 + + move-object v0, p0 + + move-object v2, p1 + + invoke-direct/range {v0 .. v6}, Lk0/n/c/h;->(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V return-void .end method @@ -60,17 +62,13 @@ .end method .method public final invoke()V - .locals 2 + .locals 1 - iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$10;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen; + iget-object v0, p0, Lk0/n/c/b;->receiver:Ljava/lang/Object; - iget-object v1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$10;->$viewState:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid; + check-cast v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel; - invoke-virtual {v1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel; - - move-result-object v1 - - invoke-static {v0, v1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->access$onDisconnectClicked(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;Lcom/discord/widgets/voice/model/CallModel;)V + invoke-virtual {v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->stopWatchingStream()V return-void .end method diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$11.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$11.smali index 85a960fe0a..5f55a98a0e 100644 --- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$11.smali +++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$11.smali @@ -1,5 +1,5 @@ -.class public final synthetic Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$11; -.super Lk0/n/c/h; +.class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$11; +.super Lk0/n/c/j; .source "WidgetCallFullscreen.kt" # interfaces @@ -12,13 +12,13 @@ .end annotation .annotation system Ldalvik/annotation/InnerClass; - accessFlags = 0x1019 + accessFlags = 0x19 name = null .end annotation .annotation system Ldalvik/annotation/Signature; value = { - "Lk0/n/c/h;", + "Lk0/n/c/j;", "Lkotlin/jvm/functions/Function0<", "Lkotlin/Unit;", ">;" @@ -26,25 +26,19 @@ .end annotation +# instance fields +.field public final synthetic this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen; + + # direct methods -.method public constructor (Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;)V - .locals 7 +.method public constructor (Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V + .locals 0 - const-class v3, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel; + iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$11;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen; - const/4 v1, 0x0 + const/4 p1, 0x0 - const-string v4, "stopWatchingStream" - - const-string v5, "stopWatchingStream()V" - - const/4 v6, 0x0 - - move-object v0, p0 - - move-object v2, p1 - - invoke-direct/range {v0 .. v6}, Lk0/n/c/h;->(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V + invoke-direct {p0, p1}, Lk0/n/c/j;->(I)V return-void .end method @@ -62,13 +56,21 @@ .end method .method public final invoke()V - .locals 1 + .locals 3 - iget-object v0, p0, Lk0/n/c/b;->receiver:Ljava/lang/Object; + sget-object v0, Lf/a/a/d/a/a;->k:Lf/a/a/d/a/a$b; - check-cast v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel; + iget-object v1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$11;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen; - invoke-virtual {v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->stopWatchingStream()V + invoke-virtual {v1}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager; + + move-result-object v1 + + const-string v2, "parentFragmentManager" + + invoke-static {v1, v2}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v0, v1}, Lf/a/a/d/a/a$b;->a(Landroidx/fragment/app/FragmentManager;)V return-void .end method diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$13$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$12$1.smali similarity index 78% rename from com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$13$1.smali rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$12$1.smali index d2228ad380..3cd843bc5c 100644 --- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$13$1.smali +++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$12$1.smali @@ -1,4 +1,4 @@ -.class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$13$1; +.class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$12$1; .super Ljava/lang/Object; .source "WidgetCallFullscreen.kt" @@ -8,7 +8,7 @@ # annotations .annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$13;->invoke()V + value = Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$12;->invoke()V .end annotation .annotation system Ldalvik/annotation/InnerClass; @@ -18,14 +18,14 @@ # instance fields -.field public final synthetic this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$13; +.field public final synthetic this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$12; # direct methods -.method public constructor (Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$13;)V +.method public constructor (Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$12;)V .locals 0 - iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$13$1;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$13; + iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$12$1;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$12; invoke-direct {p0}, Ljava/lang/Object;->()V @@ -37,9 +37,9 @@ .method public final call()V .locals 1 - iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$13$1;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$13; + iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$12$1;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$12; - iget-object v0, v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$13;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen; + iget-object v0, v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$12;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen; invoke-static {v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->access$getViewModel$p(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel; diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$12.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$12.smali index 0d1f15c4e9..ead02c221c 100644 --- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$12.smali +++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$12.smali @@ -56,21 +56,15 @@ .end method .method public final invoke()V - .locals 3 + .locals 2 - sget-object v0, Lf/a/a/d/a/a;->k:Lf/a/a/d/a/a$b; + iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$12;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen; - iget-object v1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$12;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen; + new-instance v1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$12$1; - invoke-virtual {v1}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager; + invoke-direct {v1, p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$12$1;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$12;)V - move-result-object v1 - - const-string v2, "parentFragmentManager" - - invoke-static {v1, v2}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-virtual {v0, v1}, Lf/a/a/d/a/a$b;->a(Landroidx/fragment/app/FragmentManager;)V + invoke-virtual {v0, v1}, Lcom/discord/app/AppFragment;->requestVideoCallPermissions(Lrx/functions/Action0;)V return-void .end method diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$13.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$13.smali index ffe373fe58..b4efd99a94 100644 --- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$13.smali +++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$13.smali @@ -1,5 +1,5 @@ -.class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$13; -.super Lk0/n/c/j; +.class public final synthetic Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$13; +.super Lk0/n/c/h; .source "WidgetCallFullscreen.kt" # interfaces @@ -12,13 +12,13 @@ .end annotation .annotation system Ldalvik/annotation/InnerClass; - accessFlags = 0x19 + accessFlags = 0x1019 name = null .end annotation .annotation system Ldalvik/annotation/Signature; value = { - "Lk0/n/c/j;", + "Lk0/n/c/h;", "Lkotlin/jvm/functions/Function0<", "Lkotlin/Unit;", ">;" @@ -26,19 +26,25 @@ .end annotation -# instance fields -.field public final synthetic this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen; - - # direct methods -.method public constructor (Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V - .locals 0 +.method public constructor (Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;)V + .locals 7 - iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$13;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen; + const-class v3, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel; - const/4 p1, 0x0 + const/4 v1, 0x0 - invoke-direct {p0, p1}, Lk0/n/c/j;->(I)V + const-string v4, "onMuteClicked" + + const-string v5, "onMuteClicked()V" + + const/4 v6, 0x0 + + move-object v0, p0 + + move-object v2, p1 + + invoke-direct/range {v0 .. v6}, Lk0/n/c/h;->(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V return-void .end method @@ -56,15 +62,13 @@ .end method .method public final invoke()V - .locals 2 + .locals 1 - iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$13;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen; + iget-object v0, p0, Lk0/n/c/b;->receiver:Ljava/lang/Object; - new-instance v1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$13$1; + check-cast v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel; - invoke-direct {v1, p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$13$1;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$13;)V - - invoke-virtual {v0, v1}, Lcom/discord/app/AppFragment;->requestVideoCallPermissions(Lrx/functions/Action0;)V + invoke-virtual {v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->onMuteClicked()V return-void .end method diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$14.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$14.smali deleted file mode 100644 index 37388db959..0000000000 --- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$14.smali +++ /dev/null @@ -1,74 +0,0 @@ -.class public final synthetic Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$14; -.super Lk0/n/c/h; -.source "WidgetCallFullscreen.kt" - -# interfaces -.implements Lkotlin/jvm/functions/Function0; - - -# annotations -.annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->configureBottomControls(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;)V -.end annotation - -.annotation system Ldalvik/annotation/InnerClass; - accessFlags = 0x1019 - name = null -.end annotation - -.annotation system Ldalvik/annotation/Signature; - value = { - "Lk0/n/c/h;", - "Lkotlin/jvm/functions/Function0<", - "Lkotlin/Unit;", - ">;" - } -.end annotation - - -# direct methods -.method public constructor (Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;)V - .locals 7 - - const-class v3, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel; - - const/4 v1, 0x0 - - const-string v4, "onMuteClicked" - - const-string v5, "onMuteClicked()V" - - const/4 v6, 0x0 - - move-object v0, p0 - - move-object v2, p1 - - invoke-direct/range {v0 .. v6}, Lk0/n/c/h;->(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V - - return-void -.end method - - -# virtual methods -.method public bridge synthetic invoke()Ljava/lang/Object; - .locals 1 - - invoke-virtual {p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$14;->invoke()V - - sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit; - - return-object v0 -.end method - -.method public final invoke()V - .locals 1 - - iget-object v0, p0, Lk0/n/c/b;->receiver:Ljava/lang/Object; - - check-cast v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel; - - invoke-virtual {v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->onMuteClicked()V - - return-void -.end method diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$9.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$9.smali new file mode 100644 index 0000000000..07895b4bed --- /dev/null +++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$9.smali @@ -0,0 +1,76 @@ +.class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$9; +.super Lk0/n/c/j; +.source "WidgetCallFullscreen.kt" + +# interfaces +.implements Lkotlin/jvm/functions/Function0; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->configureBottomControls(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;)V +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x19 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "Lk0/n/c/j;", + "Lkotlin/jvm/functions/Function0<", + "Lkotlin/Unit;", + ">;" + } +.end annotation + + +# instance fields +.field public final synthetic $viewState:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid; + +.field public final synthetic this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen; + + +# direct methods +.method public constructor (Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;)V + .locals 0 + + iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$9;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen; + + iput-object p2, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$9;->$viewState:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid; + + const/4 p1, 0x0 + + invoke-direct {p0, p1}, Lk0/n/c/j;->(I)V + + return-void +.end method + + +# virtual methods +.method public bridge synthetic invoke()Ljava/lang/Object; + .locals 1 + + invoke-virtual {p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$9;->invoke()V + + sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit; + + return-object v0 +.end method + +.method public final invoke()V + .locals 2 + + iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$9;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen; + + iget-object v1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$9;->$viewState:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid; + + invoke-virtual {v1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel; + + move-result-object v1 + + invoke-static {v0, v1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->access$onDisconnectClicked(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;Lcom/discord/widgets/voice/model/CallModel;)V + + return-void +.end method diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$8.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBound$listener$1.smali similarity index 89% rename from com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$8.smali rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBound$listener$1.smali index f9c1488372..5ec459c1e9 100644 --- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$8.smali +++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBound$listener$1.smali @@ -1,4 +1,4 @@ -.class public final synthetic Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$8; +.class public final synthetic Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBound$listener$1; .super Lk0/n/c/h; .source "WidgetCallFullscreen.kt" @@ -8,7 +8,7 @@ # annotations .annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->configureBottomControls(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;)V + value = Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->onViewBound(Landroid/view/View;)V .end annotation .annotation system Ldalvik/annotation/InnerClass; @@ -61,7 +61,7 @@ move-result p1 - invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$8;->invoke(Z)V + invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBound$listener$1;->invoke(Z)V sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit; diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen.smali index e4a5b6bf84..bb6cf0063c 100644 --- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen.smali +++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen.smali @@ -688,7 +688,7 @@ .end method .method private final configureBottomControls(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;)V - .locals 24 + .locals 22 move-object/from16 v0, p0 @@ -823,19 +823,7 @@ invoke-direct {v6, v0, v1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$7;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;)V - new-instance v1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$8; - - move-object/from16 v17, v14 - - iget-object v14, v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->viewModel:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel; - - const-string v23, "viewModel" - - if-eqz v14, :cond_e - - invoke-direct {v1, v14}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$8;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;)V - - move-object/from16 v18, v17 + move-object/from16 v18, v14 move/from16 v14, v16 @@ -849,147 +837,145 @@ move-object/from16 v21, v3 - move-object/from16 v22, v1 - - invoke-virtual/range {v7 .. v22}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->configureUI(Lcom/discord/widgets/voice/model/CallModel;Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;ZZZZZLkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;)V + invoke-virtual/range {v7 .. v21}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->configureUI(Lcom/discord/widgets/voice/model/CallModel;Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;ZZZZZLkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getFloatingControlsExperimental()Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2; - move-result-object v1 + move-result-object v2 - invoke-static {v1}, Landroidx/core/view/ViewCompat;->isLaidOut(Landroid/view/View;)Z + invoke-static {v2}, Landroidx/core/view/ViewCompat;->isLaidOut(Landroid/view/View;)Z - move-result v2 + move-result v3 - if-eqz v2, :cond_4 + if-eqz v3, :cond_4 - invoke-virtual {v1}, Landroid/view/View;->isLayoutRequested()Z + invoke-virtual {v2}, Landroid/view/View;->isLayoutRequested()Z - move-result v2 + move-result v3 - if-nez v2, :cond_4 + if-nez v3, :cond_4 invoke-static/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->access$getBottomSheetBehavior$p(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)Lcom/google/android/material/bottomsheet/BottomSheetBehavior; - move-result-object v1 + move-result-object v2 invoke-static/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->access$getFloatingControlsExperimental$p(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2; - move-result-object v2 + move-result-object v3 - invoke-virtual {v2}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->getPeekHeight()I + invoke-virtual {v3}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->getPeekHeight()I - move-result v2 + move-result v3 - invoke-virtual {v1, v2}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setPeekHeight(I)V + invoke-virtual {v2, v3}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setPeekHeight(I)V goto :goto_3 :cond_4 - new-instance v2, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$$inlined$doOnLayout$1; + new-instance v3, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$$inlined$doOnLayout$1; - invoke-direct {v2, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$$inlined$doOnLayout$1;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V + invoke-direct {v3, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$$inlined$doOnLayout$1;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V - invoke-virtual {v1, v2}, Landroid/view/View;->addOnLayoutChangeListener(Landroid/view/View$OnLayoutChangeListener;)V + invoke-virtual {v2, v3}, Landroid/view/View;->addOnLayoutChangeListener(Landroid/view/View$OnLayoutChangeListener;)V :goto_3 invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getFloatingControls()Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView; - move-result-object v1 + move-result-object v2 invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->getScreenshareEnabled()Z - move-result v2 + move-result v3 - const/4 v3, 0x1 + const/4 v4, 0x1 - xor-int/2addr v2, v3 + xor-int/2addr v3, v4 - const/16 v3, 0x8 + const/16 v4, 0x8 - if-eqz v2, :cond_5 + if-eqz v3, :cond_5 - const/4 v2, 0x0 + const/4 v3, 0x0 goto :goto_4 :cond_5 - const/16 v2, 0x8 + const/16 v3, 0x8 :goto_4 - invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V + invoke-virtual {v2, v3}, Landroid/view/View;->setVisibility(I)V invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getFloatingControls()Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView; - move-result-object v4 + move-result-object v5 invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel; - move-result-object v5 + move-result-object v6 invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->getOutputSelectorState()Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState; - move-result-object v6 + move-result-object v7 invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->getCameraState()Lcom/discord/widgets/voice/model/CameraState; - move-result-object v1 + move-result-object v2 - sget-object v2, Lcom/discord/widgets/voice/model/CameraState;->CAMERA_DISABLED:Lcom/discord/widgets/voice/model/CameraState; + sget-object v3, Lcom/discord/widgets/voice/model/CameraState;->CAMERA_DISABLED:Lcom/discord/widgets/voice/model/CameraState; - if-eq v1, v2, :cond_6 + if-eq v2, v3, :cond_6 - const/4 v7, 0x1 + const/4 v8, 0x1 goto :goto_5 :cond_6 - const/4 v7, 0x0 + const/4 v8, 0x0 :goto_5 + new-instance v12, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$9; + + invoke-direct {v12, v0, v1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$9;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;)V + new-instance v11, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$10; - move-object/from16 v1, p1 - - invoke-direct {v11, v0, v1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$10;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;)V - - new-instance v10, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$11; - iget-object v2, v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->viewModel:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel; + const-string v3, "viewModel" + if-eqz v2, :cond_d - invoke-direct {v10, v2}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$11;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;)V + invoke-direct {v11, v2}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$10;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;)V - new-instance v12, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$12; + new-instance v13, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$11; - invoke-direct {v12, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$12;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V + invoke-direct {v13, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$11;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V - new-instance v13, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$13; + new-instance v14, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$12; - invoke-direct {v13, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$13;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V + invoke-direct {v14, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$12;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->isStreamFocused()Z move-result v2 - const/4 v15, 0x1 + const/16 v16, 0x1 - xor-int/lit8 v9, v2, 0x1 + xor-int/lit8 v10, v2, 0x1 invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->isStreamFocused()Z - move-result v8 + move-result v9 - new-instance v14, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$14; + new-instance v15, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$13; iget-object v2, v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->viewModel:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel; if-eqz v2, :cond_c - invoke-direct {v14, v2}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$14;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;)V + invoke-direct {v15, v2}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$13;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;)V - invoke-virtual/range {v4 .. v14}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;->configureUI(Lcom/discord/widgets/voice/model/CallModel;Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;ZZZLkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V + invoke-virtual/range {v5 .. v15}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;->configureUI(Lcom/discord/widgets/voice/model/CallModel;Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;ZZZLkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->isVideoCallGridVisible()Z @@ -1001,7 +987,7 @@ move-result v2 - const-wide/16 v4, 0xc8 + const-wide/16 v5, 0xc8 if-eqz v2, :cond_7 @@ -1011,9 +997,9 @@ invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->isShowingControls()Z - move-result v6 + move-result v3 - invoke-static {v2, v6, v4, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeBy(Landroid/view/View;ZJ)V + invoke-static {v2, v3, v5, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeBy(Landroid/view/View;ZJ)V goto :goto_6 @@ -1024,9 +1010,9 @@ invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->isShowingControls()Z - move-result v6 + move-result v3 - invoke-static {v2, v6, v4, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeBy(Landroid/view/View;ZJ)V + invoke-static {v2, v3, v5, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeBy(Landroid/view/View;ZJ)V goto :goto_6 @@ -1041,9 +1027,9 @@ move-result-object v2 - const/high16 v4, 0x3f800000 # 1.0f + const/high16 v3, 0x3f800000 # 1.0f - invoke-virtual {v2, v4}, Landroid/widget/FrameLayout;->setAlpha(F)V + invoke-virtual {v2, v3}, Landroid/widget/FrameLayout;->setAlpha(F)V invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getFloatingControlsExperimental()Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2; @@ -1055,7 +1041,7 @@ move-result-object v2 - invoke-virtual {v2, v4}, Landroid/widget/LinearLayout;->setAlpha(F)V + invoke-virtual {v2, v3}, Landroid/widget/LinearLayout;->setAlpha(F)V :goto_6 invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getPushToTalkButton()Landroid/widget/Button; @@ -1111,7 +1097,7 @@ return-void :cond_c - invoke-static/range {v23 .. v23}, Lk0/n/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V + invoke-static {v3}, Lk0/n/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V const/4 v1, 0x0 @@ -1120,14 +1106,7 @@ :cond_d const/4 v1, 0x0 - invoke-static/range {v23 .. v23}, Lk0/n/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V - - throw v1 - - :cond_e - const/4 v1, 0x0 - - invoke-static/range {v23 .. v23}, Lk0/n/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V + invoke-static {v3}, Lk0/n/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V throw v1 .end method @@ -3259,7 +3238,7 @@ const-string v0, "bottomSheetBehavior" - if-eqz p1, :cond_2 + if-eqz p1, :cond_3 const/4 v1, 0x1 @@ -3267,13 +3246,13 @@ iget-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->bottomSheetBehavior:Lcom/google/android/material/bottomsheet/BottomSheetBehavior; - if-eqz p1, :cond_1 + if-eqz p1, :cond_2 invoke-virtual {p1, v1}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setSaveFlags(I)V iget-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->bottomSheetBehavior:Lcom/google/android/material/bottomsheet/BottomSheetBehavior; - if-eqz p1, :cond_0 + if-eqz p1, :cond_1 new-instance v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBound$2; @@ -3281,10 +3260,36 @@ invoke-virtual {p1, v0}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->addBottomSheetCallback(Lcom/google/android/material/bottomsheet/BottomSheetBehavior$BottomSheetCallback;)V + new-instance p1, Lcom/discord/utilities/press/OnPressListener; + + new-instance v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBound$listener$1; + + iget-object v1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->viewModel:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel; + + if-eqz v1, :cond_0 + + invoke-direct {v0, v1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBound$listener$1;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;)V + + invoke-direct {p1, v0}, Lcom/discord/utilities/press/OnPressListener;->(Lkotlin/jvm/functions/Function1;)V + + invoke-direct {p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getPushToTalkButton()Landroid/widget/Button; + + move-result-object v0 + + invoke-virtual {v0, p1}, Landroid/widget/Button;->setOnTouchListener(Landroid/view/View$OnTouchListener;)V + + invoke-direct {p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getFloatingControlsExperimental()Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2; + + move-result-object v0 + + invoke-virtual {v0, p1}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->setOnPTTListener(Lcom/discord/utilities/press/OnPressListener;)V + return-void :cond_0 - invoke-static {v0}, Lk0/n/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V + const-string p1, "viewModel" + + invoke-static {p1}, Lk0/n/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V throw v4 @@ -3297,6 +3302,11 @@ invoke-static {v0}, Lk0/n/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V throw v4 + + :cond_3 + invoke-static {v0}, Lk0/n/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V + + throw v4 .end method .method public onViewBoundOrOnResume()V