diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml
index 773214e008..69dd43e9d5 100644
--- a/com.discord/apktool.yml
+++ b/com.discord/apktool.yml
@@ -1,5 +1,5 @@
!!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-1143.apk
+apkFileName: com.discord-1144.apk
compressionType: false
doNotCompress:
- arsc
@@ -190,5 +190,5 @@ usesFramework:
tag: null
version: 2.4.1-197d46-SNAPSHOT
versionInfo:
- versionCode: '1143'
- versionName: '22.3'
+ versionCode: '1144'
+ versionName: '22.4'
diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties
index 6a4c5d914e..a65ae96d37 100644
--- a/com.discord/assets/crashlytics-build.properties
+++ b/com.discord/assets/crashlytics-build.properties
@@ -3,9 +3,9 @@
#
#Do NOT modify, delete, or commit to source control!
#
-#Fri May 15 17:32:42 UTC 2020
-version_name=22.3
+#Sun May 17 00:49:38 UTC 2020
+version_name=22.4
package_name=com.discord
-build_id=5953cb1e-173b-4d92-aadb-d71406c67f39
-version_code=1143
+build_id=ca68d867-7d67-4f32-b069-0ac8f3c44e1f
+version_code=1144
app_name=com.discord
diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml
index 9853d7fa60..d095e89984 100644
Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ
diff --git a/com.discord/res/drawable-xxhdpi/img_nitro_pattern.png b/com.discord/res/drawable-xxhdpi/img_nitro_pattern.png
index c4918d7fa5..fa126ee3f8 100644
Binary files a/com.discord/res/drawable-xxhdpi/img_nitro_pattern.png and b/com.discord/res/drawable-xxhdpi/img_nitro_pattern.png differ
diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml
index 973615d206..987ff84bf5 100644
--- a/com.discord/res/values/strings.xml
+++ b/com.discord/res/values/strings.xml
@@ -1057,7 +1057,7 @@ Last month, in response to COVID-19, we upped the Go Live viewer limit from 10 t
OR
Collapse
Collapse Category
- 5953cb1e-173b-4d92-aadb-d71406c67f39
+ ca68d867-7d67-4f32-b069-0ac8f3c44e1f
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 1533597083..2008f4da91 100644
--- a/com.discord/smali/com/discord/BuildConfig.smali
+++ b/com.discord/smali/com/discord/BuildConfig.smali
@@ -40,11 +40,11 @@
.field public static final SAMSUNGxDISCORD_CLIENT_ID:Ljava/lang/String; = "97t47j218f"
-.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1143"
+.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1144"
-.field public static final VERSION_CODE:I = 0x477
+.field public static final VERSION_CODE:I = 0x478
-.field public static final VERSION_NAME:Ljava/lang/String; = "22.3"
+.field public static final VERSION_NAME:Ljava/lang/String; = "22.4"
# direct methods
diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali
index 5bb19cd3f8..162f77cb42 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, 0x477
+ const/16 v0, 0x478
iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
index be72bc1cde..ed28d53b82 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
@@ -181,7 +181,7 @@
const-string v3, "browser_user_agent"
- const-string v4, "Discord-Android/1143"
+ const-string v4, "Discord-Android/1144"
invoke-direct {v2, v3, v4}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V
@@ -189,7 +189,7 @@
const/4 v1, 0x2
- const/16 v2, 0x477
+ const/16 v2, 0x478
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -205,7 +205,7 @@
const/4 v1, 0x3
- const-string v2, "22.3"
+ const-string v2, "22.4"
const-string v3, ""
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 7d956841cb..e5bdec9608 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/1143"
+ const-string v0, "Discord-Android/1144"
return-object v0
.end method
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
index 2cde8ca064..c4a9f38b50 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
@@ -492,7 +492,7 @@
new-array v1, v2, [Ljava/lang/Object;
- const-string v3, "22.3"
+ const-string v3, "22.4"
aput-object v3, v1, v4
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia$configureAndStartControlsAnimation$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia$configureAndStartControlsAnimation$$inlined$apply$lambda$1.smali
index a59514eb9b..db6b1d62f1 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia$configureAndStartControlsAnimation$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia$configureAndStartControlsAnimation$$inlined$apply$lambda$1.smali
@@ -55,7 +55,7 @@
iget-object v0, p0, Lcom/discord/widgets/media/WidgetMedia$configureAndStartControlsAnimation$$inlined$apply$lambda$1;->this$0:Lcom/discord/widgets/media/WidgetMedia;
- invoke-static {v0}, Lcom/discord/widgets/media/WidgetMedia;->access$getToolbarContainer$p(Lcom/discord/widgets/media/WidgetMedia;)Landroid/view/View;
+ invoke-static {v0}, Lcom/discord/widgets/media/WidgetMedia;->access$getActionBar$p(Lcom/discord/widgets/media/WidgetMedia;)Landroid/view/View;
move-result-object v0
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali
index 0adec6b4ff..63dce0ffc3 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali
@@ -35,6 +35,8 @@
# instance fields
+.field public actionBar:Landroid/view/View;
+
.field public appMediaPlayer:Lcom/discord/player/AppMediaPlayer;
.field public final container$delegate:Lkotlin/properties/ReadOnlyProperty;
@@ -61,8 +63,6 @@
.field public final playerView$delegate:Lkotlin/properties/ReadOnlyProperty;
-.field public final toolbarContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
-
.field public toolbarHeight:I
.field public videoUrl:Ljava/lang/String;
@@ -74,7 +74,7 @@
.method public static constructor ()V
.locals 6
- const/4 v0, 0x6
+ const/4 v0, 0x5
new-array v0, v0, [Lkotlin/reflect/KProperty;
@@ -110,28 +110,6 @@
move-result-object v3
- const-string v4, "toolbarContainer"
-
- const-string v5, "getToolbarContainer()Landroid/view/View;"
-
- invoke-direct {v2, v3, v4, v5}, Ly/v/b/u;->(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
- sget-object v3, Ly/v/b/x;->a:Ly/v/b/y;
-
- invoke-virtual {v3, v2}, Ly/v/b/y;->property1(Ly/v/b/t;)Ly/z/d;
-
- aput-object v2, v0, v1
-
- const/4 v1, 0x2
-
- new-instance v2, Ly/v/b/u;
-
- const-class v3, Lcom/discord/widgets/media/WidgetMedia;
-
- invoke-static {v3}, Ly/v/b/x;->getOrCreateKotlinClass(Ljava/lang/Class;)Ly/z/b;
-
- move-result-object v3
-
const-string v4, "mediaImage"
const-string v5, "getMediaImage()Lcom/facebook/samples/zoomable/ZoomableDraweeView;"
@@ -144,7 +122,7 @@
aput-object v2, v0, v1
- const/4 v1, 0x3
+ const/4 v1, 0x2
new-instance v2, Ly/v/b/u;
@@ -166,7 +144,7 @@
aput-object v2, v0, v1
- const/4 v1, 0x4
+ const/4 v1, 0x3
new-instance v2, Ly/v/b/u;
@@ -188,7 +166,7 @@
aput-object v2, v0, v1
- const/4 v1, 0x5
+ const/4 v1, 0x4
new-instance v2, Ly/v/b/u;
@@ -236,14 +214,6 @@
iput-object v0, p0, Lcom/discord/widgets/media/WidgetMedia;->container$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a003e
-
- invoke-static {p0, v0}, Lf/o/a/j/a;->b(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
- move-result-object v0
-
- iput-object v0, p0, Lcom/discord/widgets/media/WidgetMedia;->toolbarContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
-
const v0, 0x7f0a0a27
invoke-static {p0, v0}, Lf/o/a/j/a;->b(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -279,6 +249,25 @@
return-void
.end method
+.method public static final synthetic access$getActionBar$p(Lcom/discord/widgets/media/WidgetMedia;)Landroid/view/View;
+ .locals 0
+
+ iget-object p0, p0, Lcom/discord/widgets/media/WidgetMedia;->actionBar:Landroid/view/View;
+
+ if-eqz p0, :cond_0
+
+ return-object p0
+
+ :cond_0
+ const-string p0, "actionBar"
+
+ invoke-static {p0}, Ly/v/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+ const/4 p0, 0x0
+
+ throw p0
+.end method
+
.method public static final synthetic access$getControlsAnimationAction$p(Lcom/discord/widgets/media/WidgetMedia;)Lcom/discord/widgets/media/WidgetMedia$ControlsAnimationAction;
.locals 0
@@ -323,16 +312,6 @@
return p0
.end method
-.method public static final synthetic access$getToolbarContainer$p(Lcom/discord/widgets/media/WidgetMedia;)Landroid/view/View;
- .locals 0
-
- invoke-direct {p0}, Lcom/discord/widgets/media/WidgetMedia;->getToolbarContainer()Landroid/view/View;
-
- move-result-object p0
-
- return-object p0
-.end method
-
.method public static final synthetic access$getToolbarHeight$p(Lcom/discord/widgets/media/WidgetMedia;)I
.locals 0
@@ -383,6 +362,14 @@
return-void
.end method
+.method public static final synthetic access$setActionBar$p(Lcom/discord/widgets/media/WidgetMedia;Landroid/view/View;)V
+ .locals 0
+
+ iput-object p1, p0, Lcom/discord/widgets/media/WidgetMedia;->actionBar:Landroid/view/View;
+
+ return-void
+.end method
+
.method public static final synthetic access$setControlsAnimationAction$p(Lcom/discord/widgets/media/WidgetMedia;Lcom/discord/widgets/media/WidgetMedia$ControlsAnimationAction;)V
.locals 0
@@ -663,7 +650,7 @@
sget-object v1, Lcom/discord/widgets/media/WidgetMedia;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
- const/4 v2, 0x2
+ const/4 v2, 0x1
aget-object v1, v1, v2
@@ -683,7 +670,7 @@
sget-object v1, Lcom/discord/widgets/media/WidgetMedia;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
- const/4 v2, 0x5
+ const/4 v2, 0x4
aget-object v1, v1, v2
@@ -703,7 +690,7 @@
sget-object v1, Lcom/discord/widgets/media/WidgetMedia;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
- const/4 v2, 0x4
+ const/4 v2, 0x3
aget-object v1, v1, v2
@@ -723,7 +710,7 @@
sget-object v1, Lcom/discord/widgets/media/WidgetMedia;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
- const/4 v2, 0x3
+ const/4 v2, 0x2
aget-object v1, v1, v2
@@ -736,26 +723,6 @@
return-object v0
.end method
-.method private final getToolbarContainer()Landroid/view/View;
- .locals 3
-
- iget-object v0, p0, Lcom/discord/widgets/media/WidgetMedia;->toolbarContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
-
- sget-object v1, Lcom/discord/widgets/media/WidgetMedia;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
- const/4 v2, 0x1
-
- aget-object v1, v1, v2
-
- invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
- move-result-object v0
-
- check-cast v0, Landroid/view/View;
-
- return-object v0
-.end method
-
.method private final handleImageProgressComplete()V
.locals 1
@@ -931,9 +898,9 @@
invoke-virtual {v0}, Landroid/animation/ValueAnimator;->cancel()V
:cond_1
- invoke-direct {p0}, Lcom/discord/widgets/media/WidgetMedia;->getToolbarContainer()Landroid/view/View;
+ iget-object v0, p0, Lcom/discord/widgets/media/WidgetMedia;->actionBar:Landroid/view/View;
- move-result-object v0
+ if-eqz v0, :cond_2
invoke-virtual {v0}, Landroid/view/View;->getTranslationY()F
@@ -970,6 +937,15 @@
iput-object v0, p0, Lcom/discord/widgets/media/WidgetMedia;->controlsAnimator:Landroid/animation/ValueAnimator;
return-void
+
+ :cond_2
+ const-string v0, "actionBar"
+
+ invoke-static {v0}, Ly/v/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+ const/4 v0, 0x0
+
+ throw v0
.end method
.method private final hideLoadingIndicator()V
@@ -1031,9 +1007,9 @@
.method private final onMediaClick()V
.locals 2
- invoke-direct {p0}, Lcom/discord/widgets/media/WidgetMedia;->getToolbarContainer()Landroid/view/View;
+ iget-object v0, p0, Lcom/discord/widgets/media/WidgetMedia;->actionBar:Landroid/view/View;
- move-result-object v0
+ if-eqz v0, :cond_1
invoke-virtual {v0}, Landroid/view/View;->getTranslationY()F
@@ -1054,10 +1030,19 @@
:goto_0
return-void
+
+ :cond_1
+ const-string v0, "actionBar"
+
+ invoke-static {v0}, Ly/v/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+ const/4 v0, 0x0
+
+ throw v0
.end method
.method private final showControls()V
- .locals 12
+ .locals 13
invoke-direct {p0}, Lcom/discord/widgets/media/WidgetMedia;->isVideo()Z
@@ -1065,6 +1050,8 @@
const/4 v1, 0x2
+ const/4 v2, 0x0
+
if-eqz v0, :cond_1
invoke-direct {p0}, Lcom/discord/widgets/media/WidgetMedia;->getPlayerControlView()Lcom/google/android/exoplayer2/ui/PlayerControlView;
@@ -1080,45 +1067,43 @@
invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
:cond_0
- const-wide/16 v2, 0xbb8
+ const-wide/16 v3, 0xbb8
sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
- invoke-static {v2, v3, v0}, Lrx/Observable;->h(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+ invoke-static {v3, v4, v0}, Lrx/Observable;->h(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
move-result-object v0
- const-string v2, "Observable.timer(SHOW_CO\u2026S, TimeUnit.MILLISECONDS)"
+ const-string v3, "Observable.timer(SHOW_CO\u2026S, TimeUnit.MILLISECONDS)"
- invoke-static {v0, v2}, Ly/v/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- const/4 v2, 0x0
+ invoke-static {v0, v3}, Ly/v/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
invoke-static {v0, p0, v2, v1, v2}, 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 v3
+ move-result-object v4
- const-class v4, Lcom/discord/widgets/media/WidgetMedia;
+ const-class v5, Lcom/discord/widgets/media/WidgetMedia;
- const/4 v5, 0x0
+ const/4 v6, 0x0
- new-instance v6, Lcom/discord/widgets/media/WidgetMedia$showControls$1;
+ new-instance v7, Lcom/discord/widgets/media/WidgetMedia$showControls$1;
- invoke-direct {v6, p0}, Lcom/discord/widgets/media/WidgetMedia$showControls$1;->(Lcom/discord/widgets/media/WidgetMedia;)V
-
- const/4 v7, 0x0
+ invoke-direct {v7, p0}, Lcom/discord/widgets/media/WidgetMedia$showControls$1;->(Lcom/discord/widgets/media/WidgetMedia;)V
const/4 v8, 0x0
- new-instance v9, Lcom/discord/widgets/media/WidgetMedia$showControls$2;
+ const/4 v9, 0x0
- invoke-direct {v9, p0}, Lcom/discord/widgets/media/WidgetMedia$showControls$2;->(Lcom/discord/widgets/media/WidgetMedia;)V
+ new-instance v10, Lcom/discord/widgets/media/WidgetMedia$showControls$2;
- const/16 v10, 0x1a
+ invoke-direct {v10, p0}, Lcom/discord/widgets/media/WidgetMedia$showControls$2;->(Lcom/discord/widgets/media/WidgetMedia;)V
- const/4 v11, 0x0
+ const/16 v11, 0x1a
- invoke-static/range {v3 .. v11}, 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
+ const/4 v12, 0x0
+
+ invoke-static/range {v4 .. v12}, 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
goto :goto_0
@@ -1132,14 +1117,14 @@
:goto_0
iget-object v0, p0, Lcom/discord/widgets/media/WidgetMedia;->controlsAnimationAction:Lcom/discord/widgets/media/WidgetMedia$ControlsAnimationAction;
- sget-object v2, Lcom/discord/widgets/media/WidgetMedia$ControlsAnimationAction;->SHOW:Lcom/discord/widgets/media/WidgetMedia$ControlsAnimationAction;
+ sget-object v3, Lcom/discord/widgets/media/WidgetMedia$ControlsAnimationAction;->SHOW:Lcom/discord/widgets/media/WidgetMedia$ControlsAnimationAction;
- if-ne v0, v2, :cond_2
+ if-ne v0, v3, :cond_2
return-void
:cond_2
- iput-object v2, p0, Lcom/discord/widgets/media/WidgetMedia;->controlsAnimationAction:Lcom/discord/widgets/media/WidgetMedia$ControlsAnimationAction;
+ iput-object v3, p0, Lcom/discord/widgets/media/WidgetMedia;->controlsAnimationAction:Lcom/discord/widgets/media/WidgetMedia$ControlsAnimationAction;
iget-object v0, p0, Lcom/discord/widgets/media/WidgetMedia;->controlsAnimator:Landroid/animation/ValueAnimator;
@@ -1148,9 +1133,9 @@
invoke-virtual {v0}, Landroid/animation/ValueAnimator;->cancel()V
:cond_3
- invoke-direct {p0}, Lcom/discord/widgets/media/WidgetMedia;->getToolbarContainer()Landroid/view/View;
+ iget-object v0, p0, Lcom/discord/widgets/media/WidgetMedia;->actionBar:Landroid/view/View;
- move-result-object v0
+ if-eqz v0, :cond_4
invoke-virtual {v0}, Landroid/view/View;->getTranslationY()F
@@ -1181,6 +1166,13 @@
iput-object v0, p0, Lcom/discord/widgets/media/WidgetMedia;->controlsAnimator:Landroid/animation/ValueAnimator;
return-void
+
+ :cond_4
+ const-string v0, "actionBar"
+
+ invoke-static {v0}, Ly/v/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+ throw v2
.end method
.method private final showLoadingIndicator()V
@@ -1296,10 +1288,22 @@
const/4 v0, 0x0
- if-eqz p1, :cond_1
+ if-eqz p1, :cond_2
invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
+ const v1, 0x7f0a003e
+
+ invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+ move-result-object p1
+
+ const-string v1, "view.findViewById(R.id.action_bar_toolbar_layout)"
+
+ invoke-static {p1, v1}, Ly/v/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ iput-object p1, p0, Lcom/discord/widgets/media/WidgetMedia;->actionBar:Landroid/view/View;
+
invoke-static {p0}, Landroidx/lifecycle/ViewModelProviders;->of(Landroidx/fragment/app/Fragment;)Landroidx/lifecycle/ViewModelProvider;
move-result-object p1
@@ -1356,26 +1360,26 @@
if-eqz p1, :cond_0
- new-instance v0, Lcom/discord/widgets/media/WidgetMedia$onViewBound$1;
+ new-instance v1, Lcom/discord/widgets/media/WidgetMedia$onViewBound$1;
- invoke-direct {v0, p0}, Lcom/discord/widgets/media/WidgetMedia$onViewBound$1;->(Lcom/discord/widgets/media/WidgetMedia;)V
+ invoke-direct {v1, p0}, Lcom/discord/widgets/media/WidgetMedia$onViewBound$1;->(Lcom/discord/widgets/media/WidgetMedia;)V
- invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+ invoke-virtual {p1, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
:cond_0
invoke-direct {p0}, Lcom/discord/widgets/media/WidgetMedia;->getContainer()Landroid/view/View;
move-result-object p1
- new-instance v0, Lcom/discord/widgets/media/WidgetMedia$onViewBound$2;
+ new-instance v1, Lcom/discord/widgets/media/WidgetMedia$onViewBound$2;
- invoke-direct {v0, p0}, Lcom/discord/widgets/media/WidgetMedia$onViewBound$2;->(Lcom/discord/widgets/media/WidgetMedia;)V
+ invoke-direct {v1, p0}, Lcom/discord/widgets/media/WidgetMedia$onViewBound$2;->(Lcom/discord/widgets/media/WidgetMedia;)V
- invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+ invoke-virtual {p1, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
- invoke-direct {p0}, Lcom/discord/widgets/media/WidgetMedia;->getToolbarContainer()Landroid/view/View;
+ iget-object p1, p0, Lcom/discord/widgets/media/WidgetMedia;->actionBar:Landroid/view/View;
- move-result-object p1
+ if-eqz p1, :cond_1
new-instance v0, Lcom/discord/widgets/media/WidgetMedia$onViewBound$3;
@@ -1396,6 +1400,13 @@
return-void
:cond_1
+ const-string p1, "actionBar"
+
+ invoke-static {p1}, Ly/v/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+ throw v0
+
+ :cond_2
const-string p1, "view"
invoke-static {p1}, Ly/v/b/j;->a(Ljava/lang/String;)V
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
index a719aa3f9b..7eee9b94b7 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
@@ -1989,7 +1989,7 @@
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
- const-string v0, " - 22.3 (1143)"
+ const-string v0, " - 22.4 (1144)"
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;