From 992e6ebb4564740333040ee99dd30a9d475898db Mon Sep 17 00:00:00 2001 From: root Date: Fri, 11 Sep 2020 23:28:29 +0000 Subject: [PATCH] Changes of com.discord v1259 --- com.discord/apktool.yml | 6 +- com.discord/original/AndroidManifest.xml | Bin 39500 -> 39500 bytes .../asset_nux_navigation_channels.png | Bin 6094 -> 6103 bytes .../drawable-xhdpi/img_boost_activated.png | Bin 7162 -> 7163 bytes .../drawable_circle_primary_900_alpha_60.xml | 5 - .../drawable_listitem_divider_left_padded.xml | 8 + .../floating_voice_controls_view_v2.xml | 10 +- .../res/layout-v22/widget_call_fullscreen.xml | 4 +- .../floating_voice_controls_view_v2.xml | 10 +- .../res/layout/widget_call_fullscreen.xml | 4 +- .../widget_private_call_controls_view.xml | 2 +- com.discord/res/values/public.xml | 94 ++--- com.discord/res/values/strings.xml | 2 +- .../smali/com/discord/BuildConfig.smali | 6 +- .../discord/stores/StoreClientVersion.smali | 2 +- .../stores/StoreUserTyping$get$1.smali | 2 +- .../com/discord/stores/StoreUserTyping.smali | 12 +- .../analytics/AnalyticSuperProperties.smali | 6 +- .../utilities/media/AppSoundManager.smali | 24 ++ .../utilities/premium/PremiumUtils.smali | 4 +- .../rest/RestAPI$AppHeadersProvider.smali | 2 +- .../utilities/spans/TypefaceSpanCompat.smali | 2 +- .../RingManager$IStoreStateGenerator.smali | 27 ++ .../voice/RingManager$StoreState.smali | 280 ++++++++++++++ ...reStateGenerator$observeStoreState$1.smali | 111 ++++++ .../RingManager$StoreStateGenerator.smali | 125 +++++++ .../RingManager$subscribeToStoreState$1.smali | 73 ++++ .../RingManager$subscribeToStoreState$2.smali | 76 ++++ .../RingManager$subscribeToStoreState$3.smali | 73 ++++ .../discord/utilities/voice/RingManager.smali | 344 ++++++++++++++++++ .../voice/VoiceEngineForegroundService.smali | 51 ++- .../com/discord/views/ChatActionItem.smali | 2 +- .../views/premium/AccountCreditView.smali | 4 +- ...tAdapter$WidgetCollapsedUserListItem.smali | 2 +- .../sticker/StickerPickerNfxManager.smali | 12 + .../list/WidgetChatListAdapterItemGift.smali | 2 +- .../WidgetChatListAdapterItemInvite.smali | 2 +- .../ChatTypingModel$Companion$get$1$1$1.smali | 2 +- .../chat/overlay/ChatTypingModel$Typing.smali | 4 +- .../chat/overlay/WidgetChatOverlay.smali | 4 +- .../widgets/debugging/WidgetFatalCrash.smali | 2 +- .../widgets/friends/NearbyManager.smali | 2 +- ...nviteShare$InviteSuggestionItem$User.smali | 2 +- .../GuildListViewHolder$GuildViewHolder.smali | 2 +- com.discord/smali/f/d/a/y/s.smali | 2 +- .../WidgetServerSettingsEditRole.smali | 4 +- .../widgets/settings/WidgetSettings.smali | 2 +- ...oiceControlsView$OutputSelectorState.smali | 28 +- .../controls/FloatingVoiceControlsView.smali | 20 +- .../controls/FloatingVoiceControlsView2.smali | 216 ++++++----- ...Fullscreen$configureBottomControls$6.smali | 14 +- .../fullscreen/WidgetCallFullscreen.smali | 279 +++++++------- .../com/lytefast/flexinput/R$d.smali | 94 +++-- 53 files changed, 1662 insertions(+), 404 deletions(-) delete mode 100644 com.discord/res/drawable/drawable_circle_primary_900_alpha_60.xml create mode 100644 com.discord/res/drawable/drawable_listitem_divider_left_padded.xml create mode 100644 com.discord/smali/com/discord/utilities/voice/RingManager$IStoreStateGenerator.smali create mode 100644 com.discord/smali/com/discord/utilities/voice/RingManager$StoreState.smali create mode 100644 com.discord/smali/com/discord/utilities/voice/RingManager$StoreStateGenerator$observeStoreState$1.smali create mode 100644 com.discord/smali/com/discord/utilities/voice/RingManager$StoreStateGenerator.smali create mode 100644 com.discord/smali/com/discord/utilities/voice/RingManager$subscribeToStoreState$1.smali create mode 100644 com.discord/smali/com/discord/utilities/voice/RingManager$subscribeToStoreState$2.smali create mode 100644 com.discord/smali/com/discord/utilities/voice/RingManager$subscribeToStoreState$3.smali create mode 100644 com.discord/smali/com/discord/utilities/voice/RingManager.smali diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index b7d3408d11..0fa0b61b8b 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-1258.apk +apkFileName: com.discord-1259.apk compressionType: false doNotCompress: - resources.arsc @@ -3109,5 +3109,5 @@ usesFramework: tag: null version: 2.4.2-83a459-SNAPSHOT versionInfo: - versionCode: '1258' - versionName: '40.03' + versionCode: '1259' + versionName: '40.04' diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index 21f882da2ee9fd0eacb1493db8bdc442a3c97079..db2cfd850c64eee8c4b2efbfd1af2dd882660d26 100644 GIT binary patch delta 23 fcmX@Jh3U)|rVR;Pj3%2CxzsHgUvKVoJ{$%Ba$pHo delta 23 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 G^Zx=$_k#lf literal 7162 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 - - - \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_listitem_divider_left_padded.xml b/com.discord/res/drawable/drawable_listitem_divider_left_padded.xml new file mode 100644 index 0000000000..ce19cfce78 --- /dev/null +++ b/com.discord/res/drawable/drawable_listitem_divider_left_padded.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout-v22/floating_voice_controls_view_v2.xml b/com.discord/res/layout-v22/floating_voice_controls_view_v2.xml index 905ad3782e..b4fec450fb 100644 --- a/com.discord/res/layout-v22/floating_voice_controls_view_v2.xml +++ b/com.discord/res/layout-v22/floating_voice_controls_view_v2.xml @@ -4,20 +4,20 @@ - + - + - + - - + + diff --git a/com.discord/res/layout-v22/widget_call_fullscreen.xml b/com.discord/res/layout-v22/widget_call_fullscreen.xml index dd363c2238..d337619f11 100644 --- a/com.discord/res/layout-v22/widget_call_fullscreen.xml +++ b/com.discord/res/layout-v22/widget_call_fullscreen.xml @@ -26,9 +26,9 @@ - + - + \ No newline at end of file diff --git a/com.discord/res/layout/floating_voice_controls_view_v2.xml b/com.discord/res/layout/floating_voice_controls_view_v2.xml index b4b31dd7b5..1a61855b2b 100644 --- a/com.discord/res/layout/floating_voice_controls_view_v2.xml +++ b/com.discord/res/layout/floating_voice_controls_view_v2.xml @@ -4,20 +4,20 @@ - + - + - + - - + + diff --git a/com.discord/res/layout/widget_call_fullscreen.xml b/com.discord/res/layout/widget_call_fullscreen.xml index 1a0bef4fb4..519db7e1e8 100644 --- a/com.discord/res/layout/widget_call_fullscreen.xml +++ b/com.discord/res/layout/widget_call_fullscreen.xml @@ -26,9 +26,9 @@ - + - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_private_call_controls_view.xml b/com.discord/res/layout/widget_private_call_controls_view.xml index 59297f3a12..5b838f7c97 100644 --- a/com.discord/res/layout/widget_private_call_controls_view.xml +++ b/com.discord/res/layout/widget_private_call_controls_view.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> - + diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml index 5c7d21bde8..855d74ae79 100644 --- a/com.discord/res/values/public.xml +++ b/com.discord/res/values/public.xml @@ -3105,45 +3105,45 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3809,13 +3809,13 @@ - - - - - - - + + + + + + + @@ -4153,7 +4153,7 @@ - + diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index 81e721861a..fac58a203f 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 - 3b9de323d48a4aca961790cd2928b5c4 + aacab6ed31a34b57a278a5dfe0dfeeef 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 960228adab..d3093fad84 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/1258" +.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1259" -.field public static final VERSION_CODE:I = 0x4ea +.field public static final VERSION_CODE:I = 0x4eb -.field public static final VERSION_NAME:Ljava/lang/String; = "40.03" +.field public static final VERSION_NAME:Ljava/lang/String; = "40.04" # direct methods diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali index 61750bba7c..b04846df07 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, 0x4ea + const/16 v0, 0x4eb iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I diff --git a/com.discord/smali/com/discord/stores/StoreUserTyping$get$1.smali b/com.discord/smali/com/discord/stores/StoreUserTyping$get$1.smali index dcf541aea8..930d9ed427 100644 --- a/com.discord/smali/com/discord/stores/StoreUserTyping$get$1.smali +++ b/com.discord/smali/com/discord/stores/StoreUserTyping$get$1.smali @@ -86,7 +86,7 @@ } .end annotation - const-string v0, "typingUsersByChannel" + const-string/jumbo v0, "typingUsersByChannel" invoke-static {p1, v0}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V diff --git a/com.discord/smali/com/discord/stores/StoreUserTyping.smali b/com.discord/smali/com/discord/stores/StoreUserTyping.smali index 7e8bfba9d3..459e138872 100644 --- a/com.discord/smali/com/discord/stores/StoreUserTyping.smali +++ b/com.discord/smali/com/discord/stores/StoreUserTyping.smali @@ -142,7 +142,7 @@ if-eqz v0, :cond_0 - const-string v1, "typingUsers[typing.channelId] ?: return" + const-string/jumbo v1, "typingUsers[typing.channelId] ?: return" invoke-static {v0, v1}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V @@ -196,7 +196,7 @@ move-result-object p1 - const-string p2, "typingUsersPublisher\n \u2026 .distinctUntilChanged()" + const-string/jumbo p2, "typingUsersPublisher\n \u2026 .distinctUntilChanged()" invoke-static {p1, p2}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V @@ -242,7 +242,7 @@ if-eqz p1, :cond_0 - const-string v2, "typingUsers[message.channelId] ?: return" + const-string/jumbo v2, "typingUsers[message.channelId] ?: return" invoke-static {p1, v2}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V @@ -273,7 +273,7 @@ move-object/from16 v0, p1 - const-string v1, "typing" + const-string/jumbo v1, "typing" invoke-static {v0, v1}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V @@ -392,7 +392,7 @@ const/16 v19, 0x0 - const-string v13, "typingRemove" + const-string/jumbo v13, "typingRemove" invoke-static/range {v11 .. v19}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V @@ -562,7 +562,7 @@ const/4 v12, 0x0 - const-string v6, "typingEvent" + const-string/jumbo v6, "typingEvent" invoke-static/range {v4 .. v12}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali index 20ce7e07df..18ffec0d0c 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/1258" + const-string v4, "Discord-Android/1259" 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, 0x4ea + const/16 v2, 0x4eb invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -201,7 +201,7 @@ const-string v3, "client_version" - const-string v4, "40.03" + const-string v4, "40.04" invoke-direct {v2, v3, v4}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V diff --git a/com.discord/smali/com/discord/utilities/media/AppSoundManager.smali b/com.discord/smali/com/discord/utilities/media/AppSoundManager.smali index 7e423ab611..ab4074a5f3 100644 --- a/com.discord/smali/com/discord/utilities/media/AppSoundManager.smali +++ b/com.discord/smali/com/discord/utilities/media/AppSoundManager.smali @@ -50,6 +50,30 @@ # virtual methods +.method public final isPlaying(Lcom/discord/utilities/media/AppSound;)Z + .locals 1 + + const-string v0, "sound" + + invoke-static {p1, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + + iget-object v0, p0, Lcom/discord/utilities/media/AppSoundManager;->soundPlayers:Ljava/util/Map; + + invoke-virtual {p1}, Lcom/discord/utilities/media/AppSound;->getResId()I + + move-result p1 + + invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + + move-result-object p1 + + invoke-interface {v0, p1}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z + + move-result p1 + + return p1 +.end method + .method public final play(Lcom/discord/utilities/media/AppSound;)V .locals 5 diff --git a/com.discord/smali/com/discord/utilities/premium/PremiumUtils.smali b/com.discord/smali/com/discord/utilities/premium/PremiumUtils.smali index 62ed0bfa75..190968de5c 100644 --- a/com.discord/smali/com/discord/utilities/premium/PremiumUtils.smali +++ b/com.discord/smali/com/discord/utilities/premium/PremiumUtils.smali @@ -274,12 +274,12 @@ goto :goto_2 :cond_2 - const p1, 0x7f080168 + const p1, 0x7f080167 goto :goto_2 :cond_3 - const p1, 0x7f080167 + const p1, 0x7f080166 :goto_2 return p1 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 1163a3e786..8602b719c5 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/1258" + const-string v0, "Discord-Android/1259" return-object v0 .end method diff --git a/com.discord/smali/com/discord/utilities/spans/TypefaceSpanCompat.smali b/com.discord/smali/com/discord/utilities/spans/TypefaceSpanCompat.smali index 995ff7736d..b37ad089d3 100644 --- a/com.discord/smali/com/discord/utilities/spans/TypefaceSpanCompat.smali +++ b/com.discord/smali/com/discord/utilities/spans/TypefaceSpanCompat.smali @@ -19,7 +19,7 @@ .method public constructor (Landroid/graphics/Typeface;)V .locals 1 - const-string v0, "typeface" + const-string/jumbo v0, "typeface" invoke-static {p1, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V diff --git a/com.discord/smali/com/discord/utilities/voice/RingManager$IStoreStateGenerator.smali b/com.discord/smali/com/discord/utilities/voice/RingManager$IStoreStateGenerator.smali new file mode 100644 index 0000000000..6cb63caade --- /dev/null +++ b/com.discord/smali/com/discord/utilities/voice/RingManager$IStoreStateGenerator.smali @@ -0,0 +1,27 @@ +.class public interface abstract Lcom/discord/utilities/voice/RingManager$IStoreStateGenerator; +.super Ljava/lang/Object; +.source "RingManager.kt" + + +# annotations +.annotation system Ldalvik/annotation/EnclosingClass; + value = Lcom/discord/utilities/voice/RingManager; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x609 + name = "IStoreStateGenerator" +.end annotation + + +# virtual methods +.method public abstract observeStoreState(J)Lrx/Observable; + .annotation system Ldalvik/annotation/Signature; + value = { + "(J)", + "Lrx/Observable<", + "Lcom/discord/utilities/voice/RingManager$StoreState;", + ">;" + } + .end annotation +.end method diff --git a/com.discord/smali/com/discord/utilities/voice/RingManager$StoreState.smali b/com.discord/smali/com/discord/utilities/voice/RingManager$StoreState.smali new file mode 100644 index 0000000000..d5f5355d4b --- /dev/null +++ b/com.discord/smali/com/discord/utilities/voice/RingManager$StoreState.smali @@ -0,0 +1,280 @@ +.class public final Lcom/discord/utilities/voice/RingManager$StoreState; +.super Ljava/lang/Object; +.source "RingManager.kt" + + +# annotations +.annotation system Ldalvik/annotation/EnclosingClass; + value = Lcom/discord/utilities/voice/RingManager; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x19 + name = "StoreState" +.end annotation + + +# instance fields +.field public final rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State; + +.field public final voiceParticipants:Ljava/util/Map; + .annotation system Ldalvik/annotation/Signature; + value = { + "Ljava/util/Map<", + "Ljava/lang/Long;", + "Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;", + ">;" + } + .end annotation +.end field + + +# direct methods +.method public constructor (Ljava/util/Map;Lcom/discord/rtcconnection/RtcConnection$State;)V + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;", + ">;", + "Lcom/discord/rtcconnection/RtcConnection$State;", + ")V" + } + .end annotation + + const-string/jumbo v0, "voiceParticipants" + + invoke-static {p1, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + + const-string v0, "rtcConnectionState" + + invoke-static {p2, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-direct {p0}, Ljava/lang/Object;->()V + + iput-object p1, p0, Lcom/discord/utilities/voice/RingManager$StoreState;->voiceParticipants:Ljava/util/Map; + + iput-object p2, p0, Lcom/discord/utilities/voice/RingManager$StoreState;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State; + + return-void +.end method + +.method public static synthetic copy$default(Lcom/discord/utilities/voice/RingManager$StoreState;Ljava/util/Map;Lcom/discord/rtcconnection/RtcConnection$State;ILjava/lang/Object;)Lcom/discord/utilities/voice/RingManager$StoreState; + .locals 0 + + and-int/lit8 p4, p3, 0x1 + + if-eqz p4, :cond_0 + + iget-object p1, p0, Lcom/discord/utilities/voice/RingManager$StoreState;->voiceParticipants:Ljava/util/Map; + + :cond_0 + and-int/lit8 p3, p3, 0x2 + + if-eqz p3, :cond_1 + + iget-object p2, p0, Lcom/discord/utilities/voice/RingManager$StoreState;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State; + + :cond_1 + invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/voice/RingManager$StoreState;->copy(Ljava/util/Map;Lcom/discord/rtcconnection/RtcConnection$State;)Lcom/discord/utilities/voice/RingManager$StoreState; + + move-result-object p0 + + return-object p0 +.end method + + +# virtual methods +.method public final component1()Ljava/util/Map; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;", + ">;" + } + .end annotation + + iget-object v0, p0, Lcom/discord/utilities/voice/RingManager$StoreState;->voiceParticipants:Ljava/util/Map; + + return-object v0 +.end method + +.method public final component2()Lcom/discord/rtcconnection/RtcConnection$State; + .locals 1 + + iget-object v0, p0, Lcom/discord/utilities/voice/RingManager$StoreState;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State; + + return-object v0 +.end method + +.method public final copy(Ljava/util/Map;Lcom/discord/rtcconnection/RtcConnection$State;)Lcom/discord/utilities/voice/RingManager$StoreState; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;", + ">;", + "Lcom/discord/rtcconnection/RtcConnection$State;", + ")", + "Lcom/discord/utilities/voice/RingManager$StoreState;" + } + .end annotation + + const-string/jumbo v0, "voiceParticipants" + + invoke-static {p1, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + + const-string v0, "rtcConnectionState" + + invoke-static {p2, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + + new-instance v0, Lcom/discord/utilities/voice/RingManager$StoreState; + + invoke-direct {v0, p1, p2}, Lcom/discord/utilities/voice/RingManager$StoreState;->(Ljava/util/Map;Lcom/discord/rtcconnection/RtcConnection$State;)V + + return-object v0 +.end method + +.method public equals(Ljava/lang/Object;)Z + .locals 2 + + if-eq p0, p1, :cond_1 + + instance-of v0, p1, Lcom/discord/utilities/voice/RingManager$StoreState; + + if-eqz v0, :cond_0 + + check-cast p1, Lcom/discord/utilities/voice/RingManager$StoreState; + + iget-object v0, p0, Lcom/discord/utilities/voice/RingManager$StoreState;->voiceParticipants:Ljava/util/Map; + + iget-object v1, p1, Lcom/discord/utilities/voice/RingManager$StoreState;->voiceParticipants:Ljava/util/Map; + + invoke-static {v0, v1}, Lk0/n/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z + + move-result v0 + + if-eqz v0, :cond_0 + + iget-object v0, p0, Lcom/discord/utilities/voice/RingManager$StoreState;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State; + + iget-object p1, p1, Lcom/discord/utilities/voice/RingManager$StoreState;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State; + + invoke-static {v0, p1}, Lk0/n/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z + + move-result p1 + + if-eqz p1, :cond_0 + + goto :goto_0 + + :cond_0 + const/4 p1, 0x0 + + return p1 + + :cond_1 + :goto_0 + const/4 p1, 0x1 + + return p1 +.end method + +.method public final getRtcConnectionState()Lcom/discord/rtcconnection/RtcConnection$State; + .locals 1 + + iget-object v0, p0, Lcom/discord/utilities/voice/RingManager$StoreState;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State; + + return-object v0 +.end method + +.method public final getVoiceParticipants()Ljava/util/Map; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;", + ">;" + } + .end annotation + + iget-object v0, p0, Lcom/discord/utilities/voice/RingManager$StoreState;->voiceParticipants:Ljava/util/Map; + + return-object v0 +.end method + +.method public hashCode()I + .locals 3 + + iget-object v0, p0, Lcom/discord/utilities/voice/RingManager$StoreState;->voiceParticipants:Ljava/util/Map; + + const/4 v1, 0x0 + + if-eqz v0, :cond_0 + + invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I + + move-result v0 + + goto :goto_0 + + :cond_0 + const/4 v0, 0x0 + + :goto_0 + mul-int/lit8 v0, v0, 0x1f + + iget-object v2, p0, Lcom/discord/utilities/voice/RingManager$StoreState;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State; + + if-eqz v2, :cond_1 + + invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I + + move-result v1 + + :cond_1 + add-int/2addr v0, v1 + + return v0 +.end method + +.method public toString()Ljava/lang/String; + .locals 2 + + const-string v0, "StoreState(voiceParticipants=" + + invoke-static {v0}, Lf/e/b/a/a;->E(Ljava/lang/String;)Ljava/lang/StringBuilder; + + move-result-object v0 + + iget-object v1, p0, Lcom/discord/utilities/voice/RingManager$StoreState;->voiceParticipants:Ljava/util/Map; + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + + const-string v1, ", rtcConnectionState=" + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + iget-object v1, p0, Lcom/discord/utilities/voice/RingManager$StoreState;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State; + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + + const-string v1, ")" + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + + move-result-object v0 + + return-object v0 +.end method diff --git a/com.discord/smali/com/discord/utilities/voice/RingManager$StoreStateGenerator$observeStoreState$1.smali b/com.discord/smali/com/discord/utilities/voice/RingManager$StoreStateGenerator$observeStoreState$1.smali new file mode 100644 index 0000000000..7fbc5aad78 --- /dev/null +++ b/com.discord/smali/com/discord/utilities/voice/RingManager$StoreStateGenerator$observeStoreState$1.smali @@ -0,0 +1,111 @@ +.class public final Lcom/discord/utilities/voice/RingManager$StoreStateGenerator$observeStoreState$1; +.super Ljava/lang/Object; +.source "RingManager.kt" + +# interfaces +.implements Lrx/functions/Func2; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/utilities/voice/RingManager$StoreStateGenerator;->observeStoreState(J)Lrx/Observable; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x19 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "", + "Ljava/lang/Object;", + "Lrx/functions/Func2<", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "+", + "Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;", + ">;", + "Lcom/discord/rtcconnection/RtcConnection$State;", + "Lcom/discord/utilities/voice/RingManager$StoreState;", + ">;" + } +.end annotation + + +# static fields +.field public static final INSTANCE:Lcom/discord/utilities/voice/RingManager$StoreStateGenerator$observeStoreState$1; + + +# direct methods +.method public static constructor ()V + .locals 1 + + new-instance v0, Lcom/discord/utilities/voice/RingManager$StoreStateGenerator$observeStoreState$1; + + invoke-direct {v0}, Lcom/discord/utilities/voice/RingManager$StoreStateGenerator$observeStoreState$1;->()V + + sput-object v0, Lcom/discord/utilities/voice/RingManager$StoreStateGenerator$observeStoreState$1;->INSTANCE:Lcom/discord/utilities/voice/RingManager$StoreStateGenerator$observeStoreState$1; + + return-void +.end method + +.method public constructor ()V + .locals 0 + + invoke-direct {p0}, Ljava/lang/Object;->()V + + return-void +.end method + + +# virtual methods +.method public final call(Ljava/util/Map;Lcom/discord/rtcconnection/RtcConnection$State;)Lcom/discord/utilities/voice/RingManager$StoreState; + .locals 2 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;", + ">;", + "Lcom/discord/rtcconnection/RtcConnection$State;", + ")", + "Lcom/discord/utilities/voice/RingManager$StoreState;" + } + .end annotation + + new-instance v0, Lcom/discord/utilities/voice/RingManager$StoreState; + + const-string/jumbo v1, "voiceParticipants" + + invoke-static {p1, v1}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + + const-string v1, "rtcConnectionState" + + invoke-static {p2, v1}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-direct {v0, p1, p2}, Lcom/discord/utilities/voice/RingManager$StoreState;->(Ljava/util/Map;Lcom/discord/rtcconnection/RtcConnection$State;)V + + return-object v0 +.end method + +.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 + + check-cast p1, Ljava/util/Map; + + check-cast p2, Lcom/discord/rtcconnection/RtcConnection$State; + + invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/voice/RingManager$StoreStateGenerator$observeStoreState$1;->call(Ljava/util/Map;Lcom/discord/rtcconnection/RtcConnection$State;)Lcom/discord/utilities/voice/RingManager$StoreState; + + move-result-object p1 + + return-object p1 +.end method diff --git a/com.discord/smali/com/discord/utilities/voice/RingManager$StoreStateGenerator.smali b/com.discord/smali/com/discord/utilities/voice/RingManager$StoreStateGenerator.smali new file mode 100644 index 0000000000..5e4593a7c4 --- /dev/null +++ b/com.discord/smali/com/discord/utilities/voice/RingManager$StoreStateGenerator.smali @@ -0,0 +1,125 @@ +.class public final Lcom/discord/utilities/voice/RingManager$StoreStateGenerator; +.super Ljava/lang/Object; +.source "RingManager.kt" + +# interfaces +.implements Lcom/discord/utilities/voice/RingManager$IStoreStateGenerator; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingClass; + value = Lcom/discord/utilities/voice/RingManager; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x19 + name = "StoreStateGenerator" +.end annotation + + +# instance fields +.field public final storeRtcConnection:Lcom/discord/stores/StoreRtcConnection; + +.field public final storeVoiceParticipants:Lcom/discord/stores/StoreVoiceParticipants; + + +# direct methods +.method public constructor ()V + .locals 2 + + const/4 v0, 0x0 + + const/4 v1, 0x3 + + invoke-direct {p0, v0, v0, v1, v0}, Lcom/discord/utilities/voice/RingManager$StoreStateGenerator;->(Lcom/discord/stores/StoreVoiceParticipants;Lcom/discord/stores/StoreRtcConnection;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + + return-void +.end method + +.method public constructor (Lcom/discord/stores/StoreVoiceParticipants;Lcom/discord/stores/StoreRtcConnection;)V + .locals 1 + + const-string v0, "storeVoiceParticipants" + + invoke-static {p1, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + + const-string v0, "storeRtcConnection" + + invoke-static {p2, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-direct {p0}, Ljava/lang/Object;->()V + + iput-object p1, p0, Lcom/discord/utilities/voice/RingManager$StoreStateGenerator;->storeVoiceParticipants:Lcom/discord/stores/StoreVoiceParticipants; + + iput-object p2, p0, Lcom/discord/utilities/voice/RingManager$StoreStateGenerator;->storeRtcConnection:Lcom/discord/stores/StoreRtcConnection; + + return-void +.end method + +.method public synthetic constructor (Lcom/discord/stores/StoreVoiceParticipants;Lcom/discord/stores/StoreRtcConnection;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + .locals 0 + + and-int/lit8 p4, p3, 0x1 + + if-eqz p4, :cond_0 + + sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion; + + invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getVoiceParticipants()Lcom/discord/stores/StoreVoiceParticipants; + + move-result-object p1 + + :cond_0 + and-int/lit8 p3, p3, 0x2 + + if-eqz p3, :cond_1 + + sget-object p2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion; + + invoke-virtual {p2}, Lcom/discord/stores/StoreStream$Companion;->getRtcConnection()Lcom/discord/stores/StoreRtcConnection; + + move-result-object p2 + + :cond_1 + invoke-direct {p0, p1, p2}, Lcom/discord/utilities/voice/RingManager$StoreStateGenerator;->(Lcom/discord/stores/StoreVoiceParticipants;Lcom/discord/stores/StoreRtcConnection;)V + + return-void +.end method + + +# virtual methods +.method public observeStoreState(J)Lrx/Observable; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "(J)", + "Lrx/Observable<", + "Lcom/discord/utilities/voice/RingManager$StoreState;", + ">;" + } + .end annotation + + iget-object v0, p0, Lcom/discord/utilities/voice/RingManager$StoreStateGenerator;->storeVoiceParticipants:Lcom/discord/stores/StoreVoiceParticipants; + + invoke-virtual {v0, p1, p2}, Lcom/discord/stores/StoreVoiceParticipants;->get(J)Lrx/Observable; + + move-result-object p1 + + iget-object p2, p0, Lcom/discord/utilities/voice/RingManager$StoreStateGenerator;->storeRtcConnection:Lcom/discord/stores/StoreRtcConnection; + + invoke-virtual {p2}, Lcom/discord/stores/StoreRtcConnection;->getConnectionState()Lrx/Observable; + + move-result-object p2 + + sget-object v0, Lcom/discord/utilities/voice/RingManager$StoreStateGenerator$observeStoreState$1;->INSTANCE:Lcom/discord/utilities/voice/RingManager$StoreStateGenerator$observeStoreState$1; + + invoke-static {p1, p2, v0}, Lrx/Observable;->j(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable; + + move-result-object p1 + + const-string p2, "Observable.combineLatest\u2026onState\n )\n }" + + invoke-static {p1, p2}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + + return-object p1 +.end method diff --git a/com.discord/smali/com/discord/utilities/voice/RingManager$subscribeToStoreState$1.smali b/com.discord/smali/com/discord/utilities/voice/RingManager$subscribeToStoreState$1.smali new file mode 100644 index 0000000000..5e61fc5891 --- /dev/null +++ b/com.discord/smali/com/discord/utilities/voice/RingManager$subscribeToStoreState$1.smali @@ -0,0 +1,73 @@ +.class public final Lcom/discord/utilities/voice/RingManager$subscribeToStoreState$1; +.super Lk0/n/c/j; +.source "RingManager.kt" + +# interfaces +.implements Lkotlin/jvm/functions/Function1; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/utilities/voice/RingManager;->subscribeToStoreState(J)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/Function1<", + "Lrx/Subscription;", + "Lkotlin/Unit;", + ">;" + } +.end annotation + + +# instance fields +.field public final synthetic this$0:Lcom/discord/utilities/voice/RingManager; + + +# direct methods +.method public constructor (Lcom/discord/utilities/voice/RingManager;)V + .locals 0 + + iput-object p1, p0, Lcom/discord/utilities/voice/RingManager$subscribeToStoreState$1;->this$0:Lcom/discord/utilities/voice/RingManager; + + const/4 p1, 0x1 + + invoke-direct {p0, p1}, Lk0/n/c/j;->(I)V + + return-void +.end method + + +# virtual methods +.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 + + check-cast p1, Lrx/Subscription; + + invoke-virtual {p0, p1}, Lcom/discord/utilities/voice/RingManager$subscribeToStoreState$1;->invoke(Lrx/Subscription;)V + + sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit; + + return-object p1 +.end method + +.method public final invoke(Lrx/Subscription;)V + .locals 1 + + const-string v0, "subscription" + + invoke-static {p1, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + + iget-object v0, p0, Lcom/discord/utilities/voice/RingManager$subscribeToStoreState$1;->this$0:Lcom/discord/utilities/voice/RingManager; + + invoke-static {v0, p1}, Lcom/discord/utilities/voice/RingManager;->access$setStoreStateSubscription$p(Lcom/discord/utilities/voice/RingManager;Lrx/Subscription;)V + + return-void +.end method diff --git a/com.discord/smali/com/discord/utilities/voice/RingManager$subscribeToStoreState$2.smali b/com.discord/smali/com/discord/utilities/voice/RingManager$subscribeToStoreState$2.smali new file mode 100644 index 0000000000..e301004817 --- /dev/null +++ b/com.discord/smali/com/discord/utilities/voice/RingManager$subscribeToStoreState$2.smali @@ -0,0 +1,76 @@ +.class public final Lcom/discord/utilities/voice/RingManager$subscribeToStoreState$2; +.super Lk0/n/c/j; +.source "RingManager.kt" + +# interfaces +.implements Lkotlin/jvm/functions/Function0; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/utilities/voice/RingManager;->subscribeToStoreState(J)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 this$0:Lcom/discord/utilities/voice/RingManager; + + +# direct methods +.method public constructor (Lcom/discord/utilities/voice/RingManager;)V + .locals 0 + + iput-object p1, p0, Lcom/discord/utilities/voice/RingManager$subscribeToStoreState$2;->this$0:Lcom/discord/utilities/voice/RingManager; + + 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/utilities/voice/RingManager$subscribeToStoreState$2;->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/utilities/voice/RingManager$subscribeToStoreState$2;->this$0:Lcom/discord/utilities/voice/RingManager; + + invoke-static {v0}, Lcom/discord/utilities/voice/RingManager;->access$getAppSoundManager$p(Lcom/discord/utilities/voice/RingManager;)Lcom/discord/utilities/media/AppSoundManager; + + move-result-object v0 + + sget-object v1, Lcom/discord/utilities/media/AppSound;->Companion:Lcom/discord/utilities/media/AppSound$Companion; + + invoke-virtual {v1}, Lcom/discord/utilities/media/AppSound$Companion;->getSOUND_CALL_CALLING()Lcom/discord/utilities/media/AppSound; + + move-result-object v1 + + invoke-virtual {v0, v1}, Lcom/discord/utilities/media/AppSoundManager;->stop(Lcom/discord/utilities/media/AppSound;)V + + return-void +.end method diff --git a/com.discord/smali/com/discord/utilities/voice/RingManager$subscribeToStoreState$3.smali b/com.discord/smali/com/discord/utilities/voice/RingManager$subscribeToStoreState$3.smali new file mode 100644 index 0000000000..3db86509ec --- /dev/null +++ b/com.discord/smali/com/discord/utilities/voice/RingManager$subscribeToStoreState$3.smali @@ -0,0 +1,73 @@ +.class public final Lcom/discord/utilities/voice/RingManager$subscribeToStoreState$3; +.super Lk0/n/c/j; +.source "RingManager.kt" + +# interfaces +.implements Lkotlin/jvm/functions/Function1; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/utilities/voice/RingManager;->subscribeToStoreState(J)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/Function1<", + "Lcom/discord/utilities/voice/RingManager$StoreState;", + "Lkotlin/Unit;", + ">;" + } +.end annotation + + +# instance fields +.field public final synthetic this$0:Lcom/discord/utilities/voice/RingManager; + + +# direct methods +.method public constructor (Lcom/discord/utilities/voice/RingManager;)V + .locals 0 + + iput-object p1, p0, Lcom/discord/utilities/voice/RingManager$subscribeToStoreState$3;->this$0:Lcom/discord/utilities/voice/RingManager; + + const/4 p1, 0x1 + + invoke-direct {p0, p1}, Lk0/n/c/j;->(I)V + + return-void +.end method + + +# virtual methods +.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 + + check-cast p1, Lcom/discord/utilities/voice/RingManager$StoreState; + + invoke-virtual {p0, p1}, Lcom/discord/utilities/voice/RingManager$subscribeToStoreState$3;->invoke(Lcom/discord/utilities/voice/RingManager$StoreState;)V + + sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit; + + return-object p1 +.end method + +.method public final invoke(Lcom/discord/utilities/voice/RingManager$StoreState;)V + .locals 2 + + iget-object v0, p0, Lcom/discord/utilities/voice/RingManager$subscribeToStoreState$3;->this$0:Lcom/discord/utilities/voice/RingManager; + + const-string v1, "storeState" + + invoke-static {p1, v1}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-static {v0, p1}, Lcom/discord/utilities/voice/RingManager;->access$handleStoreState(Lcom/discord/utilities/voice/RingManager;Lcom/discord/utilities/voice/RingManager$StoreState;)V + + return-void +.end method diff --git a/com.discord/smali/com/discord/utilities/voice/RingManager.smali b/com.discord/smali/com/discord/utilities/voice/RingManager.smali new file mode 100644 index 0000000000..7f0acc2e5d --- /dev/null +++ b/com.discord/smali/com/discord/utilities/voice/RingManager.smali @@ -0,0 +1,344 @@ +.class public final Lcom/discord/utilities/voice/RingManager; +.super Ljava/lang/Object; +.source "RingManager.kt" + + +# annotations +.annotation system Ldalvik/annotation/MemberClasses; + value = { + Lcom/discord/utilities/voice/RingManager$StoreState;, + Lcom/discord/utilities/voice/RingManager$IStoreStateGenerator;, + Lcom/discord/utilities/voice/RingManager$StoreStateGenerator; + } +.end annotation + + +# instance fields +.field public final appComponent:Lcom/discord/app/AppComponent; + +.field public final appSoundManager:Lcom/discord/utilities/media/AppSoundManager; + +.field public final storeStateGenerator:Lcom/discord/utilities/voice/RingManager$IStoreStateGenerator; + +.field public storeStateSubscription:Lrx/Subscription; + + +# direct methods +.method public constructor (Lcom/discord/app/AppComponent;Lcom/discord/utilities/media/AppSoundManager;Lcom/discord/utilities/voice/RingManager$IStoreStateGenerator;)V + .locals 1 + + const-string v0, "appComponent" + + invoke-static {p1, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + + const-string v0, "appSoundManager" + + invoke-static {p2, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + + const-string v0, "storeStateGenerator" + + invoke-static {p3, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-direct {p0}, Ljava/lang/Object;->()V + + iput-object p1, p0, Lcom/discord/utilities/voice/RingManager;->appComponent:Lcom/discord/app/AppComponent; + + iput-object p2, p0, Lcom/discord/utilities/voice/RingManager;->appSoundManager:Lcom/discord/utilities/media/AppSoundManager; + + iput-object p3, p0, Lcom/discord/utilities/voice/RingManager;->storeStateGenerator:Lcom/discord/utilities/voice/RingManager$IStoreStateGenerator; + + return-void +.end method + +.method public synthetic constructor (Lcom/discord/app/AppComponent;Lcom/discord/utilities/media/AppSoundManager;Lcom/discord/utilities/voice/RingManager$IStoreStateGenerator;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + .locals 0 + + and-int/lit8 p5, p4, 0x2 + + if-eqz p5, :cond_0 + + sget-object p2, Lcom/discord/utilities/media/AppSoundManager$Provider;->INSTANCE:Lcom/discord/utilities/media/AppSoundManager$Provider; + + invoke-virtual {p2}, Lcom/discord/utilities/media/AppSoundManager$Provider;->get()Lcom/discord/utilities/media/AppSoundManager; + + move-result-object p2 + + :cond_0 + and-int/lit8 p4, p4, 0x4 + + if-eqz p4, :cond_1 + + new-instance p3, Lcom/discord/utilities/voice/RingManager$StoreStateGenerator; + + const/4 p4, 0x3 + + const/4 p5, 0x0 + + invoke-direct {p3, p5, p5, p4, p5}, Lcom/discord/utilities/voice/RingManager$StoreStateGenerator;->(Lcom/discord/stores/StoreVoiceParticipants;Lcom/discord/stores/StoreRtcConnection;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + + :cond_1 + invoke-direct {p0, p1, p2, p3}, Lcom/discord/utilities/voice/RingManager;->(Lcom/discord/app/AppComponent;Lcom/discord/utilities/media/AppSoundManager;Lcom/discord/utilities/voice/RingManager$IStoreStateGenerator;)V + + return-void +.end method + +.method public static final synthetic access$getAppSoundManager$p(Lcom/discord/utilities/voice/RingManager;)Lcom/discord/utilities/media/AppSoundManager; + .locals 0 + + iget-object p0, p0, Lcom/discord/utilities/voice/RingManager;->appSoundManager:Lcom/discord/utilities/media/AppSoundManager; + + return-object p0 +.end method + +.method public static final synthetic access$getStoreStateSubscription$p(Lcom/discord/utilities/voice/RingManager;)Lrx/Subscription; + .locals 0 + + iget-object p0, p0, Lcom/discord/utilities/voice/RingManager;->storeStateSubscription:Lrx/Subscription; + + return-object p0 +.end method + +.method public static final synthetic access$handleStoreState(Lcom/discord/utilities/voice/RingManager;Lcom/discord/utilities/voice/RingManager$StoreState;)V + .locals 0 + + invoke-direct {p0, p1}, Lcom/discord/utilities/voice/RingManager;->handleStoreState(Lcom/discord/utilities/voice/RingManager$StoreState;)V + + return-void +.end method + +.method public static final synthetic access$setStoreStateSubscription$p(Lcom/discord/utilities/voice/RingManager;Lrx/Subscription;)V + .locals 0 + + iput-object p1, p0, Lcom/discord/utilities/voice/RingManager;->storeStateSubscription:Lrx/Subscription; + + return-void +.end method + +.method private final handleStoreState(Lcom/discord/utilities/voice/RingManager$StoreState;)V + .locals 5 + .annotation build Landroidx/annotation/UiThread; + .end annotation + + invoke-virtual {p1}, Lcom/discord/utilities/voice/RingManager$StoreState;->getVoiceParticipants()Ljava/util/Map; + + move-result-object v0 + + invoke-virtual {p1}, Lcom/discord/utilities/voice/RingManager$StoreState;->getRtcConnectionState()Lcom/discord/rtcconnection/RtcConnection$State; + + move-result-object p1 + + sget-object v1, Lcom/discord/rtcconnection/RtcConnection$State$f;->a:Lcom/discord/rtcconnection/RtcConnection$State$f; + + invoke-static {p1, v1}, Lk0/n/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z + + move-result p1 + + invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection; + + move-result-object v1 + + new-instance v2, Ljava/util/ArrayList; + + invoke-direct {v2}, Ljava/util/ArrayList;->()V + + invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; + + move-result-object v1 + + :cond_0 + :goto_0 + invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z + + move-result v3 + + if-eqz v3, :cond_1 + + invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object; + + move-result-object v3 + + move-object v4, v3 + + check-cast v4, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser; + + invoke-virtual {v4}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->isConnected()Z + + move-result v4 + + if-eqz v4, :cond_0 + + invoke-interface {v2, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z + + goto :goto_0 + + :cond_1 + invoke-interface {v2}, Ljava/util/List;->size()I + + move-result v1 + + invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection; + + move-result-object v0 + + new-instance v2, Ljava/util/ArrayList; + + invoke-direct {v2}, Ljava/util/ArrayList;->()V + + invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; + + move-result-object v0 + + :cond_2 + :goto_1 + invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z + + move-result v3 + + if-eqz v3, :cond_3 + + invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object; + + move-result-object v3 + + move-object v4, v3 + + check-cast v4, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser; + + invoke-virtual {v4}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->isRinging()Z + + move-result v4 + + if-eqz v4, :cond_2 + + invoke-interface {v2, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z + + goto :goto_1 + + :cond_3 + invoke-interface {v2}, Ljava/util/List;->size()I + + move-result v0 + + const/4 v2, 0x2 + + if-ge v1, v2, :cond_4 + + if-lez v0, :cond_4 + + iget-object v3, p0, Lcom/discord/utilities/voice/RingManager;->appSoundManager:Lcom/discord/utilities/media/AppSoundManager; + + sget-object v4, Lcom/discord/utilities/media/AppSound;->Companion:Lcom/discord/utilities/media/AppSound$Companion; + + invoke-virtual {v4}, Lcom/discord/utilities/media/AppSound$Companion;->getSOUND_CALL_CALLING()Lcom/discord/utilities/media/AppSound; + + move-result-object v4 + + invoke-virtual {v3, v4}, Lcom/discord/utilities/media/AppSoundManager;->isPlaying(Lcom/discord/utilities/media/AppSound;)Z + + move-result v3 + + if-nez v3, :cond_4 + + if-eqz p1, :cond_4 + + iget-object p1, p0, Lcom/discord/utilities/voice/RingManager;->appSoundManager:Lcom/discord/utilities/media/AppSoundManager; + + sget-object v0, Lcom/discord/utilities/media/AppSound;->Companion:Lcom/discord/utilities/media/AppSound$Companion; + + invoke-virtual {v0}, Lcom/discord/utilities/media/AppSound$Companion;->getSOUND_CALL_CALLING()Lcom/discord/utilities/media/AppSound; + + move-result-object v0 + + invoke-virtual {p1, v0}, Lcom/discord/utilities/media/AppSoundManager;->play(Lcom/discord/utilities/media/AppSound;)V + + goto :goto_2 + + :cond_4 + if-eqz p1, :cond_5 + + if-eqz v0, :cond_5 + + if-lt v1, v2, :cond_6 + + :cond_5 + iget-object p1, p0, Lcom/discord/utilities/voice/RingManager;->appSoundManager:Lcom/discord/utilities/media/AppSoundManager; + + sget-object v0, Lcom/discord/utilities/media/AppSound;->Companion:Lcom/discord/utilities/media/AppSound$Companion; + + invoke-virtual {v0}, Lcom/discord/utilities/media/AppSound$Companion;->getSOUND_CALL_CALLING()Lcom/discord/utilities/media/AppSound; + + move-result-object v0 + + invoke-virtual {p1, v0}, Lcom/discord/utilities/media/AppSoundManager;->stop(Lcom/discord/utilities/media/AppSound;)V + + :cond_6 + :goto_2 + return-void +.end method + + +# virtual methods +.method public final subscribeToStoreState(J)V + .locals 11 + + iget-object v0, p0, Lcom/discord/utilities/voice/RingManager;->storeStateSubscription:Lrx/Subscription; + + if-eqz v0, :cond_0 + + invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V + + :cond_0 + iget-object v0, p0, Lcom/discord/utilities/voice/RingManager;->storeStateGenerator:Lcom/discord/utilities/voice/RingManager$IStoreStateGenerator; + + invoke-interface {v0, p1, p2}, Lcom/discord/utilities/voice/RingManager$IStoreStateGenerator;->observeStoreState(J)Lrx/Observable; + + move-result-object p1 + + invoke-virtual {p1}, Lrx/Observable;->q()Lrx/Observable; + + move-result-object p1 + + const-string p2, "storeStateGenerator\n \u2026 .distinctUntilChanged()" + + invoke-static {p1, p2}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable; + + move-result-object p1 + + iget-object p2, p0, Lcom/discord/utilities/voice/RingManager;->appComponent:Lcom/discord/app/AppComponent; + + const/4 v0, 0x2 + + const/4 v1, 0x0 + + invoke-static {p1, p2, v1, v0, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable; + + move-result-object v2 + + const-class v3, Lcom/discord/utilities/voice/RingManager; + + const/4 v4, 0x0 + + new-instance v5, Lcom/discord/utilities/voice/RingManager$subscribeToStoreState$1; + + invoke-direct {v5, p0}, Lcom/discord/utilities/voice/RingManager$subscribeToStoreState$1;->(Lcom/discord/utilities/voice/RingManager;)V + + const/4 v6, 0x0 + + new-instance v7, Lcom/discord/utilities/voice/RingManager$subscribeToStoreState$2; + + invoke-direct {v7, p0}, Lcom/discord/utilities/voice/RingManager$subscribeToStoreState$2;->(Lcom/discord/utilities/voice/RingManager;)V + + new-instance v8, Lcom/discord/utilities/voice/RingManager$subscribeToStoreState$3; + + invoke-direct {v8, p0}, Lcom/discord/utilities/voice/RingManager$subscribeToStoreState$3;->(Lcom/discord/utilities/voice/RingManager;)V + + const/16 v9, 0xa + + const/4 v10, 0x0 + + invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + + return-void +.end method diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService.smali index 7f495c0677..ea462409ff 100644 --- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService.smali +++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService.smali @@ -69,6 +69,8 @@ # instance fields .field public final binder:Lcom/discord/utilities/voice/VoiceEngineForegroundService$LocalBinder; +.field public final ringManager:Lcom/discord/utilities/voice/RingManager; + .field public screenShareManager:Lcom/discord/utilities/voice/ScreenShareManager; .field public final unsubscribeSignal:Lrx/subjects/Subject; @@ -117,7 +119,7 @@ .end method .method public constructor ()V - .locals 2 + .locals 7 const-string v0, "VoiceEngineForegroundService" @@ -139,6 +141,24 @@ iput-object v0, p0, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->binder:Lcom/discord/utilities/voice/VoiceEngineForegroundService$LocalBinder; + new-instance v0, Lcom/discord/utilities/voice/RingManager; + + const/4 v3, 0x0 + + const/4 v4, 0x0 + + const/4 v5, 0x6 + + const/4 v6, 0x0 + + move-object v1, v0 + + move-object v2, p0 + + invoke-direct/range {v1 .. v6}, Lcom/discord/utilities/voice/RingManager;->(Lcom/discord/app/AppComponent;Lcom/discord/utilities/media/AppSoundManager;Lcom/discord/utilities/voice/RingManager$IStoreStateGenerator;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + + iput-object v0, p0, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->ringManager:Lcom/discord/utilities/voice/RingManager; + new-instance v0, Lcom/discord/utilities/voice/VoiceEngineForegroundService$wakeLock$2; invoke-direct {v0, p0}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$wakeLock$2;->(Lcom/discord/utilities/voice/VoiceEngineForegroundService;)V @@ -208,6 +228,31 @@ return-void .end method +.method private final configureRingManager(Landroid/content/Intent;)V + .locals 2 + + const-string v0, "com.discord.utilities.voice.extra.channel_id" + + invoke-virtual {p1, v0}, Landroid/content/Intent;->getSerializableExtra(Ljava/lang/String;)Ljava/io/Serializable; + + move-result-object p1 + + check-cast p1, Ljava/lang/Long; + + if-eqz p1, :cond_0 + + invoke-virtual {p1}, Ljava/lang/Long;->longValue()J + + move-result-wide v0 + + iget-object p1, p0, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->ringManager:Lcom/discord/utilities/voice/RingManager; + + invoke-virtual {p1, v0, v1}, Lcom/discord/utilities/voice/RingManager;->subscribeToStoreState(J)V + + :cond_0 + return-void +.end method + .method private final getWakeLock()Lcom/discord/utilities/voice/VoiceEngineForegroundService$WakeLock; .locals 1 @@ -475,7 +520,7 @@ invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object; - goto :goto_0 + goto/16 :goto_0 :sswitch_1 const-string v1, "com.discord.utilities.voice.action.start_foreground" @@ -488,6 +533,8 @@ invoke-direct {p0, p1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->initScreenShareManager(Landroid/content/Intent;)V + invoke-direct {p0, p1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->configureRingManager(Landroid/content/Intent;)V + const/16 v0, 0x65 new-instance v1, Lcom/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder; diff --git a/com.discord/smali/com/discord/views/ChatActionItem.smali b/com.discord/smali/com/discord/views/ChatActionItem.smali index fdcc0ecf9a..bb6deb69ad 100644 --- a/com.discord/smali/com/discord/views/ChatActionItem.smali +++ b/com.discord/smali/com/discord/views/ChatActionItem.smali @@ -81,7 +81,7 @@ invoke-virtual {p2, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V - const p2, 0x7f080145 + const p2, 0x7f080144 invoke-virtual {p1, v1, p2}, Landroid/content/res/TypedArray;->getResourceId(II)I diff --git a/com.discord/smali/com/discord/views/premium/AccountCreditView.smali b/com.discord/smali/com/discord/views/premium/AccountCreditView.smali index 2288c0b8fb..48af6b1dae 100644 --- a/com.discord/smali/com/discord/views/premium/AccountCreditView.smali +++ b/com.discord/smali/com/discord/views/premium/AccountCreditView.smali @@ -142,7 +142,7 @@ iget-object v5, v0, Lcom/discord/views/premium/AccountCreditView;->d:Landroid/widget/ImageView; - const v8, 0x7f080168 + const v8, 0x7f080167 invoke-virtual {v5, v8}, Landroid/widget/ImageView;->setImageResource(I)V @@ -193,7 +193,7 @@ iget-object v5, v0, Lcom/discord/views/premium/AccountCreditView;->d:Landroid/widget/ImageView; - const v8, 0x7f080167 + const v8, 0x7f080166 invoke-virtual {v5, v8}, Landroid/widget/ImageView;->setImageResource(I)V diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$WidgetCollapsedUserListItem.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$WidgetCollapsedUserListItem.smali index e94cf0e5d9..7845964f06 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$WidgetCollapsedUserListItem.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$WidgetCollapsedUserListItem.smali @@ -189,7 +189,7 @@ move-result-object p1 - const p2, 0x7f08015d + const p2, 0x7f08015c const/4 v0, 0x4 diff --git a/com.discord/smali/com/discord/widgets/chat/input/sticker/StickerPickerNfxManager.smali b/com.discord/smali/com/discord/widgets/chat/input/sticker/StickerPickerNfxManager.smali index d9a8c9e821..14bee37ded 100644 --- a/com.discord/smali/com/discord/widgets/chat/input/sticker/StickerPickerNfxManager.smali +++ b/com.discord/smali/com/discord/widgets/chat/input/sticker/StickerPickerNfxManager.smali @@ -304,6 +304,18 @@ if-eqz v1, :cond_3 + sget-object v1, Lcom/discord/widgets/chat/input/sticker/StickerPickerFeatureFlag;->Companion:Lcom/discord/widgets/chat/input/sticker/StickerPickerFeatureFlag$Companion; + + invoke-virtual {v1}, Lcom/discord/widgets/chat/input/sticker/StickerPickerFeatureFlag$Companion;->getINSTANCE()Lcom/discord/widgets/chat/input/sticker/StickerPickerFeatureFlag; + + move-result-object v1 + + invoke-virtual {v1}, Lcom/discord/widgets/chat/input/sticker/StickerPickerFeatureFlag;->isEnabled()Z + + move-result v1 + + if-eqz v1, :cond_3 + const/4 v0, 0x1 :cond_3 diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali index 606ee370ce..89969f91f5 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali @@ -618,7 +618,7 @@ move-result-object v0 - const v1, 0x7f08014c + const v1, 0x7f08014b invoke-virtual {v0, v1}, Landroid/widget/TextView;->setBackgroundResource(I)V diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali index 3421fb24b3..af858d50f2 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali @@ -946,7 +946,7 @@ move-result-object v0 - const v1, 0x7f08014c + const v1, 0x7f08014b invoke-virtual {v0, v1}, Landroid/widget/TextView;->setBackgroundResource(I)V diff --git a/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$get$1$1$1.smali b/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$get$1$1$1.smali index 3c6241ac9f..5a8f182a48 100644 --- a/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$get$1$1$1.smali +++ b/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$get$1$1$1.smali @@ -71,7 +71,7 @@ new-instance v0, Lcom/discord/widgets/chat/overlay/ChatTypingModel$Typing; - const-string v1, "typingUsers" + const-string/jumbo v1, "typingUsers" invoke-static {p1, v1}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V diff --git a/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Typing.smali b/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Typing.smali index e26e54838a..6e2f334296 100644 --- a/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Typing.smali +++ b/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Typing.smali @@ -42,7 +42,7 @@ } .end annotation - const-string v0, "typingUsers" + const-string/jumbo v0, "typingUsers" invoke-static {p1, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V @@ -136,7 +136,7 @@ } .end annotation - const-string v0, "typingUsers" + const-string/jumbo v0, "typingUsers" 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/overlay/WidgetChatOverlay.smali b/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay.smali index 4e702b1098..ff1c123aac 100644 --- a/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay.smali +++ b/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay.smali @@ -48,7 +48,7 @@ const-class v1, Lcom/discord/widgets/chat/overlay/WidgetChatOverlay; - const-string v2, "typingContainer" + const-string/jumbo v2, "typingContainer" const-string v3, "getTypingContainer()Landroid/view/ViewGroup;" @@ -109,7 +109,7 @@ return-object p0 :cond_0 - const-string p0, "typingIndicatorViewHolder" + const-string/jumbo p0, "typingIndicatorViewHolder" invoke-static {p0}, Lk0/n/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali index cb87f10469..fb2892f858 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, "40.03" + const-string v4, "40.04" aput-object v4, v2, v3 diff --git a/com.discord/smali/com/discord/widgets/friends/NearbyManager.smali b/com.discord/smali/com/discord/widgets/friends/NearbyManager.smali index 0b52cc5dfc..890d0baf9a 100644 --- a/com.discord/smali/com/discord/widgets/friends/NearbyManager.smali +++ b/com.discord/smali/com/discord/widgets/friends/NearbyManager.smali @@ -361,7 +361,7 @@ new-instance v0, Lcom/google/android/gms/nearby/messages/Message; - const-string v1, "u:" + const-string/jumbo v1, "u:" invoke-static {v1, p1, p2}, Lf/e/b/a/a;->n(Ljava/lang/String;J)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User.smali index 17137be316..82fc655ec5 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User.smali @@ -147,7 +147,7 @@ .method public getKey()Ljava/lang/String; .locals 3 - const-string v0, "u" + const-string/jumbo v0, "u" invoke-static {v0}, Lf/e/b/a/a;->E(Ljava/lang/String;)Ljava/lang/StringBuilder; diff --git a/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder.smali b/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder.smali index afc00017a4..048d53692f 100644 --- a/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder.smali +++ b/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder.smali @@ -413,7 +413,7 @@ :cond_1 iget-object p1, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatarContainer:Landroid/view/ViewGroup; - const p2, 0x7f080143 + const p2, 0x7f080142 invoke-virtual {p1, p2}, Landroid/view/ViewGroup;->setBackgroundResource(I)V diff --git a/com.discord/smali/f/d/a/y/s.smali b/com.discord/smali/f/d/a/y/s.smali index 4beafc661e..38e42e772c 100644 --- a/com.discord/smali/f/d/a/y/s.smali +++ b/com.discord/smali/f/d/a/y/s.smali @@ -59,7 +59,7 @@ const-string v5, "p" - const-string v6, "u" + const-string/jumbo v6, "u" filled-new-array/range {v1 .. v6}, [Ljava/lang/String; diff --git a/com.discord/smali_classes2/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali b/com.discord/smali_classes2/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali index 6835442534..3c851c368e 100644 --- a/com.discord/smali_classes2/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali +++ b/com.discord/smali_classes2/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali @@ -764,7 +764,7 @@ iput v0, v1, Lf/i/a/a/e$k;->u:I - const v0, 0x7f08014a + const v0, 0x7f080149 iput v0, v1, Lf/i/a/a/e$k;->v:I @@ -1034,7 +1034,7 @@ move-result-object v0 - const v1, 0x7f080145 + const v1, 0x7f080144 invoke-static {v0, v1}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable; 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 a8df0faea9..ee5f1dbea0 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, " - 40.03 (1258)" + const-string v0, " - 40.04 (1259)" 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/FloatingVoiceControlsView$OutputSelectorState.smali b/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState.smali index d146ca4884..2fcd02f3ec 100644 --- a/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState.smali +++ b/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState.smali @@ -222,10 +222,8 @@ return v0 .end method -.method public final getBackgroundRes(Landroid/content/Context;)I - .locals 3 - .annotation build Landroidx/annotation/DrawableRes; - .end annotation +.method public final getBackgroundTint(Landroid/content/Context;)I + .locals 1 const-string v0, "context" @@ -235,26 +233,20 @@ if-eqz v0, :cond_0 - new-instance v0, Landroid/util/TypedValue; + const v0, 0x7f060298 - invoke-direct {v0}, Landroid/util/TypedValue;->()V + invoke-static {p1, v0}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I - invoke-virtual {p1}, Landroid/content/Context;->getTheme()Landroid/content/res/Resources$Theme; - - move-result-object p1 - - const v1, 0x7f0400ab - - const/4 v2, 0x1 - - invoke-virtual {p1, v1, v0, v2}, Landroid/content/res/Resources$Theme;->resolveAttribute(ILandroid/util/TypedValue;Z)Z - - iget p1, v0, Landroid/util/TypedValue;->resourceId:I + move-result p1 goto :goto_0 :cond_0 - const p1, 0x7f08013f + const v0, 0x7f060192 + + invoke-static {p1, v0}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I + + move-result p1 :goto_0 return p1 diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView.smali b/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView.smali index dfe4a2fcc1..9cf3e555ec 100644 --- a/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView.smali +++ b/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView.smali @@ -494,7 +494,7 @@ move-result p4 - const p5, 0x7f06019c + const p5, 0x7f060192 const/4 p6, -0x1 @@ -600,29 +600,25 @@ move-result-object p7 - invoke-virtual {p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context; + const-string p10, "context" - move-result-object p10 + invoke-static {p7, p10}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V - const-string v0, "context" + invoke-virtual {p2, p7}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;->getBackgroundTint(Landroid/content/Context;)I - invoke-static {p10, v0}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + move-result p7 - invoke-virtual {p2, p10}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;->getBackgroundRes(Landroid/content/Context;)I - - move-result p10 - - invoke-static {p7, p10}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable; + invoke-static {p7}, Landroid/content/res/ColorStateList;->valueOf(I)Landroid/content/res/ColorStateList; move-result-object p7 - invoke-virtual {p4, p7}, Landroid/widget/ImageView;->setBackground(Landroid/graphics/drawable/Drawable;)V + invoke-virtual {p4, p7}, Landroid/widget/ImageView;->setBackgroundTintList(Landroid/content/res/ColorStateList;)V invoke-virtual {p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context; move-result-object p4 - invoke-static {p4, v0}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {p4, p10}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V invoke-virtual {p2, p4}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;->getIconTint(Landroid/content/Context;)I 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 2e657e6513..454842ad45 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 @@ -443,7 +443,7 @@ move-result-object v0 - const v1, 0x7f06019c + const v1, 0x7f060192 invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I @@ -514,7 +514,7 @@ .end method .method private final configureOutputSelectors(Lcom/discord/widgets/voice/model/CallModel;Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;Lkotlin/jvm/functions/Function0;)V - .locals 15 + .locals 12 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -526,185 +526,175 @@ } .end annotation - move-object/from16 v0, p2 - - move-object/from16 v1, p3 - invoke-direct {p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->getAudioOutputContainer()Landroid/view/View; - move-result-object v2 + move-result-object v0 - invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/model/CallModel;->isVideoCall()Z + invoke-virtual {p1}, Lcom/discord/widgets/voice/model/CallModel;->isVideoCall()Z - move-result v3 + move-result v1 - xor-int/lit8 v3, v3, 0x1 + xor-int/lit8 v1, v1, 0x1 - const/4 v4, 0x0 + const/4 v2, 0x0 - const/16 v5, 0x8 + const/16 v3, 0x8 - if-eqz v3, :cond_0 + if-eqz v1, :cond_0 - const/4 v3, 0x0 + const/4 v1, 0x0 goto :goto_0 :cond_0 - const/16 v3, 0x8 + const/16 v1, 0x8 :goto_0 - invoke-virtual {v2, v3}, Landroid/view/View;->setVisibility(I)V + invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V invoke-direct {p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->getAudioOutputSelector()Landroid/widget/ImageView; - move-result-object v2 + move-result-object v0 invoke-virtual {p0}, Landroid/widget/LinearLayout;->getContext()Landroid/content/Context; - move-result-object v3 + move-result-object v1 - invoke-virtual/range {p2 .. p2}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;->getAudioOutputIconRes()I + invoke-virtual {p2}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;->getAudioOutputIconRes()I - move-result v6 + move-result v4 - invoke-static {v3, v6}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable; + invoke-static {v1, v4}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable; - move-result-object v3 + move-result-object v1 - invoke-virtual {v2, v3}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V + invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V invoke-direct {p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->getAudioOutputSelector()Landroid/widget/ImageView; - move-result-object v2 + move-result-object v0 invoke-virtual {p0}, Landroid/widget/LinearLayout;->getContext()Landroid/content/Context; - move-result-object v3 + move-result-object v1 - invoke-virtual {p0}, Landroid/widget/LinearLayout;->getContext()Landroid/content/Context; + const-string v4, "context" - move-result-object v6 + invoke-static {v1, v4}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V - const-string v7, "context" + invoke-virtual {p2, v1}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;->getBackgroundTint(Landroid/content/Context;)I - invoke-static {v6, v7}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + move-result v1 - invoke-virtual {v0, v6}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;->getBackgroundRes(Landroid/content/Context;)I + invoke-static {v1}, Landroid/content/res/ColorStateList;->valueOf(I)Landroid/content/res/ColorStateList; - move-result v6 + move-result-object v1 - invoke-static {v3, v6}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable; - - move-result-object v3 - - invoke-virtual {v2, v3}, Landroid/widget/ImageView;->setBackground(Landroid/graphics/drawable/Drawable;)V + invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setBackgroundTintList(Landroid/content/res/ColorStateList;)V invoke-direct {p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->getAudioOutputSheetButton()Landroid/widget/TextView; - move-result-object v2 + move-result-object v0 - invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/model/CallModel;->isVideoCall()Z + invoke-virtual {p1}, Lcom/discord/widgets/voice/model/CallModel;->isVideoCall()Z - move-result v3 + move-result p1 - if-eqz v3, :cond_1 + if-eqz p1, :cond_1 - const/4 v3, 0x0 + const/4 p1, 0x0 goto :goto_1 :cond_1 - const/16 v3, 0x8 + const/16 p1, 0x8 :goto_1 - invoke-virtual {v2, v3}, Landroid/view/View;->setVisibility(I)V + invoke-virtual {v0, p1}, Landroid/view/View;->setVisibility(I)V invoke-direct {p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->getAudioOutputSheetButton()Landroid/widget/TextView; - move-result-object v8 + move-result-object v5 - invoke-virtual/range {p2 .. p2}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;->getAudioOutputIconRes()I + invoke-virtual {p2}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;->getAudioOutputIconRes()I - move-result v9 + move-result v6 - const/4 v10, 0x0 + const/4 v7, 0x0 + + const/4 v8, 0x0 + + const/4 v9, 0x0 + + const/16 v10, 0xe const/4 v11, 0x0 - const/4 v12, 0x0 - - const/16 v13, 0xe - - const/4 v14, 0x0 - - invoke-static/range {v8 .. v14}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setCompoundDrawableWithIntrinsicBounds$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V + invoke-static/range {v5 .. v11}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setCompoundDrawableWithIntrinsicBounds$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V invoke-virtual {p0}, Landroid/widget/LinearLayout;->getContext()Landroid/content/Context; - move-result-object v2 + move-result-object p1 - invoke-static {v2, v7}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {p1, v4}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V - invoke-virtual {v0, v2}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;->getIconTint(Landroid/content/Context;)I + invoke-virtual {p2, p1}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;->getIconTint(Landroid/content/Context;)I - move-result v2 + move-result p1 - move-object v3, p0 + invoke-static {p0, p1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/view/View;I)I - invoke-static {p0, v2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/view/View;I)I - - move-result v2 + move-result p1 invoke-direct {p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->getAudioOutputSelector()Landroid/widget/ImageView; - move-result-object v6 + move-result-object v0 - invoke-static {v6, v2}, Lcom/discord/utilities/color/ColorCompatKt;->tintWithColor(Landroid/widget/ImageView;I)V + invoke-static {v0, p1}, Lcom/discord/utilities/color/ColorCompatKt;->tintWithColor(Landroid/widget/ImageView;I)V invoke-direct {p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->getAudioOutputSelectorMore()Landroid/widget/ImageView; - move-result-object v6 + move-result-object v0 - invoke-static {v6, v2}, Lcom/discord/utilities/color/ColorCompatKt;->tintWithColor(Landroid/widget/ImageView;I)V + invoke-static {v0, p1}, Lcom/discord/utilities/color/ColorCompatKt;->tintWithColor(Landroid/widget/ImageView;I)V invoke-direct {p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->getAudioOutputSelectorMore()Landroid/widget/ImageView; - move-result-object v2 + move-result-object p1 - invoke-virtual/range {p2 .. p2}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;->getShowMoreOptions()Z + invoke-virtual {p2}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;->getShowMoreOptions()Z - move-result v0 + move-result p2 - if-eqz v0, :cond_2 + if-eqz p2, :cond_2 goto :goto_2 :cond_2 - const/16 v4, 0x8 + const/16 v2, 0x8 :goto_2 - invoke-virtual {v2, v4}, Landroid/view/View;->setVisibility(I)V + invoke-virtual {p1, v2}, Landroid/view/View;->setVisibility(I)V invoke-direct {p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->getAudioOutputSelector()Landroid/widget/ImageView; - move-result-object v0 + move-result-object p1 - new-instance v2, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2$configureOutputSelectors$1; + new-instance p2, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2$configureOutputSelectors$1; - invoke-direct {v2, v1}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2$configureOutputSelectors$1;->(Lkotlin/jvm/functions/Function0;)V + invoke-direct {p2, p3}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2$configureOutputSelectors$1;->(Lkotlin/jvm/functions/Function0;)V - invoke-virtual {v0, v2}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V + invoke-virtual {p1, p2}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V invoke-direct {p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->getAudioOutputSheetButton()Landroid/widget/TextView; - move-result-object v0 + move-result-object p1 - new-instance v2, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2$configureOutputSelectors$2; + new-instance p2, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2$configureOutputSelectors$2; - invoke-direct {v2, v1}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2$configureOutputSelectors$2;->(Lkotlin/jvm/functions/Function0;)V + invoke-direct {p2, p3}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2$configureOutputSelectors$2;->(Lkotlin/jvm/functions/Function0;)V - invoke-virtual {v0, v2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V + invoke-virtual {p1, p2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V return-void .end method @@ -794,7 +784,7 @@ move-result-object v0 - const v2, 0x7f06019c + const v2, 0x7f060192 invoke-static {v0, v2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I @@ -987,7 +977,7 @@ move-result-object p1 - const p3, 0x7f06019c + const p3, 0x7f060192 invoke-static {p1, p3}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I @@ -1547,3 +1537,65 @@ return v0 .end method + +.method public onAttachedToWindow()V + .locals 3 + + invoke-super {p0}, Landroid/widget/LinearLayout;->onAttachedToWindow()V + + invoke-virtual {p0}, Landroid/widget/LinearLayout;->getResources()Landroid/content/res/Resources; + + move-result-object v0 + + const-string v1, "resources" + + invoke-static {v0, v1}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v0}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration; + + move-result-object v0 + + iget v0, v0, Landroid/content/res/Configuration;->orientation:I + + const/4 v2, 0x1 + + if-ne v0, v2, :cond_0 + + invoke-virtual {p0}, Landroid/widget/LinearLayout;->getResources()Landroid/content/res/Resources; + + move-result-object v0 + + invoke-static {v0, v1}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v0}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics; + + move-result-object v0 + + iget v0, v0, Landroid/util/DisplayMetrics;->widthPixels:I + + goto :goto_0 + + :cond_0 + invoke-virtual {p0}, Landroid/widget/LinearLayout;->getResources()Landroid/content/res/Resources; + + move-result-object v0 + + invoke-static {v0, v1}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v0}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics; + + move-result-object v0 + + iget v0, v0, Landroid/util/DisplayMetrics;->heightPixels:I + + :goto_0 + invoke-virtual {p0}, Landroid/widget/LinearLayout;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams; + + move-result-object v1 + + iput v0, v1, Landroid/view/ViewGroup$LayoutParams;->width:I + + invoke-virtual {p0, v1}, Landroid/widget/LinearLayout;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V + + return-void +.end method diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$6.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$6.smali index f0e53c1c6b..3217f31ab7 100644 --- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$6.smali +++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$6.smali @@ -60,7 +60,7 @@ .end method .method public final invoke()V - .locals 1 + .locals 2 iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$6;->$viewState:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid; @@ -87,8 +87,18 @@ :cond_0 iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$6;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen; - invoke-static {v0}, Lcom/discord/widgets/voice/stream/StreamNavigator;->requestStartStream(Landroidx/fragment/app/Fragment;)V + invoke-static {v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->access$getBottomSheetBehavior$p(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)Lcom/google/android/material/bottomsheet/BottomSheetBehavior; + + move-result-object v0 + + const/4 v1, 0x4 + + invoke-virtual {v0, v1}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setState(I)V :goto_0 + iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$6;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen; + + invoke-static {v0}, Lcom/discord/widgets/voice/stream/StreamNavigator;->requestStartStream(Landroidx/fragment/app/Fragment;)V + return-void .end method 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 8073ad5722..b434a126ce 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 @@ -578,6 +578,29 @@ return-void .end method +.method private final collapseBottomSheet()V + .locals 2 + + iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->bottomSheetBehavior:Lcom/google/android/material/bottomsheet/BottomSheetBehavior; + + if-eqz v0, :cond_0 + + const/4 v1, 0x4 + + invoke-virtual {v0, v1}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setState(I)V + + return-void + + :cond_0 + const-string v0, "bottomSheetBehavior" + + invoke-static {v0}, Lk0/n/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V + + const/4 v0, 0x0 + + throw v0 +.end method + .method private final configureActionBar(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;)V .locals 4 @@ -665,55 +688,44 @@ .end method .method private final configureBottomControls(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;)V - .locals 24 + .locals 23 move-object/from16 v0, p0 move-object/from16 v1, p1 - invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->isShowingControls()Z + invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->isIdle()Z move-result v2 - const/4 v3, 0x4 - - const/4 v4, 0x0 - - if-nez v2, :cond_2 - - iget-object v2, v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->bottomSheetBehavior:Lcom/google/android/material/bottomsheet/BottomSheetBehavior; - - const-string v5, "bottomSheetBehavior" + const/4 v3, 0x0 if-eqz v2, :cond_1 - invoke-virtual {v2}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->getState()I - - move-result v2 - - const/4 v6, 0x3 - - if-ne v2, v6, :cond_2 - iget-object v2, v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->bottomSheetBehavior:Lcom/google/android/material/bottomsheet/BottomSheetBehavior; if-eqz v2, :cond_0 - invoke-virtual {v2, v3}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setState(I)V + invoke-virtual {v2}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->getState()I + + move-result v2 + + const/4 v4, 0x3 + + if-ne v2, v4, :cond_1 + + invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->collapseBottomSheet()V goto :goto_0 :cond_0 - invoke-static {v5}, Lk0/n/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V + const-string v1, "bottomSheetBehavior" - throw v4 + invoke-static {v1}, Lk0/n/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V + + throw v3 :cond_1 - invoke-static {v5}, Lk0/n/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V - - throw v4 - - :cond_2 :goto_0 invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getFloatingControlsExperimental()Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2; @@ -721,112 +733,115 @@ invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->getScreenshareEnabled()Z - move-result v5 + move-result v4 - const/4 v7, 0x1 + const/4 v6, 0x1 - if-ne v5, v7, :cond_3 + if-ne v4, v6, :cond_2 - const/4 v3, 0x0 + const/4 v4, 0x0 - :cond_3 - invoke-virtual {v2, v3}, Landroid/widget/LinearLayout;->setVisibility(I)V + goto :goto_1 + + :cond_2 + const/4 v4, 0x4 + + :goto_1 + invoke-virtual {v2, v4}, Landroid/widget/LinearLayout;->setVisibility(I)V invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getFloatingControlsExperimental()Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2; - move-result-object v8 + move-result-object v7 invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel; - move-result-object v9 + move-result-object v8 invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->getOutputSelectorState()Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState; - move-result-object v10 + move-result-object v9 invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->getCameraState()Lcom/discord/widgets/voice/model/CameraState; move-result-object v2 - sget-object v3, Lcom/discord/widgets/voice/model/CameraState;->CAMERA_DISABLED:Lcom/discord/widgets/voice/model/CameraState; + sget-object v4, Lcom/discord/widgets/voice/model/CameraState;->CAMERA_DISABLED:Lcom/discord/widgets/voice/model/CameraState; - if-eq v2, v3, :cond_4 + if-eq v2, v4, :cond_3 - const/4 v11, 0x1 + const/4 v10, 0x1 - goto :goto_1 + goto :goto_2 - :cond_4 - const/4 v11, 0x0 + :cond_3 + const/4 v10, 0x0 - :goto_1 + :goto_2 invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->isPushToTalk()Z + move-result v11 + + new-instance v15, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$1; + + invoke-direct {v15, v0, v1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$1;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;)V + + new-instance v14, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$2; + + invoke-direct {v14, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$2;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V + + new-instance v2, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$3; + + invoke-direct {v2, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$3;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V + + new-instance v4, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$4; + + invoke-direct {v4, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$4;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V + + invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->isStreamFocused()Z + move-result v12 - new-instance v2, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$1; - - invoke-direct {v2, v0, v1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$1;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;)V - - new-instance v15, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$2; - - invoke-direct {v15, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$2;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V - - new-instance v3, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$3; - - invoke-direct {v3, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$3;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V - - new-instance v5, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$4; - - invoke-direct {v5, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$4;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V + xor-int/lit8 v13, v12, 0x1 invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->isStreamFocused()Z - move-result v13 + move-result v12 - xor-int/lit8 v14, v13, 0x1 + new-instance v5, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$5; - invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->isStreamFocused()Z + invoke-direct {v5, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$5;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V - move-result v13 + new-instance v3, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$6; - new-instance v6, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$5; + invoke-direct {v3, v0, v1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$6;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;)V - invoke-direct {v6, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$5;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V + new-instance v6, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$7; - new-instance v4, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$6; - - invoke-direct {v4, v0, v1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$6;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;)V - - new-instance v7, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$7; - - invoke-direct {v7, 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 + 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 v21, v4 + move-object/from16 v20, v3 - iget-object v4, v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->viewModel:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel; + iget-object v3, v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->viewModel:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel; - const-string v23, "viewModel" + const-string v22, "viewModel" - if-eqz v4, :cond_f + if-eqz v3, :cond_e - invoke-direct {v1, v4}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$8;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;)V + invoke-direct {v1, v3}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$8;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;)V move-object/from16 v16, v2 - move-object/from16 v17, v3 + move-object/from16 v17, v4 move-object/from16 v18, v5 move-object/from16 v19, v6 - move-object/from16 v20, v7 + move-object/from16 v21, v1 - move-object/from16 v22, v1 - - invoke-virtual/range {v8 .. v22}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2;->configureUI(Lcom/discord/widgets/voice/model/CallModel;Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;ZZZZLkotlin/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;ZZZZLkotlin/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-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getFloatingControlsExperimental()Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2; @@ -836,13 +851,13 @@ move-result v2 - if-eqz v2, :cond_5 + if-eqz v2, :cond_4 invoke-virtual {v1}, Landroid/view/View;->isLayoutRequested()Z move-result v2 - if-nez v2, :cond_5 + if-nez v2, :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; @@ -858,16 +873,16 @@ invoke-virtual {v1, v2}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setPeekHeight(I)V - goto :goto_2 + goto :goto_3 - :cond_5 + :cond_4 new-instance v2, 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-virtual {v1, v2}, Landroid/view/View;->addOnLayoutChangeListener(Landroid/view/View$OnLayoutChangeListener;)V - :goto_2 + :goto_3 invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getFloatingControls()Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView; move-result-object v1 @@ -882,16 +897,16 @@ const/16 v3, 0x8 - if-eqz v2, :cond_6 + if-eqz v2, :cond_5 const/4 v2, 0x0 - goto :goto_3 + goto :goto_4 - :cond_6 + :cond_5 const/16 v2, 0x8 - :goto_3 + :goto_4 invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getFloatingControls()Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView; @@ -912,16 +927,16 @@ sget-object v2, Lcom/discord/widgets/voice/model/CameraState;->CAMERA_DISABLED:Lcom/discord/widgets/voice/model/CameraState; - if-eq v1, v2, :cond_7 + if-eq v1, v2, :cond_6 const/4 v7, 0x1 - goto :goto_4 + goto :goto_5 - :cond_7 + :cond_6 const/4 v7, 0x0 - :goto_4 + :goto_5 new-instance v11, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$10; move-object/from16 v1, p1 @@ -932,7 +947,7 @@ iget-object v2, v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->viewModel:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel; - if-eqz v2, :cond_e + if-eqz v2, :cond_d invoke-direct {v10, v2}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$11;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;)V @@ -960,7 +975,7 @@ iget-object v2, v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->viewModel:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel; - if-eqz v2, :cond_d + if-eqz v2, :cond_c invoke-direct {v14, v2}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$14;->(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;)V @@ -970,7 +985,7 @@ move-result v2 - if-eqz v2, :cond_9 + if-eqz v2, :cond_8 invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->getScreenshareEnabled()Z @@ -978,7 +993,7 @@ const-wide/16 v4, 0xc8 - if-eqz v2, :cond_8 + if-eqz v2, :cond_7 invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getFloatingControlsExperimental()Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2; @@ -990,9 +1005,9 @@ invoke-static {v2, v6, v4, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeBy(Landroid/view/View;ZJ)V - goto :goto_5 + goto :goto_6 - :cond_8 + :cond_7 invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getFloatingControls()Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView; move-result-object v2 @@ -1003,9 +1018,9 @@ invoke-static {v2, v6, v4, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeBy(Landroid/view/View;ZJ)V - goto :goto_5 + goto :goto_6 - :cond_9 + :cond_8 invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getFloatingControls()Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView; move-result-object v2 @@ -1032,7 +1047,7 @@ invoke-virtual {v2, v4}, Landroid/widget/LinearLayout;->setAlpha(F)V - :goto_5 + :goto_6 invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getPushToTalkButton()Landroid/widget/Button; move-result-object v2 @@ -1041,7 +1056,7 @@ move-result v1 - if-eqz v1, :cond_b + if-eqz v1, :cond_a invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getFloatingControlsExperimental()Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView2; @@ -1051,58 +1066,58 @@ move-result v1 - if-nez v1, :cond_a + if-nez v1, :cond_9 const/4 v1, 0x1 - goto :goto_6 - - :cond_a - const/4 v1, 0x0 - - :goto_6 - if-nez v1, :cond_b - - const/4 v7, 0x1 - goto :goto_7 - :cond_b - const/4 v7, 0x0 + :cond_9 + const/4 v1, 0x0 :goto_7 - if-eqz v7, :cond_c + if-nez v1, :cond_a - const/4 v6, 0x0 + const/4 v6, 0x1 goto :goto_8 - :cond_c - const/16 v6, 0x8 + :cond_a + const/4 v6, 0x0 :goto_8 - invoke-virtual {v2, v6}, Landroid/view/View;->setVisibility(I)V + if-eqz v6, :cond_b + + const/4 v5, 0x0 + + goto :goto_9 + + :cond_b + const/16 v5, 0x8 + + :goto_9 + invoke-virtual {v2, v5}, Landroid/view/View;->setVisibility(I)V return-void - :cond_d - invoke-static/range {v23 .. v23}, Lk0/n/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V + :cond_c + invoke-static/range {v22 .. v22}, Lk0/n/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V const/4 v1, 0x0 throw v1 + :cond_d + const/4 v1, 0x0 + + invoke-static/range {v22 .. v22}, 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 - - throw v1 - - :cond_f - const/4 v1, 0x0 - - invoke-static/range {v23 .. v23}, Lk0/n/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V + invoke-static/range {v22 .. v22}, Lk0/n/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V throw v1 .end method diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/R$d.smali b/com.discord/smali_classes2/com/lytefast/flexinput/R$d.smali index 8030a467a7..d503fad7b0 100644 --- a/com.discord/smali_classes2/com/lytefast/flexinput/R$d.smali +++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$d.smali @@ -520,99 +520,97 @@ .field public static final drawable_circle_primary_900:I = 0x7f08013e -.field public static final drawable_circle_primary_900_alpha_60:I = 0x7f08013f +.field public static final drawable_circle_primary_900_alpha_80:I = 0x7f08013f -.field public static final drawable_circle_primary_900_alpha_80:I = 0x7f080140 +.field public static final drawable_circle_purple_brand:I = 0x7f080140 -.field public static final drawable_circle_purple_brand:I = 0x7f080141 +.field public static final drawable_circle_red:I = 0x7f080141 -.field public static final drawable_circle_red:I = 0x7f080142 +.field public static final drawable_circle_transparent:I = 0x7f080142 -.field public static final drawable_circle_transparent:I = 0x7f080143 +.field public static final drawable_circle_white:I = 0x7f080143 -.field public static final drawable_circle_white:I = 0x7f080144 +.field public static final drawable_circle_white_1:I = 0x7f080144 -.field public static final drawable_circle_white_1:I = 0x7f080145 +.field public static final drawable_circle_white_12dp:I = 0x7f080145 -.field public static final drawable_circle_white_12dp:I = 0x7f080146 +.field public static final drawable_circle_white_5:I = 0x7f080146 -.field public static final drawable_circle_white_5:I = 0x7f080147 +.field public static final drawable_clickable_rounded_4dp_brighten:I = 0x7f080147 -.field public static final drawable_clickable_rounded_4dp_brighten:I = 0x7f080148 +.field public static final drawable_clickable_rounded_4dp_darken:I = 0x7f080148 -.field public static final drawable_clickable_rounded_4dp_darken:I = 0x7f080149 +.field public static final drawable_cpv_edit_text_background:I = 0x7f080149 -.field public static final drawable_cpv_edit_text_background:I = 0x7f08014a +.field public static final drawable_default_invite_splash:I = 0x7f08014a -.field public static final drawable_default_invite_splash:I = 0x7f08014b +.field public static final drawable_empty_text_placeholder_dark:I = 0x7f08014b -.field public static final drawable_empty_text_placeholder_dark:I = 0x7f08014c +.field public static final drawable_file_selection_indicator_btn:I = 0x7f08014c -.field public static final drawable_file_selection_indicator_btn:I = 0x7f08014d +.field public static final drawable_fill_black_alpha_20:I = 0x7f08014d -.field public static final drawable_fill_black_alpha_20:I = 0x7f08014e +.field public static final drawable_fill_purple:I = 0x7f08014e -.field public static final drawable_fill_purple:I = 0x7f08014f +.field public static final drawable_friends_pending_dark:I = 0x7f08014f -.field public static final drawable_friends_pending_dark:I = 0x7f080150 +.field public static final drawable_friends_pending_dark_selected:I = 0x7f080150 -.field public static final drawable_friends_pending_dark_selected:I = 0x7f080151 +.field public static final drawable_friends_pending_dark_unselected:I = 0x7f080151 -.field public static final drawable_friends_pending_dark_unselected:I = 0x7f080152 +.field public static final drawable_friends_pending_invites_selector_dark:I = 0x7f080152 -.field public static final drawable_friends_pending_invites_selector_dark:I = 0x7f080153 +.field public static final drawable_friends_pending_invites_selector_light:I = 0x7f080153 -.field public static final drawable_friends_pending_invites_selector_light:I = 0x7f080154 +.field public static final drawable_friends_pending_light:I = 0x7f080154 -.field public static final drawable_friends_pending_light:I = 0x7f080155 +.field public static final drawable_friends_pending_light_selected:I = 0x7f080155 -.field public static final drawable_friends_pending_light_selected:I = 0x7f080156 +.field public static final drawable_friends_pending_light_unselected:I = 0x7f080156 -.field public static final drawable_friends_pending_light_unselected:I = 0x7f080157 +.field public static final drawable_gem_premium_guild_background_dark:I = 0x7f080157 -.field public static final drawable_gem_premium_guild_background_dark:I = 0x7f080158 +.field public static final drawable_gem_premium_guild_background_light:I = 0x7f080158 -.field public static final drawable_gem_premium_guild_background_light:I = 0x7f080159 +.field public static final drawable_gem_tier_3:I = 0x7f080159 -.field public static final drawable_gem_tier_3:I = 0x7f08015a +.field public static final drawable_gift_embed_gradient_overlay_dark:I = 0x7f08015a -.field public static final drawable_gift_embed_gradient_overlay_dark:I = 0x7f08015b +.field public static final drawable_gift_embed_gradient_overlay_light:I = 0x7f08015b -.field public static final drawable_gift_embed_gradient_overlay_light:I = 0x7f08015c +.field public static final drawable_grey_user_icon:I = 0x7f08015c -.field public static final drawable_grey_user_icon:I = 0x7f08015d +.field public static final drawable_guild_template_club:I = 0x7f08015d -.field public static final drawable_guild_template_club:I = 0x7f08015e +.field public static final drawable_guild_template_community:I = 0x7f08015e -.field public static final drawable_guild_template_community:I = 0x7f08015f +.field public static final drawable_guild_template_create:I = 0x7f08015f -.field public static final drawable_guild_template_create:I = 0x7f080160 +.field public static final drawable_guild_template_creator:I = 0x7f080160 -.field public static final drawable_guild_template_creator:I = 0x7f080161 +.field public static final drawable_guild_template_friend:I = 0x7f080161 -.field public static final drawable_guild_template_friend:I = 0x7f080162 +.field public static final drawable_guild_template_gaming:I = 0x7f080162 -.field public static final drawable_guild_template_gaming:I = 0x7f080163 +.field public static final drawable_guild_template_study:I = 0x7f080163 -.field public static final drawable_guild_template_study:I = 0x7f080164 +.field public static final drawable_ic_game_icon_placeholder_dark:I = 0x7f080164 -.field public static final drawable_ic_game_icon_placeholder_dark:I = 0x7f080165 +.field public static final drawable_ic_game_icon_placeholder_light:I = 0x7f080165 -.field public static final drawable_ic_game_icon_placeholder_light:I = 0x7f080166 +.field public static final drawable_ic_nitro:I = 0x7f080166 -.field public static final drawable_ic_nitro:I = 0x7f080167 +.field public static final drawable_ic_nitro_classic:I = 0x7f080167 -.field public static final drawable_ic_nitro_classic:I = 0x7f080168 +.field public static final drawable_ic_ternary_neutral:I = 0x7f080168 -.field public static final drawable_ic_ternary_neutral:I = 0x7f080169 +.field public static final drawable_ic_ternary_off:I = 0x7f080169 -.field public static final drawable_ic_ternary_off:I = 0x7f08016a +.field public static final drawable_ic_ternary_on:I = 0x7f08016a -.field public static final drawable_ic_ternary_on:I = 0x7f08016b +.field public static final drawable_icon_sync_integration:I = 0x7f08016b -.field public static final drawable_icon_sync_integration:I = 0x7f08016c - -.field public static final drawable_invite_share_art_envelope:I = 0x7f08016d +.field public static final drawable_invite_share_art_envelope:I = 0x7f08016c .field public static final drawable_logo_auth_dark:I = 0x7f08016e