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 21f882da2e..db2cfd850c 100644
Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ
diff --git a/com.discord/res/drawable-mdpi/asset_nux_navigation_channels.png b/com.discord/res/drawable-mdpi/asset_nux_navigation_channels.png
index bcda1db74b..5e29d40aca 100644
Binary files a/com.discord/res/drawable-mdpi/asset_nux_navigation_channels.png and b/com.discord/res/drawable-mdpi/asset_nux_navigation_channels.png differ
diff --git a/com.discord/res/drawable-xhdpi/img_boost_activated.png b/com.discord/res/drawable-xhdpi/img_boost_activated.png
index 257278776d..1637c0bfd0 100644
Binary files a/com.discord/res/drawable-xhdpi/img_boost_activated.png and b/com.discord/res/drawable-xhdpi/img_boost_activated.png differ
diff --git a/com.discord/res/drawable/drawable_circle_primary_900_alpha_60.xml b/com.discord/res/drawable/drawable_circle_primary_900_alpha_60.xml
deleted file mode 100644
index 72e6f19c93..0000000000
--- a/com.discord/res/drawable/drawable_circle_primary_900_alpha_60.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ 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