diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index ee7b93da46..e128935766 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-1204.apk +apkFileName: com.discord-1206.apk compressionType: false doNotCompress: - resources.arsc @@ -3224,5 +3224,5 @@ usesFramework: tag: null version: 2.4.2-83a459-SNAPSHOT versionInfo: - versionCode: '1204' - versionName: '32.2' + versionCode: '1206' + versionName: '32.3' diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index 13c4be0ca9..4fa1c92937 100644 Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index aafdde251d..ea40ba2058 100644 --- a/com.discord/res/values/strings.xml +++ b/com.discord/res/values/strings.xml @@ -1157,7 +1157,7 @@ We’re here to make a good impression." Presets Select a color Transparency - 8003e8f6bf0f4c08b27aac11541602ff + 9577955f52324337a38281610dfce5f4 Coming Soon Search Animated GIFs on the Web Displays text with emphasis. diff --git a/com.discord/smali/a.smali b/com.discord/smali/a.smali index fbb26e62c4..8f9fed6042 100644 --- a/com.discord/smali/a.smali +++ b/com.discord/smali/a.smali @@ -9,48 +9,6 @@ const/4 v0, 0x1 - :try_start_0 - new-array v0, v0, [Lkotlinx/coroutines/internal/MainDispatcherFactory; - - const/4 v1, 0x0 - - new-instance v2, Lkotlinx/coroutines/android/AndroidDispatcherFactory; - - invoke-direct {v2}, Lkotlinx/coroutines/android/AndroidDispatcherFactory;->()V - - aput-object v2, v0, v1 - - invoke-static {v0}, Ljava/util/Arrays;->asList([Ljava/lang/Object;)Ljava/util/List; - - move-result-object v0 - - invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator; - - move-result-object v0 - :try_end_0 - .catchall {:try_start_0 .. :try_end_0} :catchall_0 - - return-object v0 - - :catchall_0 - move-exception v0 - - new-instance v1, Ljava/util/ServiceConfigurationError; - - invoke-virtual {v0}, Ljava/lang/Throwable;->getMessage()Ljava/lang/String; - - move-result-object v2 - - invoke-direct {v1, v2, v0}, Ljava/util/ServiceConfigurationError;->(Ljava/lang/String;Ljava/lang/Throwable;)V - - throw v1 -.end method - -.method public static b()Ljava/util/Iterator; - .locals 3 - - const/4 v0, 0x1 - :try_start_0 new-array v0, v0, [Lkotlinx/coroutines/CoroutineExceptionHandler; @@ -87,3 +45,45 @@ throw v1 .end method + +.method public static b()Ljava/util/Iterator; + .locals 3 + + const/4 v0, 0x1 + + :try_start_0 + new-array v0, v0, [Lkotlinx/coroutines/internal/MainDispatcherFactory; + + const/4 v1, 0x0 + + new-instance v2, Lkotlinx/coroutines/android/AndroidDispatcherFactory; + + invoke-direct {v2}, Lkotlinx/coroutines/android/AndroidDispatcherFactory;->()V + + aput-object v2, v0, v1 + + invoke-static {v0}, Ljava/util/Arrays;->asList([Ljava/lang/Object;)Ljava/util/List; + + move-result-object v0 + + invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator; + + move-result-object v0 + :try_end_0 + .catchall {:try_start_0 .. :try_end_0} :catchall_0 + + return-object v0 + + :catchall_0 + move-exception v0 + + new-instance v1, Ljava/util/ServiceConfigurationError; + + invoke-virtual {v0}, Ljava/lang/Throwable;->getMessage()Ljava/lang/String; + + move-result-object v2 + + invoke-direct {v1, v2, v0}, Ljava/util/ServiceConfigurationError;->(Ljava/lang/String;Ljava/lang/Throwable;)V + + throw v1 +.end method diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali index 6b3b77b262..d19873626e 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/1204" +.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1206" -.field public static final VERSION_CODE:I = 0x4b4 +.field public static final VERSION_CODE:I = 0x4b6 -.field public static final VERSION_NAME:Ljava/lang/String; = "32.2" +.field public static final VERSION_NAME:Ljava/lang/String; = "32.3" # direct methods diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali index 7d0a192c31..eaa8dd940a 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, 0x4b4 + const/16 v0, 0x4b6 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 2e38fce1e7..4df1fad8c1 100644 --- a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali +++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali @@ -177,7 +177,7 @@ const-string v3, "browser_user_agent" - const-string v4, "Discord-Android/1204" + const-string v4, "Discord-Android/1206" invoke-direct {v2, v3, v4}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V @@ -185,7 +185,7 @@ const/4 v1, 0x2 - const/16 v2, 0x4b4 + const/16 v2, 0x4b6 invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -205,7 +205,7 @@ const-string v3, "client_version" - const-string v4, "32.2" + const-string v4, "32.3" invoke-direct {v2, v3, v4}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V 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 dbc79ac1d4..155f997b7d 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/1204" + const-string v0, "Discord-Android/1206" 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 7b2d296fa0..8039e7c4a9 100644 --- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali +++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali @@ -480,7 +480,7 @@ new-array v1, v2, [Ljava/lang/Object; - const-string v3, "32.2" + const-string v3, "32.3" aput-object v3, v1, v5 diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali index da2a657242..7a12fd1fea 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali @@ -1876,7 +1876,7 @@ invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v0, " - 32.2 (1204)" + const-string v0, " - 32.3 (1206)" 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/sheet/WidgetVoiceBottomSheet$configureBottomContent$8$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6$1.smali similarity index 77% rename from com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8$1.smali rename to com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6$1.smali index 67d9f51089..85d674f256 100644 --- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8$1.smali +++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6$1.smali @@ -1,4 +1,4 @@ -.class public final Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8$1; +.class public final Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6$1; .super Ljava/lang/Object; .source "WidgetVoiceBottomSheet.kt" @@ -8,7 +8,7 @@ # annotations .annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8;->onClick(Landroid/view/View;)V + value = Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6;->onClick(Landroid/view/View;)V .end annotation .annotation system Ldalvik/annotation/InnerClass; @@ -18,14 +18,14 @@ # instance fields -.field public final synthetic this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8; +.field public final synthetic this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6; # direct methods -.method public constructor (Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8;)V +.method public constructor (Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6;)V .locals 0 - iput-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8$1;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8; + iput-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6$1;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6; invoke-direct {p0}, Ljava/lang/Object;->()V @@ -37,15 +37,15 @@ .method public final call()V .locals 2 - iget-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8$1;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8; + iget-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6$1;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6; - iget-object v0, v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet; + iget-object v0, v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet; invoke-static {v0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->access$getViewModel$p(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel; move-result-object v0 - const/4 v1, 0x1 + const/4 v1, 0x0 invoke-virtual {v0, v1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;->tryConnectToVoice(Z)V diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6.smali index 50ff8eb360..9be6b53583 100644 --- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6.smali +++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6.smali @@ -1,9 +1,9 @@ -.class public final synthetic Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6; -.super Lj0/o/c/g; +.class public final Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6; +.super Ljava/lang/Object; .source "WidgetVoiceBottomSheet.kt" # interfaces -.implements Lkotlin/jvm/functions/Function1; +.implements Landroid/view/View$OnClickListener; # annotations @@ -12,86 +12,38 @@ .end annotation .annotation system Ldalvik/annotation/InnerClass; - accessFlags = 0x1019 + accessFlags = 0x19 name = null .end annotation -.annotation system Ldalvik/annotation/Signature; - value = { - "Lj0/o/c/g;", - "Lkotlin/jvm/functions/Function1<", - "Ljava/lang/Boolean;", - "Lkotlin/Unit;", - ">;" - } -.end annotation + +# instance fields +.field public final synthetic this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet; # direct methods -.method public constructor (Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;)V - .locals 1 +.method public constructor (Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;)V + .locals 0 - const/4 v0, 0x1 + iput-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet; - invoke-direct {p0, v0, p1}, Lj0/o/c/g;->(ILjava/lang/Object;)V + invoke-direct {p0}, Ljava/lang/Object;->()V return-void .end method # virtual methods -.method public final getName()Ljava/lang/String; +.method public final onClick(Landroid/view/View;)V .locals 1 - const-string v0, "onPttPressed" + iget-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet; - return-object v0 -.end method + new-instance v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6$1; -.method public final getOwner()Lkotlin/reflect/KDeclarationContainer; - .locals 1 + invoke-direct {v0, p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6$1;->(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6;)V - const-class v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel; - - invoke-static {v0}, Lj0/o/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/s/b; - - move-result-object v0 - - return-object v0 -.end method - -.method public final getSignature()Ljava/lang/String; - .locals 1 - - const-string v0, "onPttPressed(Z)V" - - return-object v0 -.end method - -.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; - .locals 0 - - check-cast p1, Ljava/lang/Boolean; - - invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z - - move-result p1 - - invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6;->invoke(Z)V - - sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit; - - return-object p1 -.end method - -.method public final invoke(Z)V - .locals 1 - - iget-object v0, p0, Lj0/o/c/b;->receiver:Ljava/lang/Object; - - check-cast v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel; - - invoke-virtual {v0, p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;->onPttPressed(Z)V + invoke-virtual {p1, v0}, Lcom/discord/app/AppBottomSheet;->requestMicrophone(Lrx/functions/Action0;)V return-void .end method diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$7$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$7$1.smali index f4704c2975..487a81619b 100644 --- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$7$1.smali +++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$7$1.smali @@ -45,7 +45,7 @@ move-result-object v0 - const/4 v1, 0x0 + const/4 v1, 0x1 invoke-virtual {v0, v1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;->tryConnectToVoice(Z)V diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8.smali deleted file mode 100644 index 4df62c00e7..0000000000 --- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8.smali +++ /dev/null @@ -1,49 +0,0 @@ -.class public final Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8; -.super Ljava/lang/Object; -.source "WidgetVoiceBottomSheet.kt" - -# interfaces -.implements Landroid/view/View$OnClickListener; - - -# annotations -.annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->configureBottomContent(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent;)V -.end annotation - -.annotation system Ldalvik/annotation/InnerClass; - accessFlags = 0x19 - name = null -.end annotation - - -# instance fields -.field public final synthetic this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet; - - -# direct methods -.method public constructor (Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;)V - .locals 0 - - iput-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet; - - invoke-direct {p0}, Ljava/lang/Object;->()V - - return-void -.end method - - -# virtual methods -.method public final onClick(Landroid/view/View;)V - .locals 1 - - iget-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet; - - new-instance v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8$1; - - invoke-direct {v0, p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8$1;->(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8;)V - - invoke-virtual {p1, v0}, Lcom/discord/app/AppBottomSheet;->requestMicrophone(Lrx/functions/Action0;)V - - return-void -.end method diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onViewCreated$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onViewCreated$1.smali new file mode 100644 index 0000000000..abdf543ff8 --- /dev/null +++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onViewCreated$1.smali @@ -0,0 +1,97 @@ +.class public final synthetic Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onViewCreated$1; +.super Lj0/o/c/g; +.source "WidgetVoiceBottomSheet.kt" + +# interfaces +.implements Lkotlin/jvm/functions/Function1; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x1019 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "Lj0/o/c/g;", + "Lkotlin/jvm/functions/Function1<", + "Ljava/lang/Boolean;", + "Lkotlin/Unit;", + ">;" + } +.end annotation + + +# direct methods +.method public constructor (Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;)V + .locals 1 + + const/4 v0, 0x1 + + invoke-direct {p0, v0, p1}, Lj0/o/c/g;->(ILjava/lang/Object;)V + + return-void +.end method + + +# virtual methods +.method public final getName()Ljava/lang/String; + .locals 1 + + const-string v0, "onPttPressed" + + return-object v0 +.end method + +.method public final getOwner()Lkotlin/reflect/KDeclarationContainer; + .locals 1 + + const-class v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel; + + invoke-static {v0}, Lj0/o/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/s/b; + + move-result-object v0 + + return-object v0 +.end method + +.method public final getSignature()Ljava/lang/String; + .locals 1 + + const-string v0, "onPttPressed(Z)V" + + return-object v0 +.end method + +.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 + + check-cast p1, Ljava/lang/Boolean; + + invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z + + move-result p1 + + invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onViewCreated$1;->invoke(Z)V + + sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit; + + return-object p1 +.end method + +.method public final invoke(Z)V + .locals 1 + + iget-object v0, p0, Lj0/o/c/b;->receiver:Ljava/lang/Object; + + check-cast v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel; + + invoke-virtual {v0, p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;->onPttPressed(Z)V + + return-void +.end method diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet.smali index ca9e2f0455..ebe4a4d70b 100644 --- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet.smali +++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet.smali @@ -651,7 +651,7 @@ const/4 v3, 0x0 - if-eqz v2, :cond_6 + if-eqz v2, :cond_5 invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getControls()Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView; @@ -699,7 +699,7 @@ const-string v1, "viewModel" - if-eqz p1, :cond_5 + if-eqz p1, :cond_4 invoke-direct {v8, p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$1;->(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;)V @@ -707,7 +707,7 @@ iget-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->viewModel:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel; - if-eqz p1, :cond_4 + if-eqz p1, :cond_3 invoke-direct {v9, p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$2;->(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;)V @@ -719,7 +719,7 @@ iget-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->viewModel:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel; - if-eqz p1, :cond_3 + if-eqz p1, :cond_2 invoke-direct {v11, p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$4;->(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;)V @@ -727,26 +727,12 @@ iget-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->viewModel:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel; - if-eqz p1, :cond_2 + if-eqz p1, :cond_1 invoke-direct {v12, p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$5;->(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;)V invoke-virtual/range {v2 .. v12}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->configureUI(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ZZLcom/discord/widgets/voice/model/CameraState;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V - invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getControls()Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView; - - move-result-object p1 - - new-instance v2, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6; - - iget-object v3, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->viewModel:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel; - - if-eqz v3, :cond_1 - - invoke-direct {v2, v3}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6;->(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;)V - - invoke-virtual {p1, v2}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->setOnPttPressedListener(Lkotlin/jvm/functions/Function1;)V - invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getRoot()Landroid/view/ViewGroup; move-result-object p1 @@ -786,14 +772,9 @@ throw v0 :cond_5 - invoke-static {v1}, Lj0/o/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V - - throw v0 - - :cond_6 instance-of v2, p1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Connect; - if-eqz v2, :cond_9 + if-eqz v2, :cond_8 invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getControls()Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView; @@ -821,7 +802,7 @@ move-result v2 - if-eqz v2, :cond_7 + if-eqz v2, :cond_6 invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getConnectBtn()Landroid/widget/Button; @@ -841,7 +822,7 @@ goto :goto_0 - :cond_7 + :cond_6 invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getConnectBtn()Landroid/widget/Button; move-result-object v2 @@ -861,9 +842,9 @@ move-result-object v2 - new-instance v4, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$7; + new-instance v4, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6; - invoke-direct {v4, p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$7;->(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;)V + invoke-direct {v4, p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6;->(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;)V invoke-virtual {v2, v4}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V @@ -885,20 +866,20 @@ move-result p1 - if-eqz p1, :cond_8 + if-eqz p1, :cond_7 const/4 v1, 0x0 - :cond_8 + :cond_7 invoke-virtual {v2, v1}, Landroid/view/View;->setVisibility(I)V invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getConnectVideoBtn()Landroid/widget/Button; move-result-object p1 - new-instance v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8; + new-instance v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$7; - invoke-direct {v1, p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8;->(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;)V + invoke-direct {v1, p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$7;->(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;)V invoke-virtual {p1, v1}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V @@ -916,7 +897,7 @@ invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->setBackgroundColor(I)V - :cond_9 + :cond_8 :goto_1 return-void .end method @@ -1999,9 +1980,11 @@ .end method .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V - .locals 0 + .locals 2 - if-eqz p1, :cond_0 + const/4 v0, 0x0 + + if-eqz p1, :cond_1 invoke-super {p0, p1, p2}, Lcom/discord/app/AppBottomSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V @@ -2009,16 +1992,35 @@ invoke-virtual {p0, p1}, Lcom/discord/app/AppBottomSheet;->setBottomSheetState(I)V + invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getControls()Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView; + + move-result-object p1 + + new-instance p2, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onViewCreated$1; + + iget-object v1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->viewModel:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel; + + if-eqz v1, :cond_0 + + invoke-direct {p2, v1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onViewCreated$1;->(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;)V + + invoke-virtual {p1, p2}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->setOnPttPressedListener(Lkotlin/jvm/functions/Function1;)V + return-void :cond_0 + const-string p1, "viewModel" + + invoke-static {p1}, Lj0/o/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V + + throw v0 + + :cond_1 const-string p1, "view" invoke-static {p1}, Lj0/o/c/h;->c(Ljava/lang/String;)V - const/4 p1, 0x0 - - throw p1 + throw v0 .end method .method public final setOnStreamPreviewClickedListener(Lkotlin/jvm/functions/Function1;)V diff --git a/com.discord/smali_classes2/k0/a/r1/p.smali b/com.discord/smali_classes2/k0/a/r1/p.smali index 41bd6a8e43..516c780dc8 100644 --- a/com.discord/smali_classes2/k0/a/r1/p.smali +++ b/com.discord/smali_classes2/k0/a/r1/p.smali @@ -28,7 +28,7 @@ const/4 v1, 0x0 :try_start_0 - invoke-static {}, La;->a()Ljava/util/Iterator; + invoke-static {}, La;->b()Ljava/util/Iterator; move-result-object v2 diff --git a/com.discord/smali_classes2/k0/a/w.smali b/com.discord/smali_classes2/k0/a/w.smali index 5e76b22248..89fd923921 100644 --- a/com.discord/smali_classes2/k0/a/w.smali +++ b/com.discord/smali_classes2/k0/a/w.smali @@ -19,7 +19,7 @@ .method public static constructor ()V .locals 2 - invoke-static {}, La;->b()Ljava/util/Iterator; + invoke-static {}, La;->a()Ljava/util/Iterator; move-result-object v0