From d69cc8103dbb9c51c50a2a93a444f3cb0d3c5f35 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 15 Sep 2020 00:38:36 +0000 Subject: [PATCH] Changes of com.discord v1265 --- com.discord/apktool.yml | 6 +- com.discord/original/AndroidManifest.xml | Bin 39520 -> 39516 bytes .../drawable-xhdpi/bg_cloud_pattern_dark.png | Bin 5073 -> 5073 bytes .../bg_cloud_pattern_light.png | Bin 11398 -> 11412 bytes .../res/layout-v22/view_upload_progress.xml | 2 +- .../res/layout/view_upload_progress.xml | 2 +- com.discord/res/values/strings.xml | 2 +- .../smali/com/discord/BuildConfig.smali | 6 +- .../models/domain/emoji/EmojiCategory.smali | 2 +- .../stores/SlowTtiExperimentManagerKt.smali | 88 +++++---- .../discord/stores/StoreClientVersion.smali | 2 +- .../stores/StoreStream$deferredInit$1.smali | 4 +- .../analytics/AnalyticSuperProperties.smali | 6 +- ...itor$registerBroadcastAirplaneMode$1.smali | 20 +- ...roadcastConnectivityNetworkMonitor$1.smali | 20 +- ...vityNetworkMonitor$networkCallback$1.smali | 80 +++++++- .../utilities/networking/NetworkMonitor.smali | 70 ++++++- .../rest/RestAPI$AppHeadersProvider.smali | 2 +- .../GifPickerViewModel$Factory$create$1.smali | 2 +- .../GifPickerViewModel$StoreState.smali | 4 +- ...chViewModel$StoreState$SearchResults.smali | 4 +- ...toreState$TrendingSearchTermsResults.smali | 4 +- .../WidgetChatListAdapterItemMessage.smali | 20 +- .../widgets/debugging/WidgetFatalCrash.smali | 2 +- .../widgets/settings/WidgetSettings.smali | 2 +- ...tingVoiceControlsView2$configureUI$1.smali | 2 +- ...tingVoiceControlsView2$configureUI$2.smali | 2 +- ...tingVoiceControlsView2$configureUI$3.smali | 2 +- .../controls/FloatingVoiceControlsView2.smali | 137 +++++++------ ...ullscreen$configureBottomControls$10.smali | 46 +++-- ...ullscreen$configureBottomControls$11.smali | 48 ++--- ...screen$configureBottomControls$12$1.smali} | 14 +- ...ullscreen$configureBottomControls$12.smali | 16 +- ...ullscreen$configureBottomControls$13.smali | 42 ++-- ...ullscreen$configureBottomControls$14.smali | 74 ------- ...Fullscreen$configureBottomControls$9.smali | 76 ++++++++ ...llFullscreen$onViewBound$listener$1.smali} | 6 +- .../fullscreen/WidgetCallFullscreen.smali | 184 +++++++++--------- 38 files changed, 600 insertions(+), 399 deletions(-) rename com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/{WidgetCallFullscreen$configureBottomControls$13$1.smali => WidgetCallFullscreen$configureBottomControls$12$1.smali} (78%) delete mode 100644 com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$14.smali create mode 100644 com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$9.smali rename com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/{WidgetCallFullscreen$configureBottomControls$8.smali => WidgetCallFullscreen$onViewBound$listener$1.smali} (89%) 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 9a1df9353e7620b4e50d6c80539432ec345f68a5..aaae59f1ab9cc1a8210bdc577381c525547a0184 100644 GIT binary patch delta 747 zcmWO4Pe_w-9LMqZ=CEnaOjoU?wf@;ZTWgt_=?)p#9LBB)73M2JL4kVKatBxHyu5reUVMD#wq9-iOxeBtx?@;obZ!R5JNq>M2A(-5GJ zkvEarKz6bmR#jAZ8^qP6QN7i=(qR}@P6cHu;Dy$dtc3eoQer#Y)vO9?+yM{tQAM>z zJZoN|D(I;q%ZxX{ozSf@{ZP2tVU6jlLc8FGa{8<5HSkocYOOU?uN8{IZOyB4H{8^W zf_q?43yST9_v($oMl1^x`=BlkQ;P0~N7~Xr9eh`JJ@jcKwD~VfKMu^^Ef=$rY26nt&;|y zf|sg3ZGe8OtI=)Ma>hbh*VQCUYFRyJ;hnO*DZk-48)_=;i}QwRvB}LZxM?%YY3QOw zTl^;!zht=nX}A?u)Op!wdZwHf^h+gGw?Rq|^+anbs-~SZ4eijTYZ}tDmQ+wlWE@md jJsQk^D;qDb2+>4}Bu)7{mGv$8(JSFV;7@+M<7eN0FU5R! delta 749 zcmWO4OGs1!7>40@MmyQ)n2ly;qm|vJn~gS=*(gInhzp4!BqB;e#I;0(L<3P!BGE!3 zh87XhLL`cjh=>T02q};V+DJ%us8w+4b>xyiKxVm*;Q(94~42CqJMP;_YD=jM-fxDVhQ#styq!!g&0r&J->q_F+(4!IkQl!dZjp)0AZE#f+`lrh=c%~(#s}0p#1vPL})2i4G*EFuu zS{Trb>UY3L_13{^T@FTfLSsGTRl5rwX+!;S_^F--xS}DgDQJW$b*o=b^i8$9EvYwJ zQ)Um`)}&UI+6%*)Rieopea(3Y_Q7?1Qf9x6)pWoCZK&-ad{I$dhv22wG@5|E!v-IL z*NPoAKnv~}1&UsJIHK7^JtEgBSTJ=CrwXAj3bkIto13Gm{gL$CQ`J}Op=zujYvaVVfcI`6j~`fyzsmCKb)X^`~Uy| 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 0c20251da06d35df43e0ca99c76a31b4af27c207..ca5f430a9a9cb6b74d24763b16967d8d65f6dd4b 100644 GIT binary patch delta 179 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 delta 7529 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 - + \ 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